From c2f27da86e2bcbab743a469b24a8186b54df7b74 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 17 May 2008 15:29:42 +0200 Subject: [PATCH] Fix string vs. int issue in userlist introduced by multiple-ssh patch --- ud-generate | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ud-generate b/ud-generate index b48cdc3..1ad51f9 100755 --- a/ud-generate +++ b/ud-generate @@ -131,7 +131,7 @@ def GenPasswd(l,File,HomePrefix,PwdMarker): if len(GetAttr(x,"gecos")) > 100 or len(GetAttr(x,"loginShell")) > 50: continue; - userlist[GetAttr(x, "uid")] = GetAttr(x, "gidNumber") + userlist[GetAttr(x, "uid")] = int(GetAttr(x, "gidNumber")) Line = "%s:%s:%s:%s:%s:%s%s:%s" % (GetAttr(x,"uid"),\ PwdMarker,\ GetAttr(x,"uidNumber"),GetAttr(x,"gidNumber"),\ @@ -983,12 +983,12 @@ while(1): # In these cases, look it up in the normal way so we # deal with cases where, for instance, users are in group # users as their primary group. - grname = grp.getgrgid(int(userlist[f]))[0] + grname = grp.getgrgid(userlist[f])[0] except Exception, e: pass if grname is None: - print "User %s is supposed to have their key exported to host %s but their primary group (gid: %s) isn't in LDAP" % (f, CurrentHost, userlist[f]) + print "User %s is supposed to have their key exported to host %s but their primary group (gid: %d) isn't in LDAP" % (f, CurrentHost, userlist[f]) continue to = tf.gettarinfo(os.path.join(GlobalDir, 'userkeys', f), f) -- 2.20.1