From owner-p4-projects@FreeBSD.ORG  Sun May 25 04:42:43 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9401E37B404; Sun, 25 May 2003 04:42:40 -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 F1AE437B401
	for <perforce@freebsd.org>; Sun, 25 May 2003 04:42:39 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8358043FB1
	for <perforce@freebsd.org>; Sun, 25 May 2003 04:42:39 -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 h4PBgd0U065634
	for <perforce@freebsd.org>; Sun, 25 May 2003 04:42:39 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4PBgdI1065631
	for perforce@freebsd.org; Sun, 25 May 2003 04:42:39 -0700 (PDT)
Date: Sun, 25 May 2003 04:42:39 -0700 (PDT)
Message-Id: <200305251142.h4PBgdI1065631@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 31854 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: Sun, 25 May 2003 11:42:49 -0000

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

Change 31854 by des@des.at.des.thinksec.com on 2003/05/25 04:41:46

	Use RTLD_NOW where available, and define it to RTLD_LAZY otherwise.

Affected files ...

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

Differences ...

==== //depot/projects/openpam/lib/openpam_dynamic.c#12 (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#11 $
+ * $P4: //depot/projects/openpam/lib/openpam_dynamic.c#12 $
  */
 
 #include <dlfcn.h>
@@ -43,6 +43,10 @@
 
 #include "openpam_impl.h"
 
+#ifndef RTLD_NOW
+#define RTLD_NOW RTLD_LAZY
+#endif
+
 /*
  * OpenPAM internal
  *
@@ -64,10 +68,10 @@
 	/* try versioned module first, then unversioned module */
 	if (asprintf(&vpath, "%s.%d", path, LIB_MAJ) < 0)
 		goto buf_err;
-	if ((dlh = dlopen(vpath, RTLD_LAZY)) == NULL) {
+	if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
 		openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
 		*strrchr(vpath, '.') = '\0';
-		if ((dlh = dlopen(vpath, RTLD_LAZY)) == NULL) {
+		if ((dlh = dlopen(vpath, RTLD_NOW)) == NULL) {
 			openpam_log(PAM_LOG_DEBUG, "%s: %s", vpath, dlerror());
 			FREE(module);
 			return (NULL);