/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

  • Committer: teddy at bsnet
  • Date: 2010-08-16 19:00:59 UTC
  • mto: (237.2.183 mandos-local)
  • mto: This revision was merged to the branch mainline in revision 270.
  • Revision ID: teddy@fukt.bsnet.se-20100816190059-69vvi27up95cgbbl
* Makefile (run-server, run-client): Add notices about harmless error
                                     messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
77
77
        SO_BINDTODEVICE = None
78
78
 
79
79
 
80
 
version = "1.0.11"
 
80
version = "1.0.14"
81
81
 
82
82
logger = logging.Logger(u'mandos')
83
83
syslogger = (logging.handlers.SysLogHandler
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,
1195
1196
                      help=u"Directory to search for configuration"
1196
1197
                      u" files")
1197
1198
    parser.add_option("--no-dbus", action=u"store_false",
1198
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1199
 
                      u" system bus interface")
 
1199
                      dest=u"use_dbus",
 
1200
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
1200
1201
    parser.add_option("--no-ipv6", action=u"store_false",
1201
1202
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1202
1203
    options = parser.parse_args()[0]
1254
1255
    # For convenience
1255
1256
    debug = server_settings[u"debug"]
1256
1257
    use_dbus = server_settings[u"use_dbus"]
 
1258
    use_dbus = False            # XXX: Not done yet
1257
1259
    use_ipv6 = server_settings[u"use_ipv6"]
1258
1260
    
1259
1261
    if not debug: