/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

Merge from Björn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1243
1243
                                           client.name)
1244
1244
                            if self.server.use_dbus:
1245
1245
                                # Emit D-Bus signal
1246
 
                                client.Rejected("Timed out")
 
1246
                                client.Rejected("Approval timed out")
1247
1247
                            return
1248
1248
                        else:
1249
1249
                            break
1487
1487
                                       for cond, name in
1488
1488
                                       condition_names.iteritems()
1489
1489
                                       if cond & condition)
1490
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1491
 
                     conditions_string)
1492
 
 
1493
1490
        # error or the other end of multiprocessing.Pipe has closed
1494
1491
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1495
1492
            return False
1496
1493
        
1497
1494
        # Read a request from the child
1498
1495
        request = parent_pipe.recv()
1499
 
        logger.debug(u"IPC request: %s", repr(request))
1500
1496
        command = request[0]
1501
1497
        
1502
1498
        if command == 'init':