/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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
811
811
                    client = c
812
812
                    break
813
813
            else:
814
 
                ipc.write(u"NOTFOUND %s\n" % fpr)
 
814
                ipc.write(u"NOTFOUND %s %s\n"
 
815
                          % (fpr, unicode(self.client_address)))
815
816
                session.bye()
816
817
                return
817
818
            # Have to check if client.still_valid(), since it is
900
901
    def process_request(self, request, client_address):
901
902
        """Overrides and wraps the original process_request().
902
903
        
903
 
        This function creates a new pipe in self.pipe 
 
904
        This function creates a new pipe in self.pipe
904
905
        """
905
906
        self.pipe = os.pipe()
906
907
        super(ForkingMixInWithPipe,