nss-pam-ldapd commit: r1100 - in nss-pam-ldapd: compat nslcd

["Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Wed May 12 22:37:40 2010
New Revision: 1100
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1100

Log:
small compatibility improvements

Modified:
   nss-pam-ldapd/compat/pam_compat.h
   nss-pam-ldapd/nslcd/pam.c

Modified: nss-pam-ldapd/compat/pam_compat.h
==============================================================================
--- nss-pam-ldapd/compat/pam_compat.h   Mon May 10 23:09:13 2010        (r1099)
+++ nss-pam-ldapd/compat/pam_compat.h   Wed May 12 22:37:40 2010        (r1100)
@@ -50,12 +50,14 @@
 
 /* provide pam_info() if needed */
 #ifndef pam_info
-#define pam_info(pamh, fmt...) pam_prompt(pamh,PAM_TEXT_INFO,NULL,__VA_ARGS__)
+#define pam_info(pamh,format,args...) \
+            pam_prompt(pamh,PAM_TEXT_INFO,NULL,format,##args)
 #endif /* not pam_info */
 
 /* provide pam_error() if needed */
 #ifndef pam_error
-#define pam_error(pamh, fmt...) pam_prompt(pamh,PAM_ERROR_MSG,NULL,__VA_ARGS__)
+#define pam_error(pamh,format,args...) \
+            pam_prompt(pamh,PAM_ERROR_MSG,NULL,format,##args)
 #endif /* not pam_error */
 
 /* fall back to using getpwnam() if pam_modutil_getpwnam() isn't defined */

Modified: nss-pam-ldapd/nslcd/pam.c
==============================================================================
--- nss-pam-ldapd/nslcd/pam.c   Mon May 10 23:09:13 2010        (r1099)
+++ nss-pam-ldapd/nslcd/pam.c   Wed May 12 22:37:40 2010        (r1100)
@@ -244,7 +244,7 @@
   attrs[0]="dn";
   attrs[1]=NULL;
   /* FIXME: this only searches the first base */
-  search=myldap_search(session,nslcd_cfg->ldc_bases[0],LDAP_SCOPE_SUB,
+  search=myldap_search(session,nslcd_cfg->ldc_bases[0],LDAP_SCOPE_SUBTREE,
                        filter_buffer,attrs,&rc);
   if (search==NULL)
   {
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits