From 90fec72d7d1390d0744622928c6648355d3f6f33 Mon Sep 17 00:00:00 2001 From: Arthur de Jong Date: Mon, 11 Oct 2010 20:12:59 +0000 Subject: also try to support older Solaris releases that do not have the returnlen member of struct nss_XbyY_args git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd-solaris@1262 ef36b2f9-881f-0410-afb5-c4e39611909c --- nss/group.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'nss/group.c') diff --git a/nss/group.c b/nss/group.c index cd68689..ef1461b 100644 --- a/nss/group.c +++ b/nss/group.c @@ -183,6 +183,8 @@ nss_status_t _nss_ldap_initgroups_dyn( #ifdef NSS_FLAVOUR_SOLARIS +#ifdef HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN + static nss_status_t read_groupstring(TFILE *fp,nss_XbyY_args_t *args) { struct group result; @@ -219,8 +221,17 @@ 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) \ - NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result + 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) \ + NSS_ARGS(args)->returnval=NSS_ARGS(args)->buf.result; + +#endif /* not HAVE_STRUCT_NSS_XBYY_ARGS_RETURNLEN */ static nss_status_t get_getgrnam_r(nss_backend_t UNUSED(*be),void *args) { -- cgit v1.2.3