summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2006-11-02 12:08:46 +0000
committerArthur de Jong <arthur@arthurdejong.org>2006-11-02 12:08:46 +0000
commit5aa968f1ce0425dd7973cc05385fb0ba9c4bfd1c (patch)
tree7fde0c80a53d98c1cc1f5c34c4efe6e308a11c90
parent78ee48f451bca5932a446c4df202a9ff5dabfd2f (diff)
rename READ_RESPONSE() macro to READ_RESPONSE_CODE()
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@54 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--nslcd-client.h2
-rw-r--r--nss/aliases.c2
-rw-r--r--nss/group.c6
-rw-r--r--nss/passwd.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/nslcd-client.h b/nslcd-client.h
index ca9273b..61b28d5 100644
--- a/nslcd-client.h
+++ b/nslcd-client.h
@@ -49,7 +49,7 @@ FILE *nslcd_client_open(void);
if (tmpint32!=(req)) \
{ ERROR_OUT_READERROR(fp) }
-#define READ_RESPONSE(fp) \
+#define READ_RESPONSE_CODE(fp) \
READ_TYPE(fp,tmpint32,int32_t); \
if (tmpint32!=NSLCD_RS_SUCCESS) \
{ ERROR_OUT_NOSUCCESS(fp,tmpint32) }
diff --git a/nss/aliases.c b/nss/aliases.c
index 2618faf..43ae45e 100644
--- a/nss/aliases.c
+++ b/nss/aliases.c
@@ -66,7 +66,7 @@ enum nss_status _nss_ldap_getaliasbyname_r(
/* read response header */
READ_RESPONSEHEADER(fp,NSLCD_RT_ALIAS_BYNAME);
/* read response */
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_ALIAS;
/* fill in remaining gaps in struct */
result->alias_local=0;
diff --git a/nss/group.c b/nss/group.c
index ef04b8f..1013a6b 100644
--- a/nss/group.c
+++ b/nss/group.c
@@ -69,7 +69,7 @@ enum nss_status _nss_ldap_getgrnam_r(const char *name,struct group *result,char
WRITE_FLUSH(fp);
/* read response */
READ_RESPONSEHEADER(fp,NSLCD_ACTION_GROUP_BYNAME);
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_GROUP;
/* close socket and we're done */
fclose(fp);
@@ -88,7 +88,7 @@ enum nss_status _nss_ldap_getgrgid_r(gid_t gid,struct group *result,char *buffer
WRITE_FLUSH(fp);
/* read response */
READ_RESPONSEHEADER(fp,NSLCD_ACTION_GROUP_BYGID);
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_GROUP;
/* close socket and we're done */
fclose(fp);
@@ -132,7 +132,7 @@ enum nss_status _nss_ldap_getgrent_r(struct group *result,char *buffer,size_t bu
return NSS_STATUS_UNAVAIL;
}
/* read a response */
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_GROUP;
return NSS_STATUS_SUCCESS;
}
diff --git a/nss/passwd.c b/nss/passwd.c
index 53332fd..b12e42c 100644
--- a/nss/passwd.c
+++ b/nss/passwd.c
@@ -54,7 +54,7 @@ enum nss_status _nss_ldap_getpwnam_r(const char *name,struct passwd *result,char
/* read response header */
READ_RESPONSEHEADER(fp,NSLCD_RT_GETPWBYNAME);
/* read response */
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_PASSWD;
/* close socket and we're done */
fclose(fp);
@@ -74,7 +74,7 @@ enum nss_status _nss_ldap_getpwuid_r(uid_t uid,struct passwd *result,char *buffe
/* read response header */
READ_RESPONSEHEADER(fp,NSLCD_RT_GETPWBYUID);
/* read response */
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_PASSWD;
/* close socket and we're done */
fclose(fp);
@@ -117,7 +117,7 @@ enum nss_status _nss_ldap_getpwent_r(struct passwd *result,char *buffer,size_t b
return NSS_STATUS_UNAVAIL;
}
/* read a response */
- READ_RESPONSE(fp);
+ READ_RESPONSE_CODE(fp);
LDF_PASSWD;
return NSS_STATUS_SUCCESS;
}