about summary refs log tree commit diff
path: root/nis
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-06-04 11:14:43 -0400
committerZack Weinberg <zackw@panix.com>2017-06-04 11:31:28 -0400
commit82f43dd2d11b5705ed5680f579f265781387a12d (patch)
tree6c372419b50b87242af97e2a0ad0b83c18f07ef1 /nis
parent363911ce1313a246b7d33f0983a09e7ab2525b3a (diff)
downloadglibc-82f43dd2d11b5705ed5680f579f265781387a12d.tar.gz
glibc-82f43dd2d11b5705ed5680f579f265781387a12d.tar.xz
glibc-82f43dd2d11b5705ed5680f579f265781387a12d.zip
Include shlib-compat.h in many sunrpc/nis source files.
Every file that uses libc_hidden_nolink_sunrpc or
libnsl_hidden_nolink_def needs to include shlib-compat.h.  Currently,
most of them are getting it via stdio.h, because libio.h refers to
SHLIB_COMPAT when _LIBC is defined, so it includes shlib-compat.h.  My
experimental patch to not install libio.h breaks that chain; stdio.h
no longer pulls in libio.h even for internal users.

Accordingly, this patch adds #include <shlib-compat.h> to many files
in sunrpc/ and nis/.  There are also a small number of really obvious
fixups to includes that caught my eye while proofreading the patch -
not including headers twice in a row, not worrying about portability
to Ultrix anymore, sort of thing.

	* nis/nis_add.c, nis/nis_addmember.c, nis/nis_call.c
	* nis/nis_checkpoint.c, nis/nis_clone_dir.c, nis/nis_clone_obj.c
	* nis/nis_clone_res.c, nis/nis_creategroup.c, nis/nis_defaults.c
	* nis/nis_destroygroup.c, nis/nis_domain_of.c
	* nis/nis_domain_of_r.c, nis/nis_error.c, nis/nis_file.c
	* nis/nis_free.c, nis/nis_getservlist.c, nis/nis_ismember.c
	* nis/nis_local_names.c, nis/nis_lookup.c, nis/nis_mkdir.c
	* nis/nis_modify.c, nis/nis_ping.c, nis/nis_print.c
	* nis/nis_print_group_entry.c, nis/nis_remove.c
	* nis/nis_removemember.c, nis/nis_rmdir.c, nis/nis_server.c
	* nis/nis_subr.c, nis/nis_table.c, nis/nis_util.c
	* nis/nis_verifygroup.c, nis/nis_xdr.c, nis/yp_xdr.c
	* nis/ypclnt.c, nis/ypupdate_xdr.c, sunrpc/auth_des.c
	* sunrpc/auth_none.c, sunrpc/auth_unix.c, sunrpc/authdes_prot.c
	* sunrpc/authuxprot.c, sunrpc/clnt_gen.c, sunrpc/clnt_perr.c
	* sunrpc/clnt_raw.c, sunrpc/clnt_simp.c, sunrpc/clnt_tcp.c
	* sunrpc/clnt_udp.c, sunrpc/clnt_unix.c, sunrpc/des_crypt.c
	* sunrpc/des_soft.c, sunrpc/get_myaddr.c, sunrpc/key_call.c
	* sunrpc/key_prot.c, sunrpc/netname.c, sunrpc/pm_getmaps.c
	* sunrpc/pm_getport.c, sunrpc/pmap_clnt.c, sunrpc/pmap_prot.c
	* sunrpc/pmap_prot2.c, sunrpc/pmap_rmt.c, sunrpc/publickey.c
	* sunrpc/rpc_cmsg.c, sunrpc/rpc_dtable.c, sunrpc/rpc_prot.c
	* sunrpc/rpc_thread.c, sunrpc/rtime.c, sunrpc/svc.c
	* sunrpc/svc_auth.c, sunrpc/svc_raw.c, sunrpc/svc_run.c
	* sunrpc/svc_tcp.c, sunrpc/svc_udp.c, sunrpc/svc_unix.c
	* sunrpc/svcauth_des.c, sunrpc/xdr.c, sunrpc/xdr_array.c
	* sunrpc/xdr_float.c, sunrpc/xdr_intXX_t.c, sunrpc/xdr_mem.c
	* sunrpc/xdr_rec.c, sunrpc/xdr_ref.c, sunrpc/xdr_sizeof.c
	* sunrpc/xdr_stdio.c: Include shlib-compat.h.

	* sunrpc/des_crypt.c, sunrpc/des_soft.c: No need to include
	abi-versions.h as well as shlib-compat.h.
	* sunrpc/get_myaddr.c: Remove obsolete comment.
	* sunrpc/pmap_rmt.c: Remove obsolete comment and #undef.
	* sunrpc/rpc_thread.c: Include libc-lock.h only once.
	* resolv/res_libc.c: Include shlib-compat.h only once.
