diff options
-rwxr-xr-x | deluser.local | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/deluser.local b/deluser.local index 8277c31..6f52fe1 100755 --- a/deluser.local +++ b/deluser.local @@ -7,11 +7,9 @@ OLDHOMEDIR=$4 [ "x$OLDHOMEDIR" = "x/home/$OLDUSERNAME" ] || exit 0 -test -e /etc/samba/smbpasswd && \ - /usr/bin/smbpasswd -x $OLDUSERNAME \ - || true - -test -x /usr/sbin/remove_members || exit 0 +if [ -e /etc/samba/smbpasswd -a -x /usr/bin/smbpasswd ]; then + /usr/bin/smbpasswd -x $OLDUSERNAME || true +fi if [ -x /usr/sbin/remove_members ]: then if [ -d /var/lib/mailman/lists/users ]; then @@ -26,7 +24,7 @@ fi #FIXME: Make this ALOT more generic! if [ -d /home/christof/ftp_christof_ro/$1 -a -n "$1" ]; then - echo -n "Remove files at christof (y/N)? " + echo -n "It seems this was a dummy user. Remove shared files (y/N)? " read -s remove_files echo case $remove_files in |