From be3a77aad00680447a82286ef0b270b9a427bdef Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 24 Dec 2002 19:44:30 +0000
Subject: Correct syntax error. Allow uid check override by force option.
 Remove hint about force option from error message.

---
 userforward | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'userforward')

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!"
-- 
cgit v1.2.3