/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-11-05 02:12:57 UTC
  • Revision ID: teddy@fukt.bsnet.se-20091105021257-l2b5nb1v4pc2tupw
* mandos (ClientDBus.disable): Bug fix: complete rename of "log" and
                               "signal" to "quiet".

Show diffs side-by-side

added added

removed removed

Lines of Context:
1280
1280
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1281
1281
        
1282
1282
        if cmd == u"NOTFOUND":
1283
 
            fpr, address = args.split(None, 1)
1284
 
            logger.warning(u"Client not found for fingerprint: %s, ad"
1285
 
                           u"dress: %s", fpr, address)
 
1283
            logger.warning(u"Client not found for fingerprint: %s",
 
1284
                           args)
1286
1285
            if self.use_dbus:
1287
1286
                # Emit D-Bus signal
1288
 
                mandos_dbus_service.ClientNotFound(fpr, address)
 
1287
                mandos_dbus_service.ClientNotFound(args)
1289
1288
        elif cmd == u"INVALID":
1290
1289
            for client in self.clients:
1291
1290
                if client.name == args:
1636
1635
                "D-Bus signal"
1637
1636
                pass
1638
1637
            
1639
 
            @dbus.service.signal(_interface, signature=u"ss")
1640
 
            def ClientNotFound(self, fingerprint, address):
 
1638
            @dbus.service.signal(_interface, signature=u"s")
 
1639
            def ClientNotFound(self, fingerprint):
1641
1640
                "D-Bus signal"
1642
1641
                pass
1643
1642