/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 Hogeborn
  • Date: 2013-10-20 15:25:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 305.
  • Revision ID: teddy@recompile.se-20131020152509-zkhuy2yse76w10hg
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment.
  (purge-server): PID file changed to "/run/mandos.pid".
* debian/compat: Changed to "9".
* debian/control (Standards-Version): Updated to "3.9.4".
  (DM-Upload-Allowed): Removed.
  (mandos/Depends): Add "initscripts (>= 2.88dsf-13.3)" to be able to
                    use the "/run" directory (for mandos.pid).
* debian/copyright (Copyright): Update year.
* init.d-mandos (PIDFILE): Changed to "/run/mandos.pid".
* mandos: Update copyright year.
  (pidfilename): Changed to "/run/mandos.pid".
* mandos-clients.conf.xml (OPTIONS/approval_delay): Bug fix: default
                                                    is "PT0S" - using
                                                    the new RFC 3339
                                                    duration syntax.
* mandos-keygen: Update copyright year.
* mandos-monitor: - '' -
* mandos.conf.xml: - '' -
* mandos.xml: - '' -
  (FILES): PID file changed to "/run/mandos.pid".
* plugin-runner.c: Update copyright year.
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/plymouth.c: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
# 
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2013 Teddy Hogeborn
 
15
# Copyright © 2008-2013 Björn Påhlsson
16
16
# 
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
88
88
    except ImportError:
89
89
        SO_BINDTODEVICE = None
90
90
 
91
 
version = "1.6.0"
 
91
version = "1.6.1"
92
92
stored_state_file = "clients.pickle"
93
93
 
94
94
logger = logging.getLogger()
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
2445
2450
                              socketfd=(server_settings["socket"]
2446
2451
                                        or None))
2447
2452
    if not foreground:
2448
 
        pidfilename = "/var/run/mandos.pid"
 
2453
        pidfilename = "/run/mandos.pid"
2449
2454
        pidfile = None
2450
2455
        try:
2451
2456
            pidfile = open(pidfilename, "w")