/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 from trunk; fix compilation error on AMD64.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
972
972
    # Parse config file with clients
973
973
    client_defaults = { "timeout": "1h",
974
974
                        "interval": "5m",
975
 
                        "checker": "fping -q -- %(host)s",
 
975
                        "checker": "fping -q -- %%(host)s",
976
976
                        "host": "",
977
977
                        }
978
978
    client_config = ConfigParser.SafeConfigParser(client_defaults)
993
993
    
994
994
    try:
995
995
        uid = pwd.getpwnam("_mandos").pw_uid
 
996
        gid = pwd.getpwnam("_mandos").pw_gid
996
997
    except KeyError:
997
998
        try:
998
999
            uid = pwd.getpwnam("mandos").pw_uid
 
1000
            gid = pwd.getpwnam("mandos").pw_gid
999
1001
        except KeyError:
1000
1002
            try:
1001
1003
                uid = pwd.getpwnam("nobody").pw_uid
 
1004
                gid = pwd.getpwnam("nogroup").pw_gid
1002
1005
            except KeyError:
1003
1006
                uid = 65534
1004
 
    try:
1005
 
        gid = pwd.getpwnam("_mandos").pw_gid
1006
 
    except KeyError:
1007
 
        try:
1008
 
            gid = pwd.getpwnam("mandos").pw_gid
1009
 
        except KeyError:
1010
 
            try:
1011
 
                gid = pwd.getpwnam("nogroup").pw_gid
1012
 
            except KeyError:
1013
1007
                gid = 65534
1014
1008
    try:
1015
1009
        os.setuid(uid)