/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-monitor

  • Committer: Björn Påhlsson
  • Date: 2011-06-23 22:27:15 UTC
  • mto: This revision was merged to the branch mainline in revision 485.
  • Revision ID: belorn@fukt.bsnet.se-20110623222715-q5wro9ma9iyjl367
* Makefile (CFLAGS): Added "-lrt" to include real time library.
* plugins.d/mandos-client.c: use scandir(3) instead of readdir(3)
                             Prefix all debug output with "Mandos plugin " + program_invocation_short_name
                             Retry servers that failed to provide password.
                             New option --retry SECONDS that sets the interval between rechecking.
                             --retry also controls how often it retries a server when using --connect.
* plugins.d/splashy.c:  Prefix all debug output with "Mandos plugin " + program_invocation_short_name
* plugins.d/usplash.c: --||--
* plugins.d/askpass-fifo.c: --||--
* plugins.d/password-prompt.c: --||--
* plugins.d/plymouth.c: --||--
* mandos: Lower logger level from warning to info on failed client requests because client was disabled or unknown fingerprint.
* plugins.d/plymouth.c (get_pid): bug fix. Was not calling free on direntries. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
358
358
        """Handle keys.
359
359
        This overrides the method from urwid.FlowWidget"""
360
360
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface)
 
361
            self.proxy.Enable(dbus_interface = client_interface,
 
362
                              ignore_reply=True)
362
363
        elif key == "-":
363
 
            self.proxy.Disable(dbus_interface = client_interface)
 
364
            self.proxy.Disable(dbus_interface = client_interface,
 
365
                               ignore_reply=True)
364
366
        elif key == "a":
365
367
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
 
                               dbus_interface = client_interface)
 
368
                               dbus_interface = client_interface,
 
369
                               ignore_reply=True)
367
370
        elif key == "d":
368
371
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
 
                                  dbus_interface = client_interface)
 
372
                                  dbus_interface = client_interface,
 
373
                               ignore_reply=True)
370
374
        elif key == "R" or key == "_" or key == "ctrl k":
371
375
            self.server_proxy_object.RemoveClient(self.proxy
372
 
                                                  .object_path)
 
376
                                                  .object_path,
 
377
                                                  ignore_reply=True)
373
378
        elif key == "s":
374
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
379
            self.proxy.StartChecker(dbus_interface = client_interface,
 
380
                                    ignore_reply=True)
375
381
        elif key == "S":
376
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
382
            self.proxy.StopChecker(dbus_interface = client_interface,
 
383
                                   ignore_reply=True)
377
384
        elif key == "C":
378
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
385
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
386
                                 ignore_reply=True)
379
387
        # xxx
380
388
#         elif key == "p" or key == "=":
381
389
#             self.proxy.pause()