From owner-p4-projects@FreeBSD.ORG  Tue May 13 05:42:17 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB40737B404; Tue, 13 May 2003 05:42: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 56BA237B401
	for <perforce@freebsd.org>; Tue, 13 May 2003 05:42:13 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0031243FAF
	for <perforce@freebsd.org>; Tue, 13 May 2003 05:42:12 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4DCgC0U006683
	for <perforce@freebsd.org>; Tue, 13 May 2003 05:42:12 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4DCgCkD006680
	for perforce@freebsd.org; Tue, 13 May 2003 05:42:12 -0700 (PDT)
Date: Tue, 13 May 2003 05:42:12 -0700 (PDT)
Message-Id: <200305131242.h4DCgCkD006680@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 31068 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 13 May 2003 12:42:18 -0000

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

Change 31068 by des@des.at.des.thinksec.com on 2003/05/13 05:42:04

	Use RTLD_LAZY rather than RTLD_NOW (which apparently isn't supported
	on all platforms, notably OpenBSD).
	
	Submitted by:	Mike Petullo <mike@flyn.org>

Affected files ...

.. //depot/projects/openpam/lib/openpam_dynamic.c#8 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_dynamic.c#8 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#7 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#8 $
  */
 
 #include <dlfcn.h>
@@ -64,10 +64,10 @@
 	/* try versioned module first, then unversioned module */
 	if (asprintf(&vpath, "%s.%d", path, LIB_MAJ) == -1)
 		goto buf_err;
-	if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
+	if ((dlh = dlopen(vpath, RTLD_LAZY)) == NULL) {
 		openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
 		*strrchr(vpath, '.') = '\0';
-		if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
+		if ((dlh = dlopen(vpath, RTLD_LAZY)) == NULL) {
 			openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
 			free(module);
 			return (NULL);