/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: Teddy Hogeborn
  • Date: 2009-09-17 01:21:27 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090917012127-4kwzquwuvudwucuv
* debian/control (Standards-Version): Updated to "2.8.3".

* mandos-client.conf.xml (OPTIONS/timeout): Add that a successful
                                            client request will also
                                            reset the timeout.
* mandos.xml (CHECKING): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
77
77
        SO_BINDTODEVICE = None
78
78
 
79
79
 
80
 
version = "1.0.12"
 
80
version = "1.0.11"
81
81
 
82
82
logger = logging.Logger(u'mandos')
83
83
syslogger = (logging.handlers.SysLogHandler
174
174
                                    self.server.EntryGroupNew()),
175
175
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
176
            self.group.connect_to_signal('StateChanged',
177
 
                                         self
178
 
                                         .entry_group_state_changed)
 
177
                                         self.entry_group_state_changed)
179
178
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
180
179
                     self.name, self.type)
181
180
        self.group.AddService(
703
702
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
704
703
        # Emit D-Bus signal
705
704
        self.PropertyChanged(dbus.String(u"interval"),
706
 
                             (dbus.UInt64(self
707
 
                                          .interval_milliseconds(),
 
705
                             (dbus.UInt64(self.interval_milliseconds(),
708
706
                                          variant_level=1)))
709
707
    
710
708
    # SetSecret - method
985
983
        clients:        set of Client objects
986
984
        gnutls_priority GnuTLS priority string
987
985
        use_dbus:       Boolean; to emit D-Bus signals or not
 
986
        clients:        set of Client objects
 
987
        gnutls_priority GnuTLS priority string
 
988
        use_dbus:       Boolean; to emit D-Bus signals or not
988
989
    
989
990
    Assumes a gobject.MainLoop event loop.
990
991
    """
1171
1172
 
1172
1173
def main():
1173
1174
    
1174
 
    ##################################################################
 
1175
    ######################################################################
1175
1176
    # Parsing of options, both command line and config file
1176
1177
    
1177
1178
    parser = optparse.OptionParser(version = "%%prog %s" % version)