/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2011-10-02 19:33:45 UTC
  • mfrom: (24.1.186 mandos)
  • Revision ID: belorn@fukt.bsnet.se-20111002193345-83fdvai1j7phep7j
The domain name has changed, so the D-Bus bus and interface names must
change.  This commit adds support for both the old and new names.

The new domain name is "recompile.se", so the new D-Bus bus name will
be "se.recompile.Mandos".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
644
644
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
645
645
                                   + interface_name + "."
646
646
                                   + property_name)
647
 
 
648
647
    
649
648
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
650
649
                         out_signature="v")
950
949
    
951
950
    ## D-Bus methods, signals & properties
952
951
    _interface = "se.bsnet.fukt.Mandos.Client"
953
 
 
 
952
    
954
953
    ## Signals
955
954
    
956
955
    # CheckerCompleted - signal
1935
1934
    # End of Avahi example code
1936
1935
    if use_dbus:
1937
1936
        try:
1938
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1939
 
                                            bus, do_not_queue=True)
1940
 
            bus_name2 = dbus.service.BusName("se.recompile.Mandos",
1941
 
                                            bus, do_not_queue=True)
 
1937
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1938
                                            bus, do_not_queue=True)
 
1939
            bus_name_transitional = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1940
                                                         bus, do_not_queue=True)
1942
1941
        except dbus.exceptions.NameExistsException as e:
1943
1942
            logger.error(unicode(e) + ", disabling D-Bus")
1944
1943
            use_dbus = False