From patchwork Mon Jul 6 19:03:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39925 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D72383857030; Mon, 6 Jul 2020 19:03:24 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D72383857030 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594062204; bh=XsjrB+YZDYiFEvgQVz0iKV+mtYh8myJlfF1zaIjXXZ8=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=fIlHIXOn6hUIE89b1MgfEDZ8r6glMBm6NU7XHrpGoG5JlEDeeAV8QOZLFlId0tI7Y 2np9Lahq2xljPXOjsWpF68mraHPXYrQC+fVfKtGvl1k55LuQNKhRU/czLukp3YoxLq 2tAZJmXE/54neRbTYkzWtHNCm7ivXN2MytlnM1Ik= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by sourceware.org (Postfix) with ESMTP id 2753A38618F6 for ; Mon, 6 Jul 2020 19:03:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2753A38618F6 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-MmAMJ0isMRul-u2cGkXGIw-1; Mon, 06 Jul 2020 15:03:20 -0400 X-MC-Unique: MmAMJ0isMRul-u2cGkXGIw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5C1EF800FED for ; Mon, 6 Jul 2020 19:03:19 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-118.ams2.redhat.com [10.36.112.118]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D69DF5F7D8 for ; Mon, 6 Jul 2020 19:03:18 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 2/4] sunrpc: Do not export key handling hooks by default In-Reply-To: References: Message-Id: Date: Mon, 06 Jul 2020 21:03:17 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" __key_encryptsession_pk_LOCAL, __key_decryptsession_pk_LOCAL, __key_gendes_LOCAL had a default version symbol even without --enable-obsolete-rpc. --- sunrpc/key_call.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index 9b8f9819c9..f13b0a7e4c 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -290,9 +290,20 @@ libc_hidden_nolink_sunrpc (key_get_conv, GLIBC_2_1) * implementations of these functions, and to call those in key_call(). */ -cryptkeyres *(*__key_encryptsession_pk_LOCAL) (uid_t, char *); -cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *); -des_block *(*__key_gendes_LOCAL) (uid_t, char *); +cryptkeyres *(*__key_encryptsession_pk_LOCAL) (uid_t, char *) + __attribute__ ((nocommon)); +cryptkeyres *(*__key_decryptsession_pk_LOCAL) (uid_t, char *) + __attribute__ ((nocommon)); +des_block *(*__key_gendes_LOCAL) (uid_t, char *) __attribute__ ((nocommon)); +#ifdef SHARED +# ifndef EXPORT_RPC_SYMBOLS +compat_symbol (libc, __key_encryptsession_pk_LOCAL, + __key_encryptsession_pk_LOCAL, GLIBC_2_1); +compat_symbol (libc, __key_decryptsession_pk_LOCAL, + __key_decryptsession_pk_LOCAL, GLIBC_2_1); +compat_symbol (libc, __key_gendes_LOCAL, __key_gendes_LOCAL, GLIBC_2_1); +# endif +#endif #ifndef SO_PASSCRED static int