From owner-p4-projects@FreeBSD.ORG  Fri Jun 23 07:06:37 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 6AB0016A494; Fri, 23 Jun 2006 07:06:37 +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 F10E516A47C
	for <perforce@freebsd.org>; Fri, 23 Jun 2006 07:06:36 +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 C0E6C43D58
	for <perforce@freebsd.org>; Fri, 23 Jun 2006 07:06:36 +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 k5N76aA7068484
	for <perforce@freebsd.org>; Fri, 23 Jun 2006 07:06:36 GMT
	(envelope-from bushman@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5N76avf068481
	for perforce@freebsd.org; Fri, 23 Jun 2006 07:06:36 GMT
	(envelope-from bushman@freebsd.org)
Date: Fri, 23 Jun 2006 07:06:36 GMT
Message-Id: <200606230706.k5N76avf068481@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 99852 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: Fri, 23 Jun 2006 07:06:37 -0000

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

Change 99852 by bushman@bushman_nss_ldap_cached on 2006/06/23 07:06:21

	nsdispatch(3) behaviour slightly changed to correctly process stubs from nss_stubs.c

Affected files ...

.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nsdispatch.c#5 edit
.. //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nss_stubs.c#2 edit

Differences ...

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nsdispatch.c#5 (text+ko) ====

@@ -430,20 +430,11 @@
 	*src = NULL;
 }
 
-/* ARGSUSED */
-ns_mtab *
-__dummy_reg(const char *name, unsigned int *mtab_size,
-	nss_module_unregister_fn *fn)
-{
-	return (NULL);
-}
-
 /*
  * NSS module management.
  */
 /* The built-in NSS modules are all loaded at once. */
 #define NSS_BACKEND(name, reg) \
-__weak_reference(__dummy_reg, reg);\
 ns_mtab	*reg(const char *, unsigned int *, nss_module_unregister_fn *);
 #include "nss_backends.h"
 #undef NSS_BACKEND
@@ -507,11 +498,16 @@
 	}
 	mod.mtab = fn(mod.name, &mod.mtabsize, &mod.unregister);
 	if (mod.mtab == NULL || mod.mtabsize == 0) {
-		if (mod.handle != nss_builtin_handle)
+		if (mod.handle != nss_builtin_handle) {
 			(void)dlclose(mod.handle);
-		mod.handle = NULL;
-		nss_log(LOG_ERR, "%s, registration failed", mod.name);
-		goto fin;
+			nss_log(LOG_ERR, "%s, registration failed", mod.name);
+			mod.handle = NULL;
+			goto fin;
+		} else {
+			/* we've loaded the stub - now try the real module */
+			nss_load_module(source, NULL);
+			return;
+		}
 	}
 	if (mod.mtabsize > 1)
 		qsort(mod.mtab, mod.mtabsize, sizeof(mod.mtab[0]),

==== //depot/projects/soc2006/nss_ldap_cached/src/lib/libc/net/nss_stubs.c#2 (text+ko) ====

@@ -35,6 +35,8 @@
 __dummy_reg(const char *name, unsigned int *mtab_size,
         nss_module_unregister_fn *fn)
 {
+	*mtab_size = 0;
+	*fn = NULL;
         return (NULL);
 }