lists.arthurdejong.org
RSS feed

nss-pam-ldapd commit: r1429 - nss-pam-ldapd/nslcd

[Date Prev][Date Next] [Thread Prev][Thread Next]

nss-pam-ldapd commit: r1429 - nss-pam-ldapd/nslcd



Author: arthur
Date: Mon Apr 18 22:53:03 2011
New Revision: 1429
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1429

Log:
support systems without RTLD_NODELETE

Modified:
   nss-pam-ldapd/nslcd/nslcd.c

Modified: nss-pam-ldapd/nslcd/nslcd.c
==============================================================================
--- nss-pam-ldapd/nslcd/nslcd.c Sat Apr 16 16:00:15 2011        (r1428)
+++ nss-pam-ldapd/nslcd/nslcd.c Mon Apr 18 22:53:03 2011        (r1429)
@@ -611,7 +611,11 @@
   char *error;
   int *enable_flag;
   /* try to load the NSS module */
+#ifdef RTLD_NODELETE
   handle=dlopen(NSS_LDAP_SONAME,RTLD_LAZY|RTLD_NODELETE);
+#else /* not RTLD_NODELETE */
+  handle=dlopen(NSS_LDAP_SONAME,RTLD_LAZY|RTLD_NODELETE);
+#endif /* RTLD_NODELETE */
   if (handle==NULL)
   {
     log_log(LOG_WARNING,"Warning: LDAP NSS module not loaded: %s",dlerror());
@@ -635,8 +639,10 @@
   }
   /* disable nss_ldap */
   *enable_flag=0;
-  /* close the handle */
+#ifdef RTLD_NODELETE
+  /* only close the handle if RTLD_NODELETE was used */
   dlclose(handle);
+#endif /* RTLD_NODELETE */
 }
 
 /* the main program... */
-- 
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits