/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: 2013-06-23 15:13:06 UTC
  • Revision ID: teddy@recompile.se-20130623151306-3y4zwy76d95hcvpq
* mandos: Bug fix: Make boolean options work from the config file
          again.
          Bug fix: Make --no-ipv6 work again.
          Bug fix: Add extra magic to GnuTLS priority to make it work
          with current version of GnuTLS.
* mandos-options.xml (priority): Document new default value.
* mandos.conf (priority): - '' -
* plugins.d/mandos-client.xml (EXAMPLE): Minor grammar fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
1991
1991
                if self.address_family == socket.AF_INET6:
1992
1992
                    any_address = "::" # in6addr_any
1993
1993
                else:
1994
 
                    any_address = socket.INADDR_ANY
 
1994
                    any_address = "0.0.0.0" # INADDR_ANY
1995
1995
                self.server_address = (any_address,
1996
1996
                                       self.server_address[1])
1997
1997
            elif not self.server_address[1]:
2302
2302
                        help="Run self-test")
2303
2303
    parser.add_argument("--debug", action="store_true",
2304
2304
                        help="Debug mode; run in foreground and log"
2305
 
                        " to terminal")
 
2305
                        " to terminal", default=None)
2306
2306
    parser.add_argument("--debuglevel", metavar="LEVEL",
2307
2307
                        help="Debug level for stdout output")
2308
2308
    parser.add_argument("--priority", help="GnuTLS"
2315
2315
                        " files")
2316
2316
    parser.add_argument("--no-dbus", action="store_false",
2317
2317
                        dest="use_dbus", help="Do not provide D-Bus"
2318
 
                        " system bus interface")
 
2318
                        " system bus interface", default=None)
2319
2319
    parser.add_argument("--no-ipv6", action="store_false",
2320
 
                        dest="use_ipv6", help="Do not use IPv6")
 
2320
                        dest="use_ipv6", help="Do not use IPv6",
 
2321
                        default=None)
2321
2322
    parser.add_argument("--no-restore", action="store_false",
2322
2323
                        dest="restore", help="Do not restore stored"
2323
 
                        " state")
 
2324
                        " state", default=None)
2324
2325
    parser.add_argument("--socket", type=int,
2325
2326
                        help="Specify a file descriptor to a network"
2326
2327
                        " socket to use instead of creating one")
2327
2328
    parser.add_argument("--statedir", metavar="DIR",
2328
2329
                        help="Directory to save/restore state in")
2329
2330
    parser.add_argument("--foreground", action="store_true",
2330
 
                        help="Run in foreground")
 
2331
                        help="Run in foreground", default=None)
2331
2332
    
2332
2333
    options = parser.parse_args()
2333
2334
    
2342
2343
                        "port": "",
2343
2344
                        "debug": "False",
2344
2345
                        "priority":
2345
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2346
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:+SIGN-RSA-SHA224",
2346
2347
                        "servicename": "Mandos",
2347
2348
                        "use_dbus": "True",
2348
2349
                        "use_ipv6": "True",
2392
2393
    for option in server_settings.keys():
2393
2394
        if type(server_settings[option]) is str:
2394
2395
            server_settings[option] = unicode(server_settings[option])
 
2396
    # Force all boolean options to be boolean
 
2397
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
 
2398
                   "foreground"):
 
2399
        server_settings[option] = bool(server_settings[option])
2395
2400
    # Debug implies foreground
2396
2401
    if server_settings["debug"]:
2397
2402
        server_settings["foreground"] = True