diff options
author | Petr Vorel <pvorel@suse.cz> | 2020-07-08 13:06:55 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2020-07-08 17:25:57 +0200 |
commit | ae7a94e5e3edf78f4da562edc05ece229614c716 (patch) | |
tree | be0969c61080fc1dbd69293944a3362b20db7cff /include | |
parent | acb527929d0c2b3bb0798472c42ddb3203729708 (diff) | |
download | glibc-ae7a94e5e3edf78f4da562edc05ece229614c716.tar.gz glibc-ae7a94e5e3edf78f4da562edc05ece229614c716.tar.xz glibc-ae7a94e5e3edf78f4da562edc05ece229614c716.zip |
Remove --enable-obsolete-nsl configure flag
this means that *always* libnsl is only built as shared library for backward compatibility and the NSS modules libnss_nis and libnss_nisplus are not built at all, libnsl's headers aren't installed. This compatibility is kept only for architectures and ABIs that have been added in or before version 2.28. Replacement implementations based on TIRPC, which additionally support IPv6, are available from <https://github.com/thkukuk/>. This change does not affect libnss_compat which does not depended on libnsl since 2.27 and thus can be used without NIS. libnsl code depends on Sun RPC, e.g. on --enable-obsolete-rpc (installed libnsl headers use installed Sun RPC headers), which will be removed in the following commit.
Diffstat (limited to 'include')
-rw-r--r-- | include/aliases.h | 2 | ||||
-rw-r--r-- | include/dlfcn.h | 9 | ||||
-rw-r--r-- | include/grp.h | 2 | ||||
-rw-r--r-- | include/libc-symbols.h | 55 | ||||
-rw-r--r-- | include/netdb.h | 6 | ||||
-rw-r--r-- | include/netinet/ether.h | 2 | ||||
-rw-r--r-- | include/pwd.h | 2 | ||||
-rw-r--r-- | include/rpc/auth.h | 11 | ||||
-rw-r--r-- | include/rpc/auth_des.h | 13 | ||||
-rw-r--r-- | include/rpc/netdb.h | 2 | ||||
-rw-r--r-- | include/rpcsvc/yp_prot.h | 1 | ||||
-rw-r--r-- | include/shadow.h | 2 |
12 files changed, 6 insertions, 101 deletions
diff --git a/include/aliases.h b/include/aliases.h index 11b81d4d24..db82588630 100644 --- a/include/aliases.h +++ b/include/aliases.h @@ -33,8 +33,6 @@ extern enum nss_status _nss_ ## service ## _getaliasbyname_r \ DECLARE_NSS_PROTOTYPES (files) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES # endif /* !_ISOMAC */ diff --git a/include/dlfcn.h b/include/dlfcn.h index 93dd369ab1..a1816e4991 100644 --- a/include/dlfcn.h +++ b/include/dlfcn.h @@ -39,10 +39,11 @@ extern char **__libc_argv attribute_hidden; __libgcc_s_init because unwinding is already in progress, so libgcc_s.so has already been loaded if its unwinder is used (Bug 22636). 2. It allows us to provide robust fallback code at dlopen time for - incorrectly configured systems that mix old libnss_* modules with newly - installed libraries e.g. old libnss_nis.so.2 with new libnsl.so.1. Using - RTLD_LAZY here causes a failure at the time the symbol is called and at - that point it is much harder to safely return an error (Bug 22766). + incorrectly configured systems that mix old libnss_* modules + with newly installed libraries e.g. old libnss_dns.so.2 with new + libresolv.so.2. Using RTLD_LAZY here causes a failure at the + time the symbol is called and at that point it is much harder to + safely return an error (Bug 22766). The use of RTLD_NOW also impacts gconv module loading, backtracing (where the unwinder form libgcc_s.so is used), and IDNA functions diff --git a/include/grp.h b/include/grp.h index 871701adbe..58f7b4d233 100644 --- a/include/grp.h +++ b/include/grp.h @@ -56,8 +56,6 @@ extern enum nss_status _nss_ ## service ##_initgroups_dyn \ DECLARE_NSS_PROTOTYPES (compat) DECLARE_NSS_PROTOTYPES (files) DECLARE_NSS_PROTOTYPES (hesiod) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES #endif diff --git a/include/libc-symbols.h b/include/libc-symbols.h index b2f36bc44b..29483779fe 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -833,13 +833,7 @@ for linking") # define libnsl_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) # define libnsl_hidden_tls_proto(name, attrs...) \ hidden_tls_proto (name, ##attrs) -# ifdef LINK_OBSOLETE_NSL - /* libnsl_hidden_nolink should only get used in libnsl code. */ -# define libnsl_hidden_nolink_def(name, version) libnsl_hidden_def (name) -# else -# define libnsl_hidden_nolink_def(name, version) hidden_nolink (name, libnsl, version) -# endif -# define libnsl_hidden_def(name) hidden_def (name) +# define libnsl_hidden_nolink_def(name, version) hidden_nolink (name, libnsl, version) # define libnsl_hidden_weak(name) hidden_weak (name) # define libnsl_hidden_ver(local, name) hidden_ver (local, name) # define libnsl_hidden_data_def(name) hidden_data_def (name) @@ -849,7 +843,6 @@ for linking") #else # define libnsl_hidden_proto(name, attrs...) # define libnsl_hidden_tls_proto(name, attrs...) -# define libnsl_hidden_def(name) # define libnsl_hidden_weak(name) # define libnsl_hidden_ver(local, name) # define libnsl_hidden_data_def(name) @@ -858,52 +851,6 @@ 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...) \ - hidden_tls_proto (name, ##attrs) -# define libnss_nisplus_hidden_def(name) hidden_def (name) -# define libnss_nisplus_hidden_weak(name) hidden_weak (name) -# define libnss_nisplus_hidden_ver(local, name) hidden_ver (local, name) -# define libnss_nisplus_hidden_data_def(name) hidden_data_def (name) -# define libnss_nisplus_hidden_tls_def(name) hidden_tls_def (name) -# define libnss_nisplus_hidden_data_weak(name) hidden_data_weak (name) -# define libnss_nisplus_hidden_data_ver(local, name) hidden_data_ver (local, name) -#else -# define libnss_nisplus_hidden_proto(name, attrs...) -# define libnss_nisplus_hidden_tls_proto(name, attrs...) -# define libnss_nisplus_hidden_def(name) -# define libnss_nisplus_hidden_weak(name) -# define libnss_nisplus_hidden_ver(local, name) -# define libnss_nisplus_hidden_data_def(name) -# define libnss_nisplus_hidden_tls_def(name) -# define libnss_nisplus_hidden_data_weak(name) -# define libnss_nisplus_hidden_data_ver(local, name) -#endif - #define libc_hidden_builtin_proto(name, attrs...) libc_hidden_proto (name, ##attrs) #define libc_hidden_builtin_def(name) libc_hidden_def (name) #define libc_hidden_builtin_weak(name) libc_hidden_weak (name) diff --git a/include/netdb.h b/include/netdb.h index 3c78da60c5..6b431350df 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -286,15 +286,9 @@ DECLARE_NSS_PROTOTYPES (compat) DECLARE_NSS_PROTOTYPES (dns) DECLARE_NSS_PROTOTYPES (files) DECLARE_NSS_PROTOTYPES (hesiod) -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/include/netinet/ether.h b/include/netinet/ether.h index 8bfe7e03ad..8fd05f8193 100644 --- a/include/netinet/ether.h +++ b/include/netinet/ether.h @@ -36,8 +36,6 @@ extern enum nss_status _nss_ ## service ## _getntohost_r \ char *buffer, size_t buflen, int *errnop); DECLARE_NSS_PROTOTYPES (files) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES diff --git a/include/pwd.h b/include/pwd.h index fc995065d9..fd23fe9d6b 100644 --- a/include/pwd.h +++ b/include/pwd.h @@ -48,8 +48,6 @@ extern enum nss_status _nss_ ## service ##_getpwent_r \ DECLARE_NSS_PROTOTYPES (compat) DECLARE_NSS_PROTOTYPES (files) DECLARE_NSS_PROTOTYPES (hesiod) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES #endif diff --git a/include/rpc/auth.h b/include/rpc/auth.h index 2e55cce11d..86cbd77196 100644 --- a/include/rpc/auth.h +++ b/include/rpc/auth.h @@ -13,17 +13,6 @@ libc_hidden_proto (key_gendes) struct key_netstarg; extern int key_setnet (struct key_netstarg *arg); -#define DECLARE_NSS_PROTOTYPES(service) \ -extern enum nss_status _nss_ ##service ## _netname2user \ - (char netname[MAXNETNAMELEN + 1], uid_t *uidp, \ - gid_t *gidp, int *gidlenp, gid_t *gidlist, \ - int *errnop); - -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) - -#undef DECLARE_NSS_PROTOTYPES - libc_hidden_proto (key_encryptsession_pk) libc_hidden_proto (key_decryptsession_pk) diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h index 6afed56b71..31e0742096 100644 --- a/include/rpc/auth_des.h +++ b/include/rpc/auth_des.h @@ -17,19 +17,6 @@ extern enum auth_stat _svcauth_des (struct svc_req *rqst, struct rpc_msg *msg); -#define DECLARE_NSS_PROTOTYPES(service) \ -extern enum nss_status _nss_ ## service ## _getpublickey \ - (const char *netname, char *pkey, int *errnop); \ -extern enum nss_status _nss_ ## service ## _getsecretkey \ - (const char *netname, char *skey, char *passwd, \ - int *errnop); - -DECLARE_NSS_PROTOTYPES (files) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) - -#undef DECLARE_NSS_PROTOTYPES - libc_hidden_proto (authdes_getucred) libc_hidden_proto (xdr_authdes_cred) libc_hidden_proto (xdr_authdes_verf) diff --git a/include/rpc/netdb.h b/include/rpc/netdb.h index eb75f3f58c..dc0d0e26b9 100644 --- a/include/rpc/netdb.h +++ b/include/rpc/netdb.h @@ -45,8 +45,6 @@ extern enum nss_status _nss_ ## service ## _getrpcbynumber_r \ DECLARE_NSS_PROTOTYPES (files) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES diff --git a/include/rpcsvc/yp_prot.h b/include/rpcsvc/yp_prot.h deleted file mode 100644 index ab1ca10a28..0000000000 --- a/include/rpcsvc/yp_prot.h +++ /dev/null @@ -1 +0,0 @@ -#include <nis/rpcsvc/yp_prot.h> diff --git a/include/shadow.h b/include/shadow.h index 366ea83482..5168d8d4a3 100644 --- a/include/shadow.h +++ b/include/shadow.h @@ -44,8 +44,6 @@ extern enum nss_status _nss_ ## service ## _getspnam_r \ DECLARE_NSS_PROTOTYPES (compat) DECLARE_NSS_PROTOTYPES (files) DECLARE_NSS_PROTOTYPES (hesiod) -DECLARE_NSS_PROTOTYPES (nis) -DECLARE_NSS_PROTOTYPES (nisplus) #undef DECLARE_NSS_PROTOTYPES |