From 849e0e4b017eea17d7a7451878ccce018ece129d Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 9 Jan 2010 00:20:16 +0100 Subject: [PATCH] ud-useradd: Fix usergroup support: Move ldap call to actually add the user to the right place, properly compare strings and numbers. --- debian/changelog | 5 ++++- ud-useradd | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index cbf03df..92fadd2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,11 @@ userdir-ldap (0.3.76xXx) unstable; urgency=low group. * ud-useradd: If we do not have a template for a specific group, use the general purpose template file (welcome-message). + * ud-useradd: Fix usergroup support: + - Move ldap call to actually add the user to the right place, + - Properly compare strings and numbers. - -- Peter Palfrader Sat, 09 Jan 2010 00:16:26 +0100 + -- Peter Palfrader Sat, 09 Jan 2010 00:19:44 +0100 userdir-ldap (0.3.75) unstable; urgency=low diff --git a/ud-useradd b/ud-useradd index ee04983..52689b3 100755 --- a/ud-useradd +++ b/ud-useradd @@ -187,7 +187,7 @@ if NoAutomaticIDs: Res = raw_input("Group ID Number (default group is %s, new usergroup %s) [%s]" % (DefaultGID, generatedGID, gidNumber)); if Res != "": if Res.isdigit(): - gidNumber = Res; + gidNumber = int(Res); else: gidNumber = Group2GID(l, Res); @@ -286,13 +286,12 @@ if Update == 0: Details.append(("mn",mn)); if privsub != " ": Details.append(("privateSub",privsub)) + l.add_s(Dn,Details); #Add user group if needed, then the actual user: if UserGroup == 1: Dn = "gid=" + account + "," + BaseDn; l.add_s(Dn,[("gid",account), ("gidNumber",str(gidNumber)), ("objectClass", GroupObjectClasses)]) - - l.add_s(Dn,Details); else: # Modification Rec = [(ldap.MOD_REPLACE,"uidNumber",str(uidNumber)), -- 2.20.1