From d6157139088dbd61530992639aa1255e6097871f Mon Sep 17 00:00:00 2001
From: bad <bad>
Date: Tue, 8 Jun 1999 17:58:49 +0000
Subject: Check for group before invoking addnerd since the latter won't work
 correctly when the required group is missing.

---
 mail/majordomo/pkg/REQ | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/mail/majordomo/pkg/REQ b/mail/majordomo/pkg/REQ
index bf4f4d67b94..959f3f28ff7 100644
--- a/mail/majordomo/pkg/REQ
+++ b/mail/majordomo/pkg/REQ
@@ -15,17 +15,6 @@ then
 fi
 
 
-# use finger to be able to use NIS, ...
-if finger ${MAJORDOMO_USER} 2>&1 | grep >/dev/null "no such user"
-then
-	echo "Creating '$MAJORDOMO_USER' user ..."
-	${ADDNERD} -h ${HOME} -g ${MAJORDOMO_GROUP} ${MAJORDOMO_USER}
-	echo Done.
-else
-	echo "User '$MAJORDOMO_USER' already exists, proceeding."
-fi
-
-
 # Group... the default's shipped with NetBSD
 #
 if grep "^${MAJORDOMO_GROUP}:" /etc/group 2>&1 >/dev/null
@@ -36,6 +25,17 @@ else
 	exit 1
 fi
 
+
+# use finger to be able to use NIS, ...
+if finger ${MAJORDOMO_USER} 2>&1 | grep >/dev/null "no such user"
+then
+	echo "Creating '$MAJORDOMO_USER' user ..."
+	${ADDNERD} -h ${HOME} -g ${MAJORDOMO_GROUP} ${MAJORDOMO_USER}
+	echo Done.
+else
+	echo "User '$MAJORDOMO_USER' already exists, proceeding."
+fi
+
 # Home... in case the login exists but not the home directory
 #
 install -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${HOME}/${MAJORDOMO_USER}
-- 
cgit v1.2.3