head	1.2;
access;
symbols
	RELEASE_5_4_0:1.1
	RELEASE_4_11_0:1.1
	RELEASE_5_3_0:1.1
	RELEASE_4_10_0:1.1
	RELEASE_5_2_1:1.1
	RELEASE_5_2_0:1.1
	RELEASE_4_9_0:1.1
	RELEASE_5_1_0:1.1
	RELEASE_4_8_0:1.1
	RELEASE_5_0_0:1.1
	RELEASE_4_7_0:1.1
	RELEASE_4_6_2:1.1
	RELEASE_4_6_1:1.1
	RELEASE_4_6_0:1.1
	RELEASE_5_0_DP1:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.07.17.17.03.18;	author pav;	state dead;
branches;
next	1.1;

1.1
date	2002.03.28.09.03.29;	author jkoshy;	state Exp;
branches;
next	;


desc
@@


1.2
log
@- Update to 4.0.10
- Transfer maintainership to submitter

PR:		ports/83547
Submitted by:	Aldert Nooitgedagt <aldert@@nooitgedagt.net>
Approved by:	Matthew Braithwaite <mab@@red-bean.com> (maintainer)
@
text
@--- nsd/nsmain.c	Tue Apr  3 18:13:15 2001
+++ nsd/nsmain.c.new	Fri Feb 15 12:22:04 2002
@@@@ -311,16 +311,10 @@@@
     /*
      * Verify the uid/gid args.
      */
-
-    if (garg != NULL) {
-	gid = Ns_GetGid(garg);
-	if (gid < 0) {
-	    gid = atoi(garg);
-	    if (gid == 0) {
-		Ns_Fatal("nsmain: invalid group '%s'", garg);
-	    }
-	}
-    }
+    /* Reversed the order so this will actually work
+     * Jon Griffin <jon@@jongriffin.com> 01/27/2001
+     *
+    */
     if (uarg != NULL) {
 	uid = Ns_GetUid(uarg);
 	gid = Ns_GetUserGid(uarg);
@@@@ -329,6 +323,16 @@@@
 	}
 	if (uid == 0) {
 	    Ns_Fatal("nsmain: invalid user '%s'", uarg);
+	}
+    }
+
+    if (garg != NULL) {
+	gid = Ns_GetGid(garg);
+	if (gid < 0) {
+	    gid = atoi(garg);
+	    if (gid == 0) {
+		Ns_Fatal("nsmain: invalid group '%s'", garg);
+	    }
 	}
     }
 
@


1.1
log
@Upgrade to v3.4.2.

PR:		ports/35100
Submitted by:	Jose Abelardo Martinez <jamartinez@@altern.org>
@
text
@@

