From 85eefd6f9e2f384f7df2d5c503eb3a75f15bb53f Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Mon, 13 Dec 2010 21:13:12 +0000 Subject: fix assignment in if statement (was broken in r1262) git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1330 ef36b2f9-881f-0410-afb5-c4e39611909c --- nss/ethers.c | 4 ++-- nss/group.c | 4 ++-- nss/hosts.c | 8 ++++---- nss/networks.c | 4 ++-- nss/passwd.c | 4 ++-- nss/protocols.c | 4 ++-- nss/rpc.c | 4 ++-- nss/services.c | 4 ++-- nss/shadow.c | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'nss') diff --git a/nss/ethers.c b/nss/ethers.c index 75b09e9..35bb4ff 100644 --- a/nss/ethers.c +++ b/nss/ethers.c @@ -131,14 +131,14 @@ static nss_status_t read_etherstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_etherent(fp,(struct etherent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_etherstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_etherent(fp,(struct etherent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/group.c b/nss/group.c index ef1461b..4dffa75 100644 --- a/nss/group.c +++ b/nss/group.c @@ -221,14 +221,14 @@ static nss_status_t read_groupstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_group(fp,(struct group *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_groupstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_group(fp,(struct group *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/hosts.c b/nss/hosts.c index 8a699f3..fe83b1d 100644 --- a/nss/hosts.c +++ b/nss/hosts.c @@ -300,26 +300,26 @@ static nss_status_t read_hoststring(TFILE *fp,nss_XbyY_args_t *args,int erronemp NSS_ARGS(args)->buf.result? \ read_hostent_erronempty(fp,NSS_ARGS(args)->key.hostaddr.type,(struct hostent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno,&(NSS_ARGS(args)->h_errno)): \ read_hoststring(fp,args,1); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #define READ_RESULT_NEXTONEMPTY(fp) \ NSS_ARGS(args)->buf.result? \ read_hostent_nextonempty(fp,NSS_ARGS(args)->key.hostaddr.type,(struct hostent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno,&(NSS_ARGS(args)->h_errno)): \ read_hoststring(fp,args,0); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT_ERRONEMPTY(fp) \ read_hostent_erronempty(fp,NSS_ARGS(args)->key.hostaddr.type,(struct hostent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno,&(NSS_ARGS(args)->h_errno)); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #define READ_RESULT_NEXTONEMPTY(fp) \ read_hostent_nextonempty(fp,NSS_ARGS(args)->key.hostaddr.type,(struct hostent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno,&(NSS_ARGS(args)->h_errno)); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/networks.c b/nss/networks.c index 2a9443b..114a21b 100644 --- a/nss/networks.c +++ b/nss/networks.c @@ -201,14 +201,14 @@ static nss_status_t read_netentstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_netent(fp,(struct netent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno,&(NSS_ARGS(args)->h_errno)): \ read_netentstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_netent(fp,(struct netent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno,&(NSS_ARGS(args)->h_errno)); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/passwd.c b/nss/passwd.c index 2771fbf..80f7159 100644 --- a/nss/passwd.c +++ b/nss/passwd.c @@ -129,14 +129,14 @@ static nss_status_t read_passwdstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_passwd(fp,(struct passwd *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_passwdstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_passwd(fp,(struct passwd *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/protocols.c b/nss/protocols.c index 75c5f32..93e230e 100644 --- a/nss/protocols.c +++ b/nss/protocols.c @@ -130,14 +130,14 @@ static nss_status_t read_protostring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_protoent(fp,(struct protoent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_protostring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_protoent(fp,(struct protoent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/rpc.c b/nss/rpc.c index 9b55c8f..9404ccf 100644 --- a/nss/rpc.c +++ b/nss/rpc.c @@ -130,14 +130,14 @@ static nss_status_t read_rpcstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_rpcent(fp,(struct rpcent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_rpcstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_rpcent(fp,(struct rpcent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/services.c b/nss/services.c index db66494..24b7491 100644 --- a/nss/services.c +++ b/nss/services.c @@ -134,14 +134,14 @@ static nss_status_t read_servstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_servent(fp,(struct servent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_servstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_servent(fp,(struct servent *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ diff --git a/nss/shadow.c b/nss/shadow.c index fdcc74f..130ba5a 100644 --- a/nss/shadow.c +++ b/nss/shadow.c @@ -155,14 +155,14 @@ static nss_status_t read_spwdstring(TFILE *fp,nss_XbyY_args_t *args) NSS_ARGS(args)->buf.result? \ read_spwd(fp,(struct spwd *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno): \ read_spwdstring(fp,args); \ - if ((NSS_ARGS(args)->buf.result)&&(retv=NSS_STATUS_SUCCESS)) \ + if ((NSS_ARGS(args)->buf.result)&&(retv==NSS_STATUS_SUCCESS)) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #else /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ #define READ_RESULT(fp) \ read_spwd(fp,(struct spwd *)NSS_ARGS(args)->buf.result,NSS_ARGS(args)->buf.buffer,NSS_ARGS(args)->buf.buflen,&errno); \ - if (retv=NSS_STATUS_SUCCESS) \ + if (retv==NSS_STATUS_SUCCESS) \ NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; #endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ -- cgit v1.2.3