diff options
| -rw-r--r-- | include/libc-symbols.h | 23 | ||||
| -rw-r--r-- | include/netdb.h | 8 | ||||
| -rw-r--r-- | nis/nss-nis.h | 1 | ||||
| -rw-r--r-- | nis/nss_nis/nis-hosts.c | 17 | ||||
| -rw-r--r-- | nis/nss_nis/nis-network.c | 17 | ||||
| -rw-r--r-- | nis/nss_nis/nis-spwd.c | 16 |
6 files changed, 54 insertions, 28 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 33e2d34c53..b0b75a087e 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -835,6 +835,29 @@ for linking") # define libnsl_hidden_data_ver(local, name) #endif +#if IS_IN (libnss_nis) +# define libnss_nis_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) +# define libnss_nis_hidden_tls_proto(name, attrs...) \ + hidden_tls_proto (name, ##attrs) +# define libnss_nis_hidden_def(name) hidden_def (name) +# define libnss_nis_hidden_weak(name) hidden_weak (name) +# define libnss_nis_hidden_ver(local, name) hidden_ver (local, name) +# define libnss_nis_hidden_data_def(name) hidden_data_def (name) +# define libnss_nis_hidden_tls_def(name) hidden_tls_def (name) +# define libnss_nis_hidden_data_weak(name) hidden_data_weak (name) +# define libnss_nis_hidden_data_ver(local, name) hidden_data_ver (local, name) +#else +# define libnss_nis_hidden_proto(name, attrs...) +# define libnss_nis_hidden_tls_proto(name, attrs...) +# define libnss_nis_hidden_def(name) +# define libnss_nis_hidden_weak(name) +# define libnss_nis_hidden_ver(local, name) +# define libnss_nis_hidden_data_def(name) +# define libnss_nis_hidden_tls_def(name) +# define libnss_nis_hidden_data_weak(name) +# define libnss_nis_hidden_data_ver(local, name) +#endif + #if IS_IN (libnss_nisplus) # define libnss_nisplus_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libnss_nisplus_hidden_tls_proto(name, attrs...) \ diff --git a/include/netdb.h b/include/netdb.h index e230b1f4fc..3c78da60c5 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -279,7 +279,8 @@ extern enum nss_status _nss_ ## service ## _getnetbyname_r \ extern enum nss_status _nss_ ## service ## _getnetbyaddr_r \ (uint32_t addr, int type, struct netent *net, \ char *buffer, size_t buflen, int *errnop, \ - int *herrnop); + int *herrnop); \ +extern enum nss_status _nss_ ## service ## _endspent (void); DECLARE_NSS_PROTOTYPES (compat) DECLARE_NSS_PROTOTYPES (dns) @@ -289,6 +290,11 @@ DECLARE_NSS_PROTOTYPES (nis) DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES + +libnss_nis_hidden_proto (_nss_nis_endhostent) +libnss_nis_hidden_proto (_nss_nis_endnetent) +libnss_nis_hidden_proto (_nss_nis_endspent) + #endif #endif /* !_NETDB_H */ diff --git a/nis/nss-nis.h b/nis/nss-nis.h index dc091d1a20..7c009d7e87 100644 --- a/nis/nss-nis.h +++ b/nis/nss-nis.h @@ -22,6 +22,7 @@ #include "nsswitch.h" +NSS_DECLARE_MODULE_FUNCTIONS (nis) /* Convert YP error number to NSS error number. */ extern const enum nss_status __yperr2nss_tab[] attribute_hidden; diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c index 2d08076382..eb074783f7 100644 --- a/nis/nss_nis/nis-hosts.c +++ b/nis/nss_nis/nis-hosts.c @@ -19,11 +19,7 @@ #include <assert.h> #include <nss.h> #include <ctype.h> -/* The following is an ugly trick to avoid a prototype declaration for - _nss_nis_endgrent. */ -#define _nss_nis_endhostent _nss_nis_endhostent_XXX #include <netdb.h> -#undef _nss_nis_endhostent #include <string.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -90,10 +86,15 @@ static bool_t new_start = 1; static char *oldkey = NULL; static int oldkeylen = 0; - enum nss_status _nss_nis_sethostent (int stayopen) { + return _nss_nis_endhostent (); +} + +enum nss_status +_nss_nis_endhostent (void) +{ __libc_lock_lock (lock); new_start = 1; @@ -108,11 +109,7 @@ _nss_nis_sethostent (int stayopen) return NSS_STATUS_SUCCESS; } -/* Make _nss_nis_endhostent an alias of _nss_nis_sethostent. We do this - even though the prototypes don't match. The argument of sethostent - is used so this makes no difference. */ -strong_alias (_nss_nis_sethostent, _nss_nis_endhostent) - +libnss_nis_hidden_def (_nss_nis_endhostent) /* The calling function always need to get a lock first. */ static enum nss_status diff --git a/nis/nss_nis/nis-network.c b/nis/nss_nis/nis-network.c index dcafd26148..8d87c69d8e 100644 --- a/nis/nss_nis/nis-network.c +++ b/nis/nss_nis/nis-network.c @@ -17,11 +17,7 @@ <https://www.gnu.org/licenses/>. */ #include <nss.h> -/* The following is an ugly trick to avoid a prototype declaration for - _nss_nis_endgrent. */ -#define _nss_nis_endnetent _nss_nis_endnetent_XXX #include <netdb.h> -#undef _nss_nis_endnetent #include <ctype.h> #include <errno.h> #include <stdint.h> @@ -48,7 +44,13 @@ static int oldkeylen; enum nss_status _nss_nis_setnetent (int stayopen) { - __libc_lock_lock (lock); + return _nss_nis_endnetent (); +} + +enum nss_status +_nss_nis_endnetent (void) +{ +__libc_lock_lock (lock); new_start = 1; if (oldkey != NULL) @@ -62,10 +64,7 @@ _nss_nis_setnetent (int stayopen) return NSS_STATUS_SUCCESS; } -/* Make _nss_nis_endnetent an alias of _nss_nis_setnetent. We do this - even though the prototypes don't match. The argument of setnetent - is not used so this makes no difference. */ -strong_alias (_nss_nis_setnetent, _nss_nis_endnetent) +libnss_nis_hidden_def (_nss_nis_endnetent) static enum nss_status internal_nis_getnetent_r (struct netent *net, char *buffer, size_t buflen, diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c index 6cd46b4022..9790dd4104 100644 --- a/nis/nss_nis/nis-spwd.c +++ b/nis/nss_nis/nis-spwd.c @@ -20,14 +20,11 @@ #include <ctype.h> #include <errno.h> #include <string.h> -/* The following is an ugly trick to avoid a prototype declaration for - _nss_nis_endspent. */ -#define _nss_nis_endspent _nss_nis_endspent_XXX #include <shadow.h> -#undef _nss_nis_endspent #include <libc-lock.h> #include <rpcsvc/yp.h> #include <rpcsvc/ypclnt.h> +#include <netdb.h> #include "nss-nis.h" #include <libnsl.h> @@ -49,6 +46,12 @@ static int oldkeylen; enum nss_status _nss_nis_setspent (int stayopen) { + return _nss_nis_endspent (); +} + +enum nss_status +_nss_nis_endspent (void) +{ __libc_lock_lock (lock); new_start = true; @@ -61,10 +64,7 @@ _nss_nis_setspent (int stayopen) return NSS_STATUS_SUCCESS; } -/* Make _nss_nis_endspent an alias of _nss_nis_setspent. We do this - even though the prototypes don't match. The argument of setspent - is not used so this makes no difference. */ -strong_alias (_nss_nis_setspent, _nss_nis_endspent) +libnss_nis_hidden_def (_nss_nis_endspent) static enum nss_status internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen, |