diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2010-12-12 23:45:21 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2010-12-12 23:45:21 +0100 |
| commit | 38b08af090769450018505a8547377709b93a9f6 (patch) | |
| tree | 33ed5127dd8c8595151cc320895457f871199091 /nslcd/common.h | |
| parent | 7d9baf67b727c7b50c3666721821e38485d76332 (diff) | |
| parent | 42490ca4bab185ac92db5203235ed7515111731a (diff) | |
merge changes from trunk
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1329 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd/common.h')
| -rw-r--r-- | nslcd/common.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/nslcd/common.h b/nslcd/common.h index a7cc18a..90e9b10 100644 --- a/nslcd/common.h +++ b/nslcd/common.h @@ -89,7 +89,7 @@ MUST_USE char *lookup_dn2uid(MYLDAP_SESSION *session,const char *dn,int *rcp,cha MUST_USE char *dn2uid(MYLDAP_SESSION *session,const char *dn,char *buf,size_t buflen); /* use the user id to lookup an LDAP entry */ -MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *session,const char *uid); +MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *session,const char *uid,int *rcp); /* transforms the uid into a DN by doing an LDAP lookup */ MUST_USE char *uid2dn(MYLDAP_SESSION *session,const char *uid,char *buf,size_t buflen); @@ -147,13 +147,13 @@ int nslcd_pam_sess_c(TFILE *fp,MYLDAP_SESSION *session); int nslcd_pam_pwmod(TFILE *fp,MYLDAP_SESSION *session,uid_t calleruid); /* macros for generating service handling code */ -#define NSLCD_HANDLE(db,fn,readfn,logcall,action,mkfilter,writefn) \ +#define NSLCD_HANDLE(db,fn,readfn,action,mkfilter,writefn) \ int nslcd_##db##_##fn(TFILE *fp,MYLDAP_SESSION *session) \ - NSLCD_HANDLE_BODY(db,fn,readfn,logcall,action,mkfilter,writefn) -#define NSLCD_HANDLE_UID(db,fn,readfn,logcall,action,mkfilter,writefn) \ + NSLCD_HANDLE_BODY(db,fn,readfn,action,mkfilter,writefn) +#define NSLCD_HANDLE_UID(db,fn,readfn,action,mkfilter,writefn) \ int nslcd_##db##_##fn(TFILE *fp,MYLDAP_SESSION *session,uid_t calleruid) \ - NSLCD_HANDLE_BODY(db,fn,readfn,logcall,action,mkfilter,writefn) -#define NSLCD_HANDLE_BODY(db,fn,readfn,logcall,action,mkfilter,writefn) \ + NSLCD_HANDLE_BODY(db,fn,readfn,action,mkfilter,writefn) +#define NSLCD_HANDLE_BODY(db,fn,readfn,action,mkfilter,writefn) \ { \ /* define common variables */ \ int32_t tmpint32; \ @@ -163,8 +163,6 @@ int nslcd_pam_pwmod(TFILE *fp,MYLDAP_SESSION *session,uid_t calleruid); int rc,i; \ /* read request parameters */ \ readfn; \ - /* log call */ \ - logcall; \ /* write the response header */ \ WRITE_INT32(fp,NSLCD_VERSION); \ WRITE_INT32(fp,action); \ |