diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2009-04-19 20:57:52 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2009-04-19 20:57:52 +0200 |
| commit | 0f3d8c72ca88173022e9e14044c6b060ec558196 (patch) | |
| tree | 6dbb2fa2cdf08f4aef26194c61ed8bbdfc5ecba6 /nss | |
| parent | ee5779eea3f46112eb794a4e095e72371d8bc390 (diff) | |
merge r834 from trunk
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@836 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/common.h | 4 | ||||
| -rw-r--r-- | nss/group.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nss/common.h b/nss/common.h index ed37ec3..29a52f5 100644 --- a/nss/common.h +++ b/nss/common.h @@ -64,7 +64,7 @@ TFILE *nslcd_client_open(void) the stream. */ #define READ_RESPONSE_CODE(fp) \ READ_TYPE(fp,tmpint32,int32_t); \ - if (tmpint32!=(int32_t)NSLCD_RESULT_SUCCESS) \ + if (tmpint32!=(int32_t)NSLCD_RESULT_BEGIN) \ { ERROR_OUT_NOSUCCESS(fp,tmpint32) } /* These are macros for handling read and write problems, they are @@ -97,7 +97,7 @@ TFILE *nslcd_client_open(void) ERROR_OUT_READERROR(fp) /* This macro is called if the read status code is not - NSLCD_RESULT_SUCCESS. */ + NSLCD_RESULT_BEGIN. */ #define ERROR_OUT_NOSUCCESS(fp,retv) \ (void)tio_close(fp); \ fp=NULL; \ diff --git a/nss/group.c b/nss/group.c index bdda327..33774ff 100644 --- a/nss/group.c +++ b/nss/group.c @@ -50,13 +50,13 @@ static enum nss_status read_gids( TFILE *fp,gid_t skipgroup,long int *start,long int *size, gid_t **groupsp,long int limit,int *errnop) { - int32_t res=(int32_t)NSLCD_RESULT_SUCCESS; + int32_t res=(int32_t)NSLCD_RESULT_BEGIN; int32_t tmpint32,tmp2int32,tmp3int32; gid_t gid; gid_t *newgroups; long int newsize; /* loop over results */ - while (res==(int32_t)NSLCD_RESULT_SUCCESS) + while (res==(int32_t)NSLCD_RESULT_BEGIN) { /* skip group name */ SKIP_STRING(fp); |