Make the setup/newuser and setup/setpassword scripts actually work...

These need a testsuite, but this will come soon.

Andrew Bartlett
(This used to be commit fbcaa622bd1929399e32326349e96b6676a49b96)

1 files changed, 2 insertions, 4 deletions

diff --git a/source4/setup/newuser b/source4/setup/newuser
index 03ae4e5ffb..5f53aad9c6 100755
--- a/source4/setup/newuser
+++ b/source4/setup/newuser
@@ -10,7 +10,7 @@ import samba.getopt as options
 import optparse
 import pwd
 import sys
-
+from getpass import getpass
 from auth import system_session
 from samba.samdb import SamDB
 
@@ -40,9 +40,7 @@ username = args[0]
 if len(args) > 1:
 	password = args[1]
 else:
-	random_init(local)
-	options.password = randpass(12)
-	print "chose random password %s\n" % password
+	password = getpass("New Password: ")
 
 if opts.unixname is None:
 	opts.unixname = username