Add a -h for ud-useradd

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

diff --git a/ud-useradd b/ud-useradd
index 243443f..9d51b69 100755 (executable)
--- 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
@@ -60,9 +61,18 @@ ForceMail = 0;
 NoAutomaticIDs = 0;
 OldGPGKeyRings = GPGKeyRings;
 userdir_gpg.GPGKeyRings = [];
-(options, arguments) = getopt.getopt(sys.argv[1:], "u:man")
+(options, arguments) = getopt.getopt(sys.argv[1:], "hu:man")
 for (switch, val) in options:
-   if (switch == '-u'):
+   if (switch == '-h'):
+      print "Usage: ud-useradd <options>"
+      print "Available options:"
+      print "        -h         Show this help"
+      print "        -u=<user>  Admin user (defaults to current username)"
+      print "        -m         Force mail (for updates)"
+      print "        -a         Use old keyrings instead (??)"
+      print "        -n         Do not automatically assign UID/GIDs (useful for usergroups or non-default group membership"
+      sys.exit(0)
+   elif (switch == '-u'):
       AdminUser = val;
    elif (switch == '-m'):
       ForceMail = 1;
@@ -243,21 +253,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()));
@@ -340,3 +342,7 @@ Child = os.popen("/usr/sbin/sendmail -t","w");
 Child.write(Reply);
 if Child.close() != None:
    raise Error, "Sendmail gave a non-zero return code";
+
+# vim:set et:
+# vim:set ts=3:
+# vim:set shiftwidth=3: