summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdeluser.local14
1 files changed, 1 insertions, 13 deletions
diff --git a/deluser.local b/deluser.local
index 796c12a..e037fd1 100755
--- a/deluser.local
+++ b/deluser.local
@@ -5,18 +5,6 @@ OLDUID=$2
OLDGID=$3
OLDHOMEDIR=$4
-if [ ! -d "$OLDHOMEDIR" ]; then
- echo -n "Something's wrong - home directory doesn't exist. Continue (y/N)? "
- read continue
- case $continue in
- y|Y)
- ;;
- *)
- exit 1
- ;;
- esac
-fi
-
if [ -e /etc/samba/smbpasswd -a -x /usr/bin/smbpasswd ]; then
/usr/bin/smbpasswd -x $OLDUSERNAME || true
fi
@@ -44,7 +32,7 @@ if [ -d /home/christof/ftp_christof_ro/$1 -a -n "$1" ]; then
fi
# It seems deluser doesn't always remove home even if told to do so
-#FIXME: Only ask if removing is enabling in /etc/deluser.conf
+#FIXME: Only ask (or default to yes, or both) if removing is enabling in /etc/deluser.conf
if [ -d $4 -a -n "$4" ]; then
echo -n "Remove old home (y/N)? "
read remove_home