From owner-p4-projects  Wed Oct  2  9: 1:16 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C980437B404; Wed,  2 Oct 2002 09:01:13 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3F66037B401
	for <perforce@freebsd.org>; Wed,  2 Oct 2002 09:01:13 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5E5EF43E75
	for <perforce@freebsd.org>; Wed,  2 Oct 2002 09:01:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g92G1ACo081877
	for <perforce@freebsd.org>; Wed, 2 Oct 2002 09:01:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g92Fxo4U079220
	for perforce@freebsd.org; Wed, 2 Oct 2002 08:59:50 -0700 (PDT)
Date: Wed, 2 Oct 2002 08:59:50 -0700 (PDT)
Message-Id: <200210021559.g92Fxo4U079220@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 18544 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18544

Change 18544 by rwatson@rwatson_tislabs on 2002/10/02 08:58:58

	Selectively IFC NIS password fix from the main tree to the
	TrustedBSD base tree--don't pull in the rest since apparently
	there are build problems on their side of the fence.

Affected files ...

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

Differences ...

==== //depot/projects/trustedbsd/base/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