diff options
Diffstat (limited to 'userforward')
| -rwxr-xr-x | userforward | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/userforward b/userforward index 88f2413..8479d07 100755 --- a/userforward +++ b/userforward @@ -12,7 +12,7 @@ force=$3 set -e uid=`id -u $user` -if [ $uid \< 1000 ]; then +if [ $uid \< 1000 -a "x$force" != "xforce" ]; then echo "ERROR: User is not a real user (uid too low)!" exit 1 fi @@ -20,7 +20,7 @@ fi homedir=`getent passwd $user | awk -F: '{print $6}';` if [ -e $homedir/.forward -a "x$force" != "xforce" ]; then - echo "ERROR: User \"$user\" already has a .forward (add \"force\" to overwrite...)!" + echo "ERROR: User \"$user\" already has a .forward!" exit 1 fi @@ -44,5 +44,6 @@ if [ -f $mailspool ]; then echo "Old incoming mails forwarded to new account." else echo "OBS! Old incoming mails not forwarded." + fi fi echo "Done!" |