/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: 2017-08-20 19:12:58 UTC
  • mto: This revision was merged to the branch mainline in revision 911.
  • Revision ID: teddy@recompile.se-20170820191258-9s80xonyan5vavbo
Tags: version-1.7.16-1
* Makefile (version): Change to 1.7.16.
* NEWS (Version 1.7.16): Add new entry.
* debian/changelog (1.7.16-1): - '' -

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-2018 Teddy Hogeborn
15
 
# Copyright © 2008-2018 Björn Påhlsson
 
14
# Copyright © 2008-2017 Teddy Hogeborn
 
15
# Copyright © 2008-2017 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
115
115
if sys.version_info.major == 2:
116
116
    str = unicode
117
117
 
118
 
version = "1.7.20"
 
118
version = "1.7.16"
119
119
stored_state_file = "clients.pickle"
120
120
 
121
121
logger = logging.getLogger()
496
496
class AvahiServiceToSyslog(AvahiService):
497
497
    def rename(self, *args, **kwargs):
498
498
        """Add the new name to the syslog messages"""
499
 
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
 
499
        ret = AvahiService.rename(self, *args, **kwargs)
500
500
        syslogger.setFormatter(logging.Formatter(
501
501
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
502
502
            .format(self.name)))
2365
2365
                                       ctypes.byref(crtverify))
2366
2366
        if crtverify.value != 0:
2367
2367
            gnutls.openpgp_crt_deinit(crt)
2368
 
            raise gnutls.CertificateSecurityError(code
2369
 
                                                  =crtverify.value)
 
2368
            raise gnutls.CertificateSecurityError("Verify failed")
2370
2369
        # New buffer for the fingerprint
2371
2370
        buf = ctypes.create_string_buffer(20)
2372
2371
        buf_len = ctypes.c_size_t()
2579
2578
        command = request[0]
2580
2579
 
2581
2580
        if command == 'init':
2582
 
            fpr = request[1].decode("ascii")
 
2581
            fpr = request[1]
2583
2582
            address = request[2]
2584
2583
 
2585
2584
            for c in self.clients.values():