projects
/
mirror
/
userdir-ldap.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d1a3fa3
)
Fix string vs. int issue in userlist introduced by multiple-ssh patch
author
Peter Palfrader
<peter@palfrader.org>
Sat, 17 May 2008 13:29:42 +0000
(15:29 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 17 May 2008 13:29:42 +0000
(15:29 +0200)
ud-generate
patch
|
blob
|
history
diff --git
a/ud-generate
b/ud-generate
index
b48cdc3
..
1ad51f9
100755
(executable)
--- 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;
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"),\
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.
# 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:
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)
continue
to = tf.gettarinfo(os.path.join(GlobalDir, 'userkeys', f), f)