/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: 2010-09-12 03:22:48 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912032248-6cizkymqivr5uzwm
* Makefile (run-server): Remove warning about now-eliminated error.

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("Approval timed out")
 
1246
                                client.Rejected("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
 
1490
1493
        # error or the other end of multiprocessing.Pipe has closed
1491
1494
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1492
1495
            return False
1493
1496
        
1494
1497
        # Read a request from the child
1495
1498
        request = parent_pipe.recv()
 
1499
        logger.debug(u"IPC request: %s", repr(request))
1496
1500
        command = request[0]
1497
1501
        
1498
1502
        if command == 'init':