/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: 2009-09-17 04:16:32 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090917041632-7m1rm83pxguw5zw7
* plugins.d/usplash.c (main): Bug fix: only close FIFO if opened.

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.12"
 
80
version = "1.0.11"
81
81
 
82
82
logger = logging.Logger(u'mandos')
83
83
syslogger = (logging.handlers.SysLogHandler
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",
1200
 
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
 
1199
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1200
                      u" system bus interface")
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
1259
1258
    use_ipv6 = server_settings[u"use_ipv6"]
1260
1259
    
1261
1260
    if not debug: