diff options
Diffstat (limited to 'nis/nis_call.c')
| -rw-r--r-- | nis/nis_call.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/nis/nis_call.c b/nis/nis_call.c index 3fa37e45a3..196a9a304b 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1997-2016 Free Software Foundation, Inc. +/* Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1997. @@ -33,6 +33,7 @@ #include "nis_xdr.h" #include "nis_intern.h" #include <libnsl.h> +#include <shlib-compat.h> static const struct timeval RPCTIMEOUT = {10, 0}; static const struct timeval UDPTIMEOUT = {5, 0}; @@ -65,7 +66,7 @@ __nisbind_destroy (dir_binding *bind) clnt_destroy (bind->clnt); } } -libnsl_hidden_def (__nisbind_destroy) +libnsl_hidden_nolink_def (__nisbind_destroy, GLIBC_2_1) nis_error __nisbind_next (dir_binding *bind) @@ -107,7 +108,7 @@ __nisbind_next (dir_binding *bind) return NIS_FAIL; } -libnsl_hidden_def (__nisbind_next) +libnsl_hidden_nolink_def (__nisbind_next, GLIBC_2_1) static struct ckey_cache_entry { @@ -246,7 +247,7 @@ __nisbind_connect (dir_binding *dbp) return NIS_SUCCESS; } -libnsl_hidden_def (__nisbind_connect) +libnsl_hidden_nolink_def (__nisbind_connect, GLIBC_2_1) nis_error __nisbind_create (dir_binding *dbp, const nis_server *serv_val, @@ -290,7 +291,7 @@ __nisbind_create (dir_binding *dbp, const nis_server *serv_val, return NIS_SUCCESS; } -libnsl_hidden_def (__nisbind_create) +libnsl_hidden_nolink_def (__nisbind_create, GLIBC_2_1) /* __nisbind_connect (dbp) must be run before calling this function ! So we could use the same binding twice */ @@ -374,7 +375,7 @@ __do_niscall3 (dir_binding *dbp, u_long prog, xdrproc_t xargs, caddr_t req, return retcode; } -libnsl_hidden_def (__do_niscall3) +libnsl_hidden_nolink_def (__do_niscall3, GLIBC_PRIVATE) nis_error @@ -680,16 +681,18 @@ nis_server_cache_add (const_nis_name name, int search_parent, /* Choose which entry should be evicted from the cache. */ loc = &nis_server_cache[0]; if (*loc != NULL) - for (i = 1; i < 16; ++i) - if (nis_server_cache[i] == NULL) - { + { + for (i = 1; i < 16; ++i) + if (nis_server_cache[i] == NULL) + { + loc = &nis_server_cache[i]; + break; + } + else if ((*loc)->uses > nis_server_cache[i]->uses + || ((*loc)->uses == nis_server_cache[i]->uses + && (*loc)->expires > nis_server_cache[i]->expires)) loc = &nis_server_cache[i]; - break; - } - else if ((*loc)->uses > nis_server_cache[i]->uses - || ((*loc)->uses == nis_server_cache[i]->uses - && (*loc)->expires > nis_server_cache[i]->expires)) - loc = &nis_server_cache[i]; + } old = *loc; *loc = new; @@ -814,7 +817,7 @@ __prepare_niscall (const_nis_name name, directory_obj **dirp, return retcode; } -libnsl_hidden_def (__prepare_niscall) +libnsl_hidden_nolink_def (__prepare_niscall, GLIBC_PRIVATE) nis_error |