X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-useradd;h=2676933e18c3aca5a52eaefbcf0b5f8b5b7d38bb;hb=ceddba86a136bdf832c607c6639b95a87effeb48;hp=243443fb52da5c2eaa9bb4fade1f81cb360973b0;hpb=5e4961c91009a15736f426c918c8d9dc8013cde2;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-useradd b/ud-useradd
index 243443f..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
@@ -243,21 +244,13 @@ if Res != "yes":
 # Initialize the substitution Map
 Subst = {}
 
-encto = ''
+encrealname = ''
 try:
-  encto = FullName.decode('us-ascii')
+  encrealname = FullName.decode('us-ascii')
 except UnicodeError:
-  encto = str(email.Header.Header(FullName, 'utf-8', 200)) + " " + emailaddr
+  encrealname = str(email.Header.Header(FullName, 'utf-8', 200))
 
-subjstring = "New Debian Maintainer " + FullName
-encsubj = ''
-try:
-  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["__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()));