ud-useradd: Fix usergroup support: Move ldap call to actually add the user to the...

[mirror/userdir-ldap.git] / ud-useradd

diff --git a/ud-useradd b/ud-useradd
index 25fd604..52689b3 100755 (executable)
--- 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);
    
@@ -241,14 +241,14 @@ encto = ''
 try:
   encto = FullName.decode('us-ascii')
 except UnicodeError:
-  encto = email.Header.Header(FullName, 'utf-8', 200) + " " + emailaddr
+  encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
 
 subjstring = "New Debian Maintainer " + FullName
 encsubj = ''
 try:
   encsubj = subjstring.decode('us-ascii')
 except UnicodeError:
-  encsubj = email.Header.Header(subjstring, 'utf-8', 200)
+  encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
 
 Subst["__HEADER_SUBJ__"] = encsubj
 Subst["__HEADER_EMAIL"] = encto
@@ -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)),
@@ -326,7 +325,10 @@ if Update == 1 and ForceMail == 0:
 
 # Send the Welcome message
 print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" % gidNumber, "r").read())
+templatepath = TemplatesDir + "/welcome-message-%d" % int(gidNumber)
+if not os.path.exists(templatepath):
+   templatepath = TemplatesDir + "/welcome-message"
+Reply = TemplateSubst(Subst,open(templatepath, "r").read())
 Child = os.popen("/usr/sbin/sendmail -t","w");
 #Child = os.popen("cat","w");
 Child.write(Reply);