projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ahem. Use the right attribute
[mirror/userdir-ldap.git]
/
ud-useradd
diff --git
a/ud-useradd
b/ud-useradd
index
0c6bc04
..
c183dca
100755
(executable)
--- a/
ud-useradd
+++ b/
ud-useradd
@@
-20,9
+20,7
@@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
import re, time, ldap, getopt, sys, os, pwd;
# 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 *;
from userdir_ldap import *;
from userdir_gpg import *;
@@
-157,7
+155,9
@@
Res = raw_input("First name [" + cn + "]? ");
if Res != "":
cn = Res;
Res = raw_input("Middle name [" + mn + "]? ");
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 != "":
mn = Res;
Res = raw_input("Last name [" + sn + "]? ");
if Res != "":
@@
-239,22
+239,16
@@
Subst = {}
encto = ''
try:
encto = ''
try:
- encto = FullName.encode('us-ascii')
-except UnicodeDecodeError:
- if email.base64mime.base64_len(FullName) < email.quoprimime.header_quopri_len(FullName):
- encto = email.base64mime.header_encode(FullName, 'utf-8') + " " + emailaddr
- else:
- encto = email.quoprimime.header_encode(FullName, 'utf-8') + " " + emailaddr
+ encto = FullName.decode('us-ascii')
+except UnicodeError:
+ encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
subjstring = "New Debian Maintainer " + FullName
encsubj = ''
try:
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, 'utf-8')
- else:
- encsubj = email.quoprimime.header_encode(subjstring, 'utf-8')
+ encsubj = subjstring.decode('us-ascii')
+except UnicodeError:
+ encsubj = str(email.Header.Header(subjstring, 'utf-8', 200))
Subst["__HEADER_SUBJ__"] = encsubj
Subst["__HEADER_EMAIL"] = encto
Subst["__HEADER_SUBJ__"] = encsubj
Subst["__HEADER_EMAIL"] = encto
@@
-332,7
+326,7
@@
if Update == 1 and ForceMail == 0:
# Send the Welcome message
print "Sending Welcome Email"
# Send the Welcome message
print "Sending Welcome Email"
-Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" %
gidNumber
, "r").read())
+Reply = TemplateSubst(Subst,open(TemplatesDir + "/welcome-message-%d" %
int(gidNumber)
, "r").read())
Child = os.popen("/usr/sbin/sendmail -t","w");
#Child = os.popen("cat","w");
Child.write(Reply);
Child = os.popen("/usr/sbin/sendmail -t","w");
#Child = os.popen("cat","w");
Child.write(Reply);