diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-05-12 20:37:40 +0000 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-05-12 20:37:40 +0000 |
| commit | c889fdb76089f9c6abff1269d1051c874e275547 (patch) | |
| tree | b6f1ef993715646730e7e2ddf47f42a49068d5ca | |
| parent | d14ea30ef642aceb2e8690f3bd563426e58a921b (diff) | |
small compatibility improvements
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@1100 ef36b2f9-881f-0410-afb5-c4e39611909c
| -rw-r--r-- | compat/pam_compat.h | 6 | ||||
| -rw-r--r-- | nslcd/pam.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/compat/pam_compat.h b/compat/pam_compat.h index f3607af..7556b36 100644 --- a/compat/pam_compat.h +++ b/compat/pam_compat.h @@ -50,12 +50,14 @@ int pam_prompt(pam_handle_t *pamh,int style,char **response,const char *format,. /* 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 */ diff --git a/nslcd/pam.c b/nslcd/pam.c index edc9012..e38ce54 100644 --- a/nslcd/pam.c +++ b/nslcd/pam.c @@ -244,7 +244,7 @@ static int try_autzsearch(MYLDAP_SESSION *session,DICT *dict,const char *searchf 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) { |