/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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
119
119
        self.domain = domain
120
120
        self.host = host
121
121
        self.rename_count = 0
 
122
        self.max_renames = max_renames
122
123
    def rename(self):
123
124
        """Derived from the Avahi example code"""
124
125
        if self.rename_count >= self.max_renames:
125
126
            logger.critical(u"No suitable service name found after %i"
126
127
                            u" retries, exiting.", rename_count)
127
128
            raise AvahiServiceError("Too many renames")
128
 
        name = server.GetAlternativeServiceName(name)
129
 
        logger.error(u"Changing name to %r ...", name)
 
129
        self.name = server.GetAlternativeServiceName(self.name)
 
130
        logger.info(u"Changing name to %r ...", str(self.name))
130
131
        syslogger.setFormatter(logging.Formatter\
131
132
                               ('Mandos (%s): %%(levelname)s:'
132
 
                               ' %%(message)s' % name))
 
133
                               ' %%(message)s' % self.name))
133
134
        self.remove()
134
135
        self.add()
135
136
        self.rename_count += 1
699
700
    server_config = ConfigParser.SafeConfigParser(server_defaults)
700
701
    del server_defaults
701
702
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
702
 
    server_section = "server"
703
703
    # Convert the SafeConfigParser object to a dict
704
 
    server_settings = dict(server_config.items(server_section))
 
704
    server_settings = server_config.defaults()
705
705
    # Use getboolean on the boolean config option
706
706
    server_settings["debug"] = server_config.getboolean\
707
 
                               (server_section, "debug")
 
707
                               ("DEFAULT", "debug")
708
708
    del server_config
709
709
    
710
710
    # Override the settings from the config file with command line