/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: 2018-02-10 19:02:09 UTC
  • mfrom: (237.7.478 trunk)
  • Revision ID: teddy@recompile.se-20180210190209-h3y8b55v0dmn5ri6
Merge from trunk

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-2018 Teddy Hogeborn
 
15
# Copyright © 2008-2018 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
496
496
class AvahiServiceToSyslog(AvahiService):
497
497
    def rename(self, *args, **kwargs):
498
498
        """Add the new name to the syslog messages"""
499
 
        ret = AvahiService.rename(self, *args, **kwargs)
 
499
        ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
500
500
        syslogger.setFormatter(logging.Formatter(
501
501
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
502
502
            .format(self.name)))
2578
2578
        command = request[0]
2579
2579
 
2580
2580
        if command == 'init':
2581
 
            fpr = request[1]
 
2581
            fpr = request[1].decode("ascii")
2582
2582
            address = request[2]
2583
2583
 
2584
2584
            for c in self.clients.values():