/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: 2010-09-12 18:12:11 UTC
  • mto: (237.4.3 mandos-release)
  • mto: This revision was merged to the branch mainline in revision 428.
  • Revision ID: belorn@fukt.bsnet.se-20100912181211-wvkt0sk37zhx7tws
mandos-client: Added never ending loop for --connect
mandos-ctl: Better option parsing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1227
1227
                                           client.name)
1228
1228
                            if self.server.use_dbus:
1229
1229
                                # Emit D-Bus signal
1230
 
                                client.Rejected("Time out")
 
1230
                                client.Rejected("Approval timed out")
1231
1231
                            return
1232
1232
                        else:
1233
1233
                            break
1471
1471
                                       for cond, name in
1472
1472
                                       condition_names.iteritems()
1473
1473
                                       if cond & condition)
1474
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1475
 
                     conditions_string)
1476
 
 
1477
1474
        # error or the other end of multiprocessing.Pipe has closed
1478
1475
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1479
1476
            return False
1480
1477
        
1481
1478
        # Read a request from the child
1482
1479
        request = parent_pipe.recv()
1483
 
        logger.debug(u"IPC request: %s", repr(request))
1484
1480
        command = request[0]
1485
1481
        
1486
1482
        if command == 'init':