From owner-p4-projects@FreeBSD.ORG  Thu Oct 12 12:30:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1965216A47C; Thu, 12 Oct 2006 12:30:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 E5DD316A416
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 12:30:04 +0000 (UTC)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 60F5543D64
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 12:30:04 +0000 (GMT)
	(envelope-from bushman@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9CCU4Du030826
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 12:30:04 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CCU3Bx030823
	for perforce@freebsd.org; Thu, 12 Oct 2006 12:30:03 GMT
	(envelope-from bushman@freebsd.org)
Date: Thu, 12 Oct 2006 12:30:03 GMT
Message-Id: <200610121230.k9CCU3Bx030823@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bushman@freebsd.org using -f
From: Michael Bushkov <bushman@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107759 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Oct 2006 12:30:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=107759

Change 107759 by bushman@bushman_nss_ldap_cached on 2006/10/12 12:29:34

	+ don't abort on unknown config-file keywords - allows using the same configuration file for OpenLDAP, nss_ldap, pam_ldap, etc...

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#12 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/nss_ldap/ldapconf.c#12 (text+ko) ====

@@ -604,7 +604,11 @@
 			break;
 		}
 
-		res = NSS_LDAP_PARSE_ERROR;
+		/* 
+		 * NOTE: uncomment this to abort on unknown config-file
+		 * keywords:		
+		 * res = NSS_LDAP_PARSE_ERROR;
+		 */
 	}
 	fclose(fin);