/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: 2012-05-01 20:48:00 UTC
  • Revision ID: teddy@recompile.se-20120501204800-0wkzdkcd3epzci45
* mandos (main): Simplify and shorten code selecting user and group ID
                 to switch to.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
2256
2256
        except IOError:
2257
2257
            logger.error("Could not open file %r", pidfilename)
2258
2258
    
2259
 
    try:
2260
 
        uid = pwd.getpwnam("_mandos").pw_uid
2261
 
        gid = pwd.getpwnam("_mandos").pw_gid
2262
 
    except KeyError:
 
2259
    for name in ("_mandos", "mandos", "nobody"):
2263
2260
        try:
2264
 
            uid = pwd.getpwnam("mandos").pw_uid
2265
 
            gid = pwd.getpwnam("mandos").pw_gid
 
2261
            uid = pwd.getpwnam(name).pw_uid
 
2262
            gid = pwd.getpwnam(name).pw_gid
 
2263
            break
2266
2264
        except KeyError:
2267
 
            try:
2268
 
                uid = pwd.getpwnam("nobody").pw_uid
2269
 
                gid = pwd.getpwnam("nobody").pw_gid
2270
 
            except KeyError:
2271
 
                uid = 65534
2272
 
                gid = 65534
 
2265
            continue
 
2266
    else:
 
2267
        uid = 65534
 
2268
        gid = 65534
2273
2269
    try:
2274
2270
        os.setgid(gid)
2275
2271
        os.setuid(uid)