/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-02-24 13:52:18 UTC
  • mfrom: (237.2.16 mandos-release)
  • Revision ID: teddy@fukt.bsnet.se-20090224135218-kl93eq7slwm9gxc2
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
949
949
                      " files")
950
950
    parser.add_option("--no-dbus", action="store_false",
951
951
                      dest="use_dbus",
952
 
                      help=optparse.SUPPRESS_HELP) # XXX: Not done yet
 
952
                      help="Do not provide D-Bus system bus"
 
953
                      " interface")
953
954
    parser.add_option("--no-ipv6", action="store_false",
954
955
                      dest="use_ipv6", help="Do not use IPv6")
955
956
    options = parser.parse_args()[0]
1003
1004
    # For convenience
1004
1005
    debug = server_settings["debug"]
1005
1006
    use_dbus = server_settings["use_dbus"]
1006
 
    use_dbus = False            # XXX: Not done yet
1007
1007
    use_ipv6 = server_settings["use_ipv6"]
1008
1008
    
1009
1009
    if not debug: