From owner-svn-src-all@freebsd.org  Mon May 16 02:35:24 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CEEDAB3C49C;
 Mon, 16 May 2016 02:35:24 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9FC371043;
 Mon, 16 May 2016 02:35:24 +0000 (UTC)
 (envelope-from araujo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4G2ZNNN089171;
 Mon, 16 May 2016 02:35:23 GMT (envelope-from araujo@FreeBSD.org)
Received: (from araujo@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4G2ZNHR089170;
 Mon, 16 May 2016 02:35:23 GMT (envelope-from araujo@FreeBSD.org)
Message-Id: <201605160235.u4G2ZNHR089170@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: araujo set sender to
 araujo@FreeBSD.org using -f
From: Marcelo Araujo <araujo@FreeBSD.org>
Date: Mon, 16 May 2016 02:35:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299884 - head/usr.sbin/ypldap
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 May 2016 02:35:24 -0000

Author: araujo
Date: Mon May 16 02:35:23 2016
New Revision: 299884
URL: https://svnweb.freebsd.org/changeset/base/299884

Log:
  When a group contains a non-existent user, make the warning
  message more helpful by mentioning the group name.
  
  Obtained from:	OpenBSD (cvs 1.19)

Modified:
  head/usr.sbin/ypldap/ypldap.c

Modified: head/usr.sbin/ypldap/ypldap.c
==============================================================================
--- head/usr.sbin/ypldap/ypldap.c	Mon May 16 02:27:28 2016	(r299883)
+++ head/usr.sbin/ypldap/ypldap.c	Mon May 16 02:35:23 2016	(r299884)
@@ -243,9 +243,8 @@ main_create_user_groups(struct env *env)
 			if ((ue = RB_FIND(user_name_tree, env->sc_user_names_t,
 			    &ukey)) == NULL) {
 				/* User not found */
-				log_warnx("main: user: %s is referenced as a "
-					"group member, but can't be found in the "
-					"users map.\n", ukey.ue_line);
+				log_warnx("main: unknown user %s in group %s\n",
+				   ukey.ue_line, ge->ge_line);
 				if (bp != NULL)
 					*(bp-1) = ',';
 				continue;