From: Peter Palfrader <peter@palfrader.org>
Date: Wed, 9 Sep 2009 17:20:37 +0000 (+0200)
Subject: ud-useradd: force gidNumber to be an int when we open the welcome
X-Git-Tag: userdir-ldap-0.3.72~9
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=46be797703adf5f2ad080b053ab24511cde688e7

ud-useradd: force gidNumber to be an int when we open the welcome
template (it can be different when we read it from input using -n).
---

diff --git a/debian/changelog b/debian/changelog
index 9770005..bd7673c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 userdir-ldap (0.3.72XX) Xnstable; urgency=low
 
   * ud-useradd: Allow unsetting of middle names by entering a space.
+  * ud-useradd: force gidNumber to be an int when we open the welcome
+    template (it can be different when we read it from input using -n).
 
- -- Peter Palfrader <weasel@debian.org>  Tue, 25 Aug 2009 12:01:33 +0200
+ -- Peter Palfrader <weasel@debian.org>  Wed, 09 Sep 2009 19:19:55 +0200
 
 userdir-ldap (0.3.71) unstable; urgency=low
 
diff --git a/ud-useradd b/ud-useradd
index 25fd604..627cc14 100755
--- a/ud-useradd
+++ b/ud-useradd
@@ -326,7 +326,7 @@ 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())
+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);