Fix password expiry routine. Separate password setting and password expiry setting routines.

1 files changed, 4 insertions, 20 deletions

diff --git a/localadduser b/localadduser
index 433315c..1cce0db 100755
--- a/localadduser
+++ b/localadduser
@@ -3,7 +3,7 @@
 # /usr/local/bin/localadduser
 # Copyright 2003 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localadduser,v 1.3 2006-08-25 04:36:44 jonas Exp $
+# $Id: localadduser,v 1.4 2006-08-31 22:51:03 jonas Exp $
 #
 # Execute adduser noninteractively through sudo
 #
@@ -14,10 +14,6 @@
 
 set -e
 
-pass_len=11
-pass_expire=30
-pass_warn=14
-
 verbose=1
 #simulate=true
 interactive=0
@@ -27,13 +23,6 @@ vecho() {
 	test -n "$verbose" && echo "$@" >&2
 }
 
-randompass() {
-	gpw 1 $pass_len 2>&- ||
-	pwgen $pass_len 1 2>&- ||
-	tr -d '[\000-\057][\072-\100][\133-\140][\173-\377]' < /dev/urandom |
-		dd bs=$pass_len count=1 2>&-
-}
-
 u=$1
 shift
 
@@ -84,11 +73,6 @@ else
 	eval $simulate sudo "/usr/sbin/adduser --disabled-login \"$u\""
 fi
 
-vecho -n "generating password for $u..."
-pass=$(randompass)
-echo "$u:$pass" | eval $simulate sudo "/usr/sbin/chpasswd"
-vecho -n "."
-#eval $simulate sudo "/usr/bin/chage -M $pass_expire -d 2003-01-01 \"$u\""
-eval $simulate sudo "/usr/bin/chage -M$pass_expire -W$pass_warn -d 2003-01-01 \"$u\""
-vecho -n "."
-vecho "$pass"
+eval $simulate localresetpasswd "$u"
+
+#vecho "Account \"$u\" created succesfully! Password is $pass"