Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Oct 2002 10:48:34 -0700 (PDT)
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 18550 for review
Message-ID:  <200210021748.g92HmYMu017936@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18550

Change 18550 by rwatson@rwatson_tislabs on 2002/10/02 10:48:09

	Further integrate NIS fix from TrustedBSD base to MAC tree.

Affected files ...

.. //depot/projects/trustedbsd/mac/lib/libc/gen/pw_scan.c#6 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/lib/libc/gen/pw_scan.c#6 (text+ko) ====

@@ -35,7 +35,7 @@
 static char sccsid[] = "@(#)pw_scan.c	8.3 (Berkeley) 4/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/pw_scan.c,v 1.22 2002/09/25 08:49:19 maxim Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/pw_scan.c,v 1.23 2002/10/02 07:02:46 maxim Exp $");
 
 /*
  * This module is used to "verify" password entries by chpass(1) and
@@ -104,7 +104,7 @@
 			warnx("%s > max uid value (%lu)", p, ULONG_MAX);
 		return (0);
 	}
-	if (*ep != '\0' || ep == p) {
+	if (*ep != '\0') {
 		if (flags & _PWSCAN_WARN)
 			warnx("%s uid is incorrect", p);
 		return (0);
@@ -130,7 +130,7 @@
 			warnx("%s > max gid value (%lu)", p, ULONG_MAX);
 		return (0);
 	}
-	if (*ep != '\0' || ep == p) {
+	if (*ep != '\0') {
 		if (flags & _PWSCAN_WARN)
 			warnx("%s gid is incorrect", p);
 		return (0);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210021748.g92HmYMu017936>