Diffstat (limited to 'nis')
-rw-r--r--nis/nis_add.c1
-rw-r--r--nis/nis_addmember.c1
-rw-r--r--nis/nis_call.c1
-rw-r--r--nis/nis_checkpoint.c1
-rw-r--r--nis/nis_clone_dir.c1
-rw-r--r--nis/nis_clone_obj.c1
-rw-r--r--nis/nis_clone_res.c1
-rw-r--r--nis/nis_creategroup.c1
-rw-r--r--nis/nis_defaults.c1
-rw-r--r--nis/nis_destroygroup.c1
-rw-r--r--nis/nis_domain_of.c1
-rw-r--r--nis/nis_domain_of_r.c1
-rw-r--r--nis/nis_error.c1
-rw-r--r--nis/nis_file.c1
-rw-r--r--nis/nis_free.c1
-rw-r--r--nis/nis_getservlist.c1
-rw-r--r--nis/nis_ismember.c1
-rw-r--r--nis/nis_local_names.c1
-rw-r--r--nis/nis_lookup.c1
-rw-r--r--nis/nis_mkdir.c1
-rw-r--r--nis/nis_modify.c1
-rw-r--r--nis/nis_ping.c1
-rw-r--r--nis/nis_print.c1
-rw-r--r--nis/nis_print_group_entry.c1
-rw-r--r--nis/nis_remove.c1
-rw-r--r--nis/nis_removemember.c1
-rw-r--r--nis/nis_rmdir.c1
-rw-r--r--nis/nis_server.c1
-rw-r--r--nis/nis_subr.c1
-rw-r--r--nis/nis_table.c1
-rw-r--r--nis/nis_util.c1
-rw-r--r--nis/nis_verifygroup.c1
-rw-r--r--nis/nis_xdr.c1
-rw-r--r--nis/yp_xdr.c1
-rw-r--r--nis/ypclnt.c1
-rw-r--r--nis/ypupdate_xdr.c1
36 files changed, 36 insertions, 0 deletions
diff --git a/nis/nis_add.c b/nis/nis_add.c
index 3ec49c018a..a440252292 100644
--- a/nis/nis_add.c
+++ b/nis/nis_add.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_addmember.c b/nis/nis_addmember.c
index 6b0c29530f..d2c47ab18f 100644
--- a/nis/nis_addmember.c
+++ b/nis/nis_addmember.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_addmember (const_nis_name member, const_nis_name group)
diff --git a/nis/nis_call.c b/nis/nis_call.c
index 03b15de2bc..d4f37bfb72 100644
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -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};
diff --git a/nis/nis_checkpoint.c b/nis/nis_checkpoint.c
index 06656a476e..f148af4170 100644
--- a/nis/nis_checkpoint.c
+++ b/nis/nis_checkpoint.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_clone_dir.c b/nis/nis_clone_dir.c
index 41e2f77210..982f475218 100644
--- a/nis/nis_clone_dir.c
+++ b/nis/nis_clone_dir.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 
diff --git a/nis/nis_clone_obj.c b/nis/nis_clone_obj.c
index 7299e11f6e..1d7e2e3ca5 100644
--- a/nis/nis_clone_obj.c
+++ b/nis/nis_clone_obj.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 
diff --git a/nis/nis_clone_res.c b/nis/nis_clone_res.c
index ca998346f8..db7716538a 100644
--- a/nis/nis_clone_res.c
+++ b/nis/nis_clone_res.c
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 
diff --git a/nis/nis_creategroup.c b/nis/nis_creategroup.c
index 6d5a08dc81..1d7e058710 100644
--- a/nis/nis_creategroup.c
+++ b/nis/nis_creategroup.c
@@ -19,6 +19,7 @@
 #include <time.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_creategroup (const_nis_name group, unsigned int flags)
diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 7e6054d35d..1188a81b30 100644
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -24,6 +24,7 @@
 #include <sys/types.h>
 #include <rpc/rpc.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #define DEFAULT_TTL 43200
 
diff --git a/nis/nis_destroygroup.c b/nis/nis_destroygroup.c
index 662d658693..fbcd5efddf 100644
--- a/nis/nis_destroygroup.c
+++ b/nis/nis_destroygroup.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_destroygroup (const_nis_name group)
diff --git a/nis/nis_domain_of.c b/nis/nis_domain_of.c
index 6e2025cbdc..68d958f75e 100644
--- a/nis/nis_domain_of.c
+++ b/nis/nis_domain_of.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_domain_of (const_nis_name name)
diff --git a/nis/nis_domain_of_r.c b/nis/nis_domain_of_r.c
index 57f99a2ced..9711eca605 100644
--- a/nis/nis_domain_of_r.c
+++ b/nis/nis_domain_of_r.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_domain_of_r (const_nis_name name, char *buffer, size_t buflen)
diff --git a/nis/nis_error.c b/nis/nis_error.c
index e55d784dfb..32b2a100f6 100644
--- a/nis/nis_error.c
+++ b/nis/nis_error.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <libintl.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 
 #define MF(line) MF1 (line)
diff --git a/nis/nis_file.c b/nis/nis_file.c
index c3c6c57f22..d6c1d14aae 100644
--- a/nis/nis_file.c
+++ b/nis/nis_file.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 #include "nis_xdr.h"
 
 typedef bool_t (*iofct_t) (XDR *, void *);
diff --git a/nis/nis_free.c b/nis/nis_free.c
index 2b1580e9d5..1d3298f2a9 100644
--- a/nis/nis_free.c
+++ b/nis/nis_free.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 #include "nis_xdr.h"
 
 void
diff --git a/nis/nis_getservlist.c b/nis/nis_getservlist.c
index 1f9482c7da..fba18c77ca 100644
--- a/nis/nis_getservlist.c
+++ b/nis/nis_getservlist.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_ismember.c b/nis/nis_ismember.c
index 0006d6f80a..5aba3367f5 100644
--- a/nis/nis_ismember.c
+++ b/nis/nis_ismember.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 /* internal_nis_ismember ()
    return codes: -1 principal is in -group
diff --git a/nis/nis_local_names.c b/nis/nis_local_names.c
index 090125d7de..99d8f99e27 100644
--- a/nis/nis_local_names.c
+++ b/nis/nis_local_names.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <libintl.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_local_group (void)
diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c
index 2b953cff90..f6d84abecd 100644
--- a/nis/nis_lookup.c
+++ b/nis/nis_lookup.c
@@ -21,6 +21,7 @@
 #include "nis_xdr.h"
 #include "nis_intern.h"
 #include <libnsl.h>
+#include <shlib-compat.h>
 
 
 nis_result *
diff --git a/nis/nis_mkdir.c b/nis/nis_mkdir.c
index bea7d18d0f..da6690cdcb 100644
--- a/nis/nis_mkdir.c
+++ b/nis/nis_mkdir.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_modify.c b/nis/nis_modify.c
index 18d1bd1114..67315165bc 100644
--- a/nis/nis_modify.c
+++ b/nis/nis_modify.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_ping.c b/nis/nis_ping.c
index 1924336352..b744898ba2 100644
--- a/nis/nis_ping.c
+++ b/nis/nis_ping.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_print.c b/nis/nis_print.c
index 0ee49020a0..869f6aad61 100644
--- a/nis/nis_print.c
+++ b/nis/nis_print.c
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 static const char *
 nis_nstype2str (const nstype type)
diff --git a/nis/nis_print_group_entry.c b/nis/nis_print_group_entry.c
index 1f2766ee20..3a717e71d7 100644
--- a/nis/nis_print_group_entry.c
+++ b/nis/nis_print_group_entry.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <libintl.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 void
 nis_print_group_entry (const_nis_name group)
diff --git a/nis/nis_remove.c b/nis/nis_remove.c
index 4cfc5c533a..87c539793d 100644
--- a/nis/nis_remove.c
+++ b/nis/nis_remove.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_removemember.c b/nis/nis_removemember.c
index 04a05ca162..af9e2a899c 100644
--- a/nis/nis_removemember.c
+++ b/nis/nis_removemember.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_removemember (const_nis_name member, const_nis_name group)
diff --git a/nis/nis_rmdir.c b/nis/nis_rmdir.c
index a0c738024f..53a0509e05 100644
--- a/nis/nis_rmdir.c
+++ b/nis/nis_rmdir.c
@@ -17,6 +17,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_server.c b/nis/nis_server.c
index 2fb16ba195..63857721f2 100644
--- a/nis/nis_server.c
+++ b/nis/nis_server.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_subr.c b/nis/nis_subr.c
index 5c31af8840..5d93e77330 100644
--- a/nis/nis_subr.c
+++ b/nis/nis_subr.c
@@ -19,6 +19,7 @@
 #include <errno.h>
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_name
 nis_leaf_of (const_nis_name name)
diff --git a/nis/nis_table.c b/nis/nis_table.c
index bec41f0e88..88eb6797e6 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -20,6 +20,7 @@
 #include <string.h>
 #include <rpcsvc/nis.h>
 #include <libc-diag.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_util.c b/nis/nis_util.c
index 681280e803..fcb7120e41 100644
--- a/nis/nis_util.c
+++ b/nis/nis_util.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 #include "nis_xdr.h"
 #include "nis_intern.h"
diff --git a/nis/nis_verifygroup.c b/nis/nis_verifygroup.c
index 294595931f..4fb2cc5977 100644
--- a/nis/nis_verifygroup.c
+++ b/nis/nis_verifygroup.c
@@ -18,6 +18,7 @@
 
 #include <string.h>
 #include <rpcsvc/nis.h>
+#include <shlib-compat.h>
 
 nis_error
 nis_verifygroup (const_nis_name group)
diff --git a/nis/nis_xdr.c b/nis/nis_xdr.c
index a7b3f8c119..3217dc51bd 100644
--- a/nis/nis_xdr.c
+++ b/nis/nis_xdr.c
@@ -19,6 +19,7 @@
 #include <stdint.h>
 #include <rpcsvc/nis.h>
 #include <rpcsvc/nis_callback.h> /* for "official" Solaris xdr functions */
+#include <shlib-compat.h>
 
 /* This functions do exist without beginning "_" under Solaris 2.x, but
    we have no prototypes for them. To avoid the same problems as with the
diff --git a/nis/yp_xdr.c b/nis/yp_xdr.c
index 3d8b0bf3a6..0081b4c926 100644
--- a/nis/yp_xdr.c
+++ b/nis/yp_xdr.c
@@ -31,6 +31,7 @@
 
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
+#include <shlib-compat.h>
 
 /* The NIS v2 protocol suggests 1024 bytes as a maximum length of all fields.
    Current Linux systems don't use this limit. To remain compatible with
diff --git a/nis/ypclnt.c b/nis/ypclnt.c
index 3c4af2e0cf..a03e347685 100644
--- a/nis/ypclnt.c
+++ b/nis/ypclnt.c
@@ -29,6 +29,7 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <libc-lock.h>
+#include <shlib-compat.h>
 
 /* This should only be defined on systems with a BSD compatible ypbind */
 #ifndef BINDINGDIR
diff --git a/nis/ypupdate_xdr.c b/nis/ypupdate_xdr.c
index 61d8880cab..bbfb2fb683 100644
--- a/nis/ypupdate_xdr.c
+++ b/nis/ypupdate_xdr.c
@@ -30,6 +30,7 @@
  */
 
 #include <rpcsvc/ypupd.h>
+#include <shlib-compat.h>
 
 bool_t
 xdr_yp_buf (XDR *xdrs, yp_buf *objp)
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-11 11:19:45 +0000