From patchwork Thu Jan 11 15:04:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 859168 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-89085-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="bkPMAkCg"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHTgw1CzTz9s8J for ; Fri, 12 Jan 2018 02:04:59 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; q=dns; s=default; b= ewWX9nJJhJLLxi/QSX/1SNyzL3n2cm8hRjonY+pI8jjOvYFmGbw+MDC/IKwKYJni izbEiLtZ7HfDRoaX//JphhALKOexIkQ587zu43x9oAe0a7KprsNbAz+sdcNIjl+A jZ2kf9THwUSOdwG9aZZDVgXHe2MxIjB7jaHYgKQgPZE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:to:subject:mime-version:content-type :content-transfer-encoding:message-id:from; s=default; bh=qRQA/I VYYscdV0TI/36yePX4UIE=; b=bkPMAkCgve8iECIK7o/QAYdVwiKkEmRWDb5d0J BdjIfyOc41a4AJJZxIpCpipi3O4FVGY9xi8O84diQbH7DJsxx9MUfOzBuuk9WrUd xUCH4r1ok5fvxb+eYZKevKQU6COf6zjnaTswecTx1IN61oQ9ibmY81Fdeix5r4hW B2CyA= Received: (qmail 126110 invoked by alias); 11 Jan 2018 15:04:54 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 126097 invoked by uid 89); 11 Jan 2018 15:04:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=databases, rights, xxx X-HELO: mx1.redhat.com Date: Thu, 11 Jan 2018 16:04:50 +0100 To: libc-alpha@sourceware.org Subject: [PATCH] libnsl: Turn remaining symbols into compat symbols [BZ #22701] User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Message-Id: <20180111150450.56D6B40231FB5@oldenburg.str.redhat.com> From: fweimer@redhat.com (Florian Weimer) 2018-01-11 Florian Weimer [BZ #22701] * include/rpcsvc/nislib.h (__nis_default_ttl): Add libnsl_hidden_proto. * include/rpcsvc/yp.h (yp_xdrall): Declare with libnsl_hidden_proto. * include/rpcsvc/ypclnt.h (yp_maplist): Likewise. * nis/Makefile (libnsl-routines): Add nss-default only for build-obsolete-nsl. * nis/nis_defaults.c (__nis_default_ttl): Add libnsl_hidden_nolink_def. * nis/rpcsvc/ypclnt.h (yp_maplist): Remove #ifdef'ed-out declaration. * nis/yp_xdr.c (xdr_ypall): Add libnsl_hidden_nolink_def. * nis/ypclnt.c (yp_maplist): Likewise. diff --git a/include/rpcsvc/nislib.h b/include/rpcsvc/nislib.h index 91dab1d171..ad4d499911 100644 --- a/include/rpcsvc/nislib.h +++ b/include/rpcsvc/nislib.h @@ -42,6 +42,7 @@ libnsl_hidden_proto (nis_remove) libnsl_hidden_proto (nis_add) libnsl_hidden_proto (__nis_default_owner) libnsl_hidden_proto (__nis_default_group) +libnsl_hidden_proto (__nis_default_ttl) libnsl_hidden_proto (__nis_default_access) libnsl_hidden_proto (nis_clone_object) libnsl_hidden_proto (nis_clone_result) diff --git a/include/rpcsvc/yp.h b/include/rpcsvc/yp.h index 9078854d40..87cd3827a7 100644 --- a/include/rpcsvc/yp.h +++ b/include/rpcsvc/yp.h @@ -3,6 +3,9 @@ # ifndef _ISOMAC +struct ypall_callback; +bool_t xdr_ypall (XDR *, struct ypall_callback *); + libnsl_hidden_proto (xdr_ypstat) libnsl_hidden_proto (xdr_ypxfrstat) libnsl_hidden_proto (xdr_domainname) @@ -28,6 +31,7 @@ libnsl_hidden_proto (xdr_ypreq_xfr) libnsl_hidden_proto (xdr_ypresp_xfr) libnsl_hidden_proto (xdr_yppushresp_xfr) libnsl_hidden_proto (xdr_ypbind_setdom) +libnsl_hidden_proto (xdr_ypall) # endif /* !_ISOMAC */ #endif diff --git a/include/rpcsvc/ypclnt.h b/include/rpcsvc/ypclnt.h index df2a03d9c5..c6a724814c 100644 --- a/include/rpcsvc/ypclnt.h +++ b/include/rpcsvc/ypclnt.h @@ -3,6 +3,9 @@ # ifndef _ISOMAC +struct ypmaplist; +int yp_maplist (const char *, struct ypmaplist **) __THROW; + libnsl_hidden_proto (ypbinderr_string) libnsl_hidden_proto (yp_bind) libnsl_hidden_proto (yp_get_default_domain) @@ -17,6 +20,7 @@ libnsl_hidden_proto (yp_next) libnsl_hidden_proto (yp_match) libnsl_hidden_proto (yp_all) libnsl_hidden_proto (__yp_check) +libnsl_hidden_proto (yp_maplist) # endif /* !_ISOMAC */ #endif diff --git a/nis/Makefile b/nis/Makefile index fae30d5da1..b828c5ec4d 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)