Since subscription to debian-private can be set to ' ', this should be

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

diff --git a/ud-useradd b/ud-useradd
index 829d707..97066d0 100755 (executable)
--- a/ud-useradd
+++ b/ud-useradd
@@ -1,6 +1,24 @@
 #!/usr/bin/env python
 # -*- mode: python -*-
 
+#   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>
+#
+#   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
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 import string, re, time, ldap, getopt, sys, os, pwd;
 from userdir_ldap import *;
 from userdir_gpg import *;
@@ -66,7 +84,8 @@ while (1):
    Keys = GPGKeySearch(Foo);
 
    if len(Keys) == 0:
-      print "Sorry, that search did not turn up any keys";
+      print "Sorry, that search did not turn up any keys."
+      print "Has it been added to the Debian keyring already?"
       continue;
    if len(Keys) > 1:
       print "Sorry, more than one key was found, please specify the key to use by\nfingerprint:";
@@ -152,7 +171,7 @@ if Res != "":
 # GID
 Res = raw_input("Group ID Number [" + gidNumber + "]? ");
 if Res != "":
-   gidNumber = Res;
+   gidNumber = Group2GID(Res);
 
 # UID
 if uidNumber == 0:
@@ -230,10 +249,11 @@ if Update == 0:
               ("shadowMin","0"),
               ("shadowMax","99999"),
               ("shadowWarning","7"),
-              ("privateSub",privsub),
               ("userPassword","{crypt}"+Pass)];
    if mn:
       Details.append(("mn",mn));
+   if privsub != " ":
+      Details.append(("privateSub",privsub))
    l.add_s(Dn,Details);
 else:
    # Modification