/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
63
63
import ctypes
64
64
import ctypes.util
65
65
 
66
 
version = "1.0"
 
66
version = "1.0.2"
67
67
 
68
68
logger = logging.Logger('mandos')
69
69
syslogger = logging.handlers.SysLogHandler\
240
240
        if "secret" in config:
241
241
            self.secret = config["secret"].decode(u"base64")
242
242
        elif "secfile" in config:
243
 
            secfile = open(config["secfile"])
 
243
            secfile = open(os.path.expanduser(os.path.expandvars
 
244
                                              (config["secfile"])))
244
245
            self.secret = secfile.read()
245
246
            secfile.close()
246
247
        else: