diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2004-05-13 13:05:56 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2004-05-13 13:05:56 +0000 |
| commit | d70f6f4b1c744d642a6142fdaab4036805c8115b (patch) | |
| tree | 3ca76a1d3908daedb8b3da8eb185b59fde83e2cd | |
| parent | 0b23482dc7f29fc0c10bba96d026cce9b9663ea8 (diff) | |
Use pdbedit if present (smbpasswd may syncronize with unix password). Similar when deleting (although no known problems there).
| -rwxr-xr-x | adduser.local | 6 | ||||
| -rwxr-xr-x | deluser.local | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/adduser.local b/adduser.local index c7ba7be..b1ba004 100755 --- a/adduser.local +++ b/adduser.local @@ -3,7 +3,7 @@ # /usr/local/sbin/adduser.local # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: adduser.local,v 1.15 2004-02-19 12:37:44 jonas Exp $ +# $Id: adduser.local,v 1.16 2004-05-13 13:05:56 jonas Exp $ # # Common adduser additions for Spiff and Xenux networks # @@ -28,7 +28,9 @@ NEWHOMEDIR=$4 # Samba password #FIXME: Check if enabled in samba.conf (or included files!) -if [ -x /usr/bin/smbpasswd -a -f /etc/samba/smbpasswd ]; then +if [ -x /usr/bin/pdbedit ]; then + /usr/bin/pdbedit -a -u "$NEWUSERNAME" +elif [ -x /usr/bin/smbpasswd -a -f /etc/samba/smbpasswd ]; then /usr/bin/smbpasswd -a $NEWUSERNAME fi diff --git a/deluser.local b/deluser.local index 4c312f4..5e5f078 100755 --- a/deluser.local +++ b/deluser.local @@ -3,7 +3,7 @@ # /usr/local/sbin/deluser.local # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: deluser.local,v 1.13 2003-01-27 15:35:16 jonas Exp $ +# $Id: deluser.local,v 1.14 2004-05-13 13:05:56 jonas Exp $ # # Common deluser additions for Spiff and Xenux networks # @@ -27,7 +27,9 @@ REMOVE_HOME=`grep REMOVE_HOME /etc/deluser.conf | awk -F= '{print $2}' | head -1 [ -f /etc/local/users.conf ] && . /etc/local/users.conf # Samba password -if [ -e /etc/samba/smbpasswd -a -x /usr/bin/smbpasswd ]; then +if [ -x /usr/bin/pdbedit ]; then + /usr/bin/pdbedit -x -u "$NEWUSERNAME" +elif [ -e /etc/samba/smbpasswd -a -x /usr/bin/smbpasswd ]; then /usr/bin/smbpasswd -x $OLDUSERNAME || true fi |