X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=2676933e18c3aca5a52eaefbcf0b5f8b5b7d38bb;hb=0b086a5406ec0ccae9c660050af7c9f343cf89e6;hp=62e4f4d61ef1c5622c2697cdb6aef50d08331732;hpb=ecc535d579851f8463aa231bb428d1041c9cf730;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-useradd b/ud-useradd
index 62e4f4d..2676933 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -4,6 +4,7 @@
 #   Copyright (c) 1999-2000  Jason Gunthorpe <jgg@debian.org>
 #   Copyright (c) 2001-2003  James Troup <troup@debian.org>
 #   Copyright (c) 2004  Joey Schulze <joey@infodrom.org>
+#   Copyright (c) 2008,2009,2010 Peter Palfrader <peter@palfrader.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -20,13 +21,13 @@
 #   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import re, time, ldap, getopt, sys, os, pwd;
-import email
-import email.base64mime
-import email.quoprimime
+import email.Header
 
 from userdir_ldap import *;
 from userdir_gpg import *;
 
+HavePrivateList = getattr(ConfModule, "haveprivatelist", True)
+
 # This tries to search for a free UID. There are two possible ways to do
 # this, one is to fetch all the entires and pick the highest, the other
 # is to randomly guess uids until one is free. This uses the former.
@@ -157,7 +158,9 @@ Res = raw_input("First name [" + cn + "]? ");
 if Res != "":
    cn = Res;
 Res = raw_input("Middle name [" + mn + "]? ");
-if Res != "":
+if Res == " ":
+   mn = ""
+elif Res != "":
    mn = Res;
 Res = raw_input("Last name [" + sn + "]? ");
 if Res != "":
@@ -167,9 +170,12 @@ if Res != "":
    emailaddr = Res;
 
 # Debian-Private subscription
-Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
-if Res != "":
-   privsub = Res;
+if HavePrivateList:
+   Res = raw_input("Subscribe to debian-private (space is none) [" + privsub + "]? ");
+   if Res != "":
+      privsub = Res;
+else:
+   privsub = " "
 
 (uidNumber, generatedGID) = GetFreeID(l)
 if not gidNumber:
@@ -187,7 +193,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);
    
@@ -226,7 +232,8 @@ print "Final information collected:"
 print " %s <%s@%s>:" % (FullName,account,EmailAppend);
 print "   Assigned UID:",uidNumber," GID:", gidNumber;
 print "   Email forwarded to:",emailaddr
-print "   Private Subscription:",privsub;
+if HavePrivateList:
+   print "   Private Subscription:",privsub;
 print "   GECOS Field: \"%s,,,,\"" % (FullName);
 print "   Login Shell: /bin/bash";
 print "   Key Fingerprint:",Keys[0][1];
@@ -237,28 +244,13 @@ if Res != "yes":
 # Initialize the substitution Map
 Subst = {}
 
-emailstring = FullName + " " + emailaddr
-encto = ''
+encrealname = ''
 try:
-  encto = emailstring.encode('us-ascii')
-except UnicodeDecodeError:
-  if email.base64mime.base64_len(emailstring) < email.quoprimime.header_quopri_len(emailstring):
-    encto = email.base64mime.header_encode(emailstring, 'us-ascii')
-  else:
-    encto = email.quoprimime.header_encode(emailstring, 'us-ascii')
-
-subjstring = "New Debian Maintainer " + FullName
-encsubj = ''
-try:
-  encsubj = subjstring.encode('us-ascii')
-except UnicodeDecodeError:
-  if email.base64mime.base64_len(subjstring) < email.quoprimime.header_quopri_len(subjstring):
-    encsubj = email.base64mime.header_encode(subjstring, 'us-ascii')
-  else:
-    encsubj = email.quoprimime.header_encode(subjstring, 'us-ascii')
-
-Subst["__HEADER_SUBJ__"] = encsubj
-Subst["__HEADER_EMAIL"] = encto
+  encrealname = FullName.decode('us-ascii')
+except UnicodeError:
+  encrealname = str(email.Header.Header(FullName, 'utf-8', 200))
+
+Subst["__ENCODED_REALNAME__"] = encrealname
 Subst["__REALNAME__"] = FullName;
 Subst["__WHOAMI__"] = pwd.getpwuid(os.getuid())[0];
 Subst["__DATE__"] = time.strftime("%a, %d %b %Y %H:%M:%S +0000",time.gmtime(time.time()));
@@ -293,13 +285,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)),
@@ -333,7 +324,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);