/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:
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
901
901
    def process_request(self, request, client_address):
902
902
        """Overrides and wraps the original process_request().
903
903
        
904
 
        This function creates a new pipe in self.pipe 
 
904
        This function creates a new pipe in self.pipe
905
905
        """
906
906
        self.pipe = os.pipe()
907
907
        super(ForkingMixInWithPipe,
1196
1196
                      help=u"Directory to search for configuration"
1197
1197
                      u" files")
1198
1198
    parser.add_option("--no-dbus", action=u"store_false",
1199
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1200
 
                      u" system bus interface")
 
1199
                      dest=u"use_dbus",
 
1200
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
1201
1201
    parser.add_option("--no-ipv6", action=u"store_false",
1202
1202
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1203
1203
    options = parser.parse_args()[0]
1255
1255
    # For convenience
1256
1256
    debug = server_settings[u"debug"]
1257
1257
    use_dbus = server_settings[u"use_dbus"]
 
1258
    use_dbus = False            # XXX: Not done yet
1258
1259
    use_ipv6 = server_settings[u"use_ipv6"]
1259
1260
    
1260
1261
    if not debug: