diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2007-01-17 23:16:09 +0100 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2007-01-17 23:16:09 +0100 |
| commit | 9a2c3e7624985e6110634e07d6b216e96b209adb (patch) | |
| tree | 3b0edaa59e8b5fbf5eca0912262451f1669fa375 /nss/passwd.c | |
| parent | 3ac313144f880db85fdbb6a271451f2f693aab44 (diff) | |
ensure that all NSS functions can be generated by the marcos in common.h and spell out the read_..() function for every type
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@227 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nss/passwd.c')
| -rw-r--r-- | nss/passwd.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/nss/passwd.c b/nss/passwd.c index e3bca05..64bf2b8 100644 --- a/nss/passwd.c +++ b/nss/passwd.c @@ -2,7 +2,7 @@ passwd.c - NSS lookup functions for passwd database Copyright (C) 2006 West Consulting - Copyright (C) 2006 Arthur de Jong + Copyright (C) 2006, 2007 Arthur de Jong This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -29,36 +29,34 @@ #include "prototypes.h" #include "common.h" -/* Macros for expanding the NSLCD_PASSWD macro. */ -#define NSLCD_STRING(field) READ_STRING_BUF(fp,field) -#define NSLCD_TYPE(field,type) READ_TYPE(fp,field,type) -#define PASSWD_NAME result->pw_name -#define PASSWD_PASSWD result->pw_passwd -#define PASSWD_UID result->pw_uid -#define PASSWD_GID result->pw_gid -#define PASSWD_GECOS result->pw_gecos -#define PASSWD_DIR result->pw_dir -#define PASSWD_SHELL result->pw_shell - - static enum nss_status read_passwd( FILE *fp,struct passwd *result, char *buffer,size_t buflen,int *errnop) { int32_t tmpint32; size_t bufptr=0; - NSLCD_PASSWD; + READ_STRING_BUF(fp,result->pw_name); + READ_STRING_BUF(fp,result->pw_passwd); + READ_TYPE(fp,result->pw_uid,uid_t); + READ_TYPE(fp,result->pw_gid,gid_t); + READ_STRING_BUF(fp,result->pw_gecos); + READ_STRING_BUF(fp,result->pw_dir); + READ_STRING_BUF(fp,result->pw_shell); return NSS_STATUS_SUCCESS; } enum nss_status _nss_ldap_getpwnam_r(const char *name,struct passwd *result,char *buffer,size_t buflen,int *errnop) { - NSS_BYNAME(NSLCD_ACTION_PASSWD_BYNAME,name,read_passwd); + NSS_BYNAME(NSLCD_ACTION_PASSWD_BYNAME, + name, + read_passwd(fp,result,buffer,buflen,errnop)); } enum nss_status _nss_ldap_getpwuid_r(uid_t uid,struct passwd *result,char *buffer,size_t buflen,int *errnop) { - NSS_BYTYPE(NSLCD_ACTION_PASSWD_BYUID,uid,uid_t,read_passwd); + NSS_BYTYPE(NSLCD_ACTION_PASSWD_BYUID, + uid,uid_t, + read_passwd(fp,result,buffer,buflen,errnop)); } /* thread-local file pointer to an ongoing request */ @@ -73,7 +71,7 @@ enum nss_status _nss_ldap_setpwent(int stayopen) /* read password data from an opened stream */ enum nss_status _nss_ldap_getpwent_r(struct passwd *result,char *buffer,size_t buflen,int *errnop) { - NSS_GETENT(pwentfp,read_passwd); + NSS_GETENT(pwentfp,read_passwd(pwentfp,result,buffer,buflen,errnop)); } /* close the stream opened with setpwent() above */ |