From owner-svn-src-stable@FreeBSD.ORG  Wed Jun 10 05:26:21 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C9C2B106566C;
	Wed, 10 Jun 2009 05:26:21 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B74388FC17;
	Wed, 10 Jun 2009 05:26:21 +0000 (UTC)
	(envelope-from brian@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5A5QL4R095036;
	Wed, 10 Jun 2009 05:26:21 GMT (envelope-from brian@svn.freebsd.org)
Received: (from brian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5A5QLsC095035;
	Wed, 10 Jun 2009 05:26:21 GMT (envelope-from brian@svn.freebsd.org)
Message-Id: <200906100526.n5A5QLsC095035@svn.freebsd.org>
From: Brian Somers <brian@FreeBSD.org>
Date: Wed, 10 Jun 2009 05:26:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193888 - stable/7/usr.sbin/pwd_mkdb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2009 05:26:22 -0000

Author: brian
Date: Wed Jun 10 05:26:21 2009
New Revision: 193888
URL: http://svn.freebsd.org/changeset/base/193888

Log:
  MFC: r192432: Fail pwd_mkdb -C if the user name is MAXLOGNAME or longer.

Modified:
  stable/7/usr.sbin/pwd_mkdb/   (props changed)
  stable/7/usr.sbin/pwd_mkdb/pwd_mkdb.c

Modified: stable/7/usr.sbin/pwd_mkdb/pwd_mkdb.c
==============================================================================
--- stable/7/usr.sbin/pwd_mkdb/pwd_mkdb.c	Wed Jun 10 04:18:11 2009	(r193887)
+++ stable/7/usr.sbin/pwd_mkdb/pwd_mkdb.c	Wed Jun 10 05:26:21 2009	(r193888)
@@ -204,7 +204,11 @@ main(int argc, char *argv[])
 
 	/* check only if password database is valid */
 	if (Cflag) {
-		for (cnt = 1; scan(fp, &pwd); ++cnt);
+		while (scan(fp, &pwd))
+			if (!is_comment && strlen(pwd.pw_name) >= MAXLOGNAME) {
+				warnx("%s: username too long", pwd.pw_name);
+				exit(1);
+			}
 		exit(0);
 	}