/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: 2016-10-09 22:35:41 UTC
  • Revision ID: teddy@recompile.se-20161009223541-2g2xrvfii5m5ibjw
Stop the GnuPG agent after Debian package installation

* debian/mandos-client.postinst (create_key): Stop GPG agent after
                                              running mandos-keygen.

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-2017 Teddy Hogeborn
15
 
# Copyright © 2008-2017 Björn Påhlsson
 
14
# Copyright © 2008-2016 Teddy Hogeborn
 
15
# Copyright © 2008-2016 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
114
114
if sys.version_info.major == 2:
115
115
    str = unicode
116
116
 
117
 
version = "1.7.15"
 
117
version = "1.7.13"
118
118
stored_state_file = "clients.pickle"
119
119
 
120
120
logger = logging.getLogger()
515
515
    _need_version = b"3.3.0"
516
516
 
517
517
    def __init__(self):
518
 
        # Need to use "self" here, since this method is called before
519
 
        # the assignment to the "gnutls" global variable happens.
520
 
        if self.check_version(self._need_version) is None:
521
 
            raise self.Error("Needs GnuTLS {} or later"
522
 
                             .format(self._need_version))
 
518
        # Need to use class name "GnuTLS" here, since this method is
 
519
        # called before the assignment to the "gnutls" global variable
 
520
        # happens.
 
521
        if GnuTLS.check_version(self._need_version) is None:
 
522
            raise GnuTLS.Error("Needs GnuTLS {} or later"
 
523
                               .format(self._need_version))
523
524
 
524
525
    # Unless otherwise indicated, the constants and types below are
525
526
    # all from the gnutls/gnutls.h C header file.
1460
1461
                         exc_info=error)
1461
1462
        return xmlstring
1462
1463
 
1463
 
 
1464
1464
try:
1465
1465
    dbus.OBJECT_MANAGER_IFACE
1466
1466
except AttributeError:
2883
2883
    # Convert the SafeConfigParser object to a dict
2884
2884
    server_settings = server_config.defaults()
2885
2885
    # Use the appropriate methods on the non-string config options
2886
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2887
 
                   "foreground", "zeroconf"):
 
2886
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2888
2887
        server_settings[option] = server_config.getboolean("DEFAULT",
2889
2888
                                                           option)
2890
2889
    if server_settings["port"]: