about summary refs log tree commit diff
path: root/nis
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2018-01-29 17:00:14 +0100
committerFlorian Weimer <fweimer@redhat.com>2018-01-29 17:42:30 +0100
commitcdd14619a713ab41e26ba700add4880604324dbb (patch)
treedc0129bed806b525deae5fc481170ccdb4ef048b /nis
parentb7ccb5de359e8dd9918dbedfc1f4d96e06fcd634 (diff)
downloadglibc-cdd14619a713ab41e26ba700add4880604324dbb.tar.gz
glibc-cdd14619a713ab41e26ba700add4880604324dbb.tar.xz
glibc-cdd14619a713ab41e26ba700add4880604324dbb.zip
libnsl: Turn remaining symbols into compat symbols [BZ #22701]
Diffstat (limited to 'nis')
-rw-r--r--nis/Makefile3
-rw-r--r--nis/nis_defaults.c1
-rw-r--r--nis/rpcsvc/ypclnt.h3
-rw-r--r--nis/yp_xdr.c2
-rw-r--r--nis/ypclnt.c1
5 files changed, 5 insertions, 5 deletions
diff --git a/nis/Makefile b/nis/Makefile
index e7497f7242..d77c6e0c8e 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -58,9 +58,10 @@ libnsl-routines = yp_xdr ypclnt ypupdate_xdr \
 		  nis_print_group_entry nis_domain_of nis_domain_of_r\
 		  nis_modify nis_remove nis_add nis_defaults\
 		  nis_findserv nis_callback nis_clone_dir nis_clone_obj\
-		  nis_clone_res nss-default
+		  nis_clone_res
 
 ifeq ($(build-obsolete-nsl),yes)
+libnsl-routines += nss-default
 libnss_nis-routines	:= $(addprefix nis-,$(databases)) nis-initgroups \
 			   nss-nis
 libnss_nis-inhibit-o	= $(filter-out .os,$(object-suffixes))
diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 58e64a8e98..0be47aa65c 100644
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -428,6 +428,7 @@ __nis_default_ttl (char *defaults)
 
   return searchttl (cptr);
 }
+libnsl_hidden_nolink_def (__nis_default_ttl, GLIBC_2_1)
 
 /* Default access rights are ----rmcdr---r---, but we could change
    this with the NIS_DEFAULTS variable. */
diff --git a/nis/rpcsvc/ypclnt.h b/nis/rpcsvc/ypclnt.h
index b96cb3b40e..af904fccb2 100644
--- a/nis/rpcsvc/ypclnt.h
+++ b/nis/rpcsvc/ypclnt.h
@@ -76,9 +76,6 @@ extern const char *ypbinderr_string (const int) __THROW;
 extern int ypprot_err (const int) __THROW;
 extern int yp_update (char *, char *, unsigned int,  char *,
 		      int, char *, int) __THROW;
-#if 0
-extern int yp_maplist (const char *, struct ypmaplist **) __THROW;
-#endif
 
 /* This functions exists only under BSD and Linux systems.  */
 extern int __yp_check (char **) __THROW;
diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c
index 0081b4c926..3b576731da 100644
--- a/nis/yp_xdr.c
+++ b/nis/yp_xdr.c
@@ -327,4 +327,4 @@ xdr_ypall(XDR *xdrs, struct ypall_callback *incallback)
 	    return FALSE;
     }
 }
-/* XXX libnsl_hidden_nolink_def(xdr_ypall, GLIBC_2_2) */
+libnsl_hidden_nolink_def (xdr_ypall, GLIBC_2_2)
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 95215e2f67..11a17db98d 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -813,6 +813,7 @@ yp_maplist (const char *indomain, struct ypmaplist **outmaplist)
 
   return result;
 }
+libnsl_hidden_nolink_def (yp_maplist, GLIBC_2_0)
 
 const char *
 yperr_string (const int error)