s4:various scripts under "setup" - Unification

[ira/wip.git] / source4 / setup / newuser

diff --git a/source4/setup/newuser b/source4/setup/newuser
index 5f53aad9c6c161b09030949cf74997b5825b79f0..422677c301fb137a1f99abda1d5d4ddce020fcca 100755 (executable)
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -1,17 +1,34 @@
 #!/usr/bin/python
 #
-#      add a new user to a Samba4 server
-#      Copyright Andrew Tridgell 2005
-#      Copyright Jelmer Vernooij 2008
-#      Released under the GNU GPL v2 or later
+# Adds a new user to a Samba4 server
+# Copyright Jelmer Vernooij 2008
 #
+# Based on the original in EJS:
+# Copyright Andrew Tridgell 2005
+#
+# 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 3 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, see <http://www.gnu.org/licenses/>.
+
+import sys
+
+# Find right directory when running from source tree
+sys.path.insert(0, "bin/python")
 
 import samba.getopt as options
 import optparse
-import pwd
-import sys
+
 from getpass import getpass
-from auth import system_session
+from samba.auth import system_session
 from samba.samdb import SamDB
 
 parser = optparse.OptionParser("newuser [options] <username> [<password>]")
@@ -20,18 +37,11 @@ parser.add_option_group(sambaopts)
 parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
-parser.add_option("--quiet", help="Be quiet", action="store_true")
 parser.add_option("--unixname", help="Unix Username", type=str)
+parser.add_option("--must-change-at-next-login", help="Force password to be changed on next login", action="store_true")
 
 opts, args = parser.parse_args()
 
-#
-#  print a message if quiet is not set
-#
-def message(text):
-       if not opts.quiet:
-               print text
-
 if len(args) == 0:
        parser.print_usage()
        sys.exit(1)
@@ -45,15 +55,9 @@ else:
 if opts.unixname is None:
        opts.unixname = username
 
-try:
-       pwd.getpwnam(opts.unixname)
-except KeyError:
-       print "ERROR: Unix user '%s' does not exist" % opts.unixname
-       sys.exit(1)
-
-creds = credopts.get_credentials()
-
 lp = sambaopts.get_loadparm()
-samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), 
+creds = credopts.get_credentials(lp)
+
+samdb = SamDB(url=lp.get("sam database"), session_info=system_session(),
               credentials=creds, lp=lp)
-samdb.newuser(username, opts.unixname, password)
+samdb.newuser(username, opts.unixname, password, force_password_change_at_next_login=opts.must_change_at_next_login)