diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | nis/nss_nisplus/nisplus-ethers.c | 8 | ||||
| -rw-r--r-- | nis/nss_nisplus/nisplus-spwd.c | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index ad686636ce..1a90d02938 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-07-06 Marek Polacek <mpolacek@redhat.com> + + * nis/nss_nisplus/nisplus-spwd.c (_nss_nisplus_setspent): Honour the + `status' variable. + * nis/nss_nisplus/nisplus-ethers.c (_nss_nisplus_setetherent): + Likewise. + 2011-07-04 H.J. Lu <hongjiu.lu@intel.com> * Makefile (strop-tests): Add strncat. diff --git a/nis/nss_nisplus/nisplus-ethers.c b/nis/nss_nisplus/nisplus-ethers.c index 298869f931..8e5c5f56b7 100644 --- a/nis/nss_nisplus/nisplus-ethers.c +++ b/nis/nss_nisplus/nisplus-ethers.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997,1998,2000-2003,2005,2006,2007 +/* Copyright (C) 1997,1998,2000-2003,2005,2006,2007,2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@suse.de>, 1997. @@ -40,10 +40,10 @@ static u_long tablename_len; #define NISENTRYVAL(idx, col, res) \ - (NIS_RES_OBJECT (res)[idx].zo_data.objdata_u.en_data.en_cols.en_cols_val[col].ec_value.ec_value_val) + (NIS_RES_OBJECT (res)[idx].zo_data.objdata_u.en_data.en_cols.en_cols_val[col].ec_value.ec_value_val) #define NISENTRYLEN(idx, col, res) \ - (NIS_RES_OBJECT (res)[idx].zo_data.objdata_u.en_data.en_cols.en_cols_val[col].ec_value.ec_value_len) + (NIS_RES_OBJECT (res)[idx].zo_data.objdata_u.en_data.en_cols.en_cols_val[col].ec_value.ec_value_len) static int _nss_nisplus_parse_etherent (nis_result *result, struct etherent *ether, @@ -136,7 +136,7 @@ _nss_nisplus_setetherent (int stayopen) __libc_lock_unlock (lock); - return NSS_STATUS_SUCCESS; + return status; } enum nss_status diff --git a/nis/nss_nisplus/nisplus-spwd.c b/nis/nss_nisplus/nisplus-spwd.c index f256f3eb90..e41ffda51b 100644 --- a/nis/nss_nisplus/nisplus-spwd.c +++ b/nis/nss_nisplus/nisplus-spwd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 2001, 2002, 2003, 2005, 2007 +/* Copyright (C) 1997, 2001, 2002, 2003, 2005, 2007, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -57,7 +57,7 @@ _nss_nisplus_setspent (int stayopen) __libc_lock_unlock (lock); - return NSS_STATUS_SUCCESS; + return status; } enum nss_status @@ -91,7 +91,7 @@ internal_nisplus_getspent_r (struct spwd *sp, char *buffer, size_t buflen, { saved_res = NULL; - if (pwd_tablename_val == NULL) + if (pwd_tablename_val == NULL) { enum nss_status status = _nss_pwd_create_tablename (errnop); |