From ec2868627f550cb9edbfb05ce3680ecbb23d715b Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 9 May 2012 15:51:23 +0200 Subject: Make sunrpc code usable again This in effect reverts the obsoletion of the sunrpc code. 2012-05-09 Andreas Schwab Andreas Jaeger * configure.in (obsolete-rpc): Add new option --enable-obsolete-rpc. * config.h.in (LINK_OBSOLETE_RPC): Add. * config.make.in (link-obsolete-rpc): Add. * include/libc-symbols.h (libc_hidden_nolink_sunrpc): Rename from libc_hidden_nolink and define based on LINK_OBSOLETE_RPC. * sunrpc/Makefile (headers)[link-obsolete-rpc]: Add rpc headers. (shared-only-routines): Do not use with link-obsolete-rpc. * nis/Makefile (headers)[link-obsolete-rpc]: Add rpc headers. * sunrpc/auth_des.c: Use libc_hidden_nolink_sunrpc. * sunrpc/auth_none.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/authdes_prot.c: Likewise. * sunrpc/authuxprot.c: Likewise. * sunrpc/clnt_gen.c: Likewise. * sunrpc/clnt_perr.c: Likewise. * sunrpc/clnt_raw.c: Likewise. * sunrpc/clnt_simp.c: Likewise. * sunrpc/clnt_tcp.c: Likewise. * sunrpc/clnt_udp.c: Likewise. * sunrpc/clnt_unix.c: Likewise. * sunrpc/des_crypt.c: Likewise. * sunrpc/des_soft.c: Likewise. * sunrpc/get_myaddr.c: Likewise. * sunrpc/key_call.c: Likewise. * sunrpc/key_prot.c: Likewise. * sunrpc/netname.c: Likewise. * sunrpc/pm_getmaps.c: Likewise. * sunrpc/pm_getport.c: Likewise. * sunrpc/pmap_clnt.c: Likewise. * sunrpc/pmap_prot.c: Likewise. * sunrpc/pmap_prot2.c: Likewise. * sunrpc/pmap_rmt.c: Likewise. * sunrpc/publickey.c: Likewise. * sunrpc/rpc_cmsg.c: Likewise. * sunrpc/rpc_common.c: Likewise. * sunrpc/rpc_dtable.c: Likewise. * sunrpc/rpc_prot.c: Likewise. * sunrpc/rpc_thread.c: Likewise. * sunrpc/rtime.c: Likewise. * sunrpc/svc.c: Likewise. * sunrpc/svc_auth.c: Likewise. * sunrpc/svc_raw.c: Likewise. * sunrpc/svc_run.c: Likewise. * sunrpc/svc_tcp.c: Likewise. * sunrpc/svc_udp.c: Likewise. * sunrpc/svc_unix.c: Likewise. * sunrpc/svcauth_des.c: Likewise. * sunrpc/xcrypt.c: Likewise. * sunrpc/xdr.c: Likewise. * sunrpc/xdr_array.c: Likewise. * sunrpc/xdr_float.c: Likewise. * sunrpc/xdr_intXX_t.c: Likewise. * sunrpc/xdr_mem.c: Likewise. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_ref.c: Likewise. * sunrpc/xdr_sizeof.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. --- sunrpc/key_call.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sunrpc/key_call.c') diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c index 6d08bf8e80..e0a076b47f 100644 --- a/sunrpc/key_call.c +++ b/sunrpc/key_call.c @@ -80,7 +80,7 @@ key_setsecret (char *secretkey) } return 0; } -libc_hidden_nolink (key_setsecret, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_setsecret, GLIBC_2_1) /* key_secretkey_is_set() returns 1 if the keyserver has a secret key * stored for the caller's effective uid; it returns 0 otherwise @@ -109,7 +109,7 @@ key_secretkey_is_set (void) #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (key_secretkey_is_set) #else -libc_hidden_nolink (key_secretkey_is_set, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_secretkey_is_set, GLIBC_2_1) #endif int @@ -133,7 +133,7 @@ key_encryptsession (char *remotename, des_block *deskey) *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_encryptsession, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_encryptsession, GLIBC_2_1) int key_decryptsession (char *remotename, des_block *deskey) @@ -155,7 +155,7 @@ key_decryptsession (char *remotename, des_block *deskey) *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_decryptsession, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_decryptsession, GLIBC_2_1) int key_encryptsession_pk (char *remotename, netobj *remotekey, @@ -180,7 +180,7 @@ key_encryptsession_pk (char *remotename, netobj *remotekey, *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_encryptsession_pk, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_encryptsession_pk, GLIBC_2_1) int key_decryptsession_pk (char *remotename, netobj *remotekey, @@ -205,7 +205,7 @@ key_decryptsession_pk (char *remotename, netobj *remotekey, *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_decryptsession_pk, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_decryptsession_pk, GLIBC_2_1) int key_gendes (des_block *key) @@ -239,7 +239,7 @@ key_gendes (des_block *key) #ifdef EXPORT_RPC_SYMBOLS libc_hidden_def (key_gendes) #else -libc_hidden_nolink (key_gendes, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_gendes, GLIBC_2_1) #endif int @@ -259,7 +259,7 @@ key_setnet (struct key_netstarg *arg) } return 1; } -libc_hidden_nolink (key_setnet, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_setnet, GLIBC_2_1) int key_get_conv (char *pkey, des_block *deskey) @@ -278,7 +278,7 @@ key_get_conv (char *pkey, des_block *deskey) *deskey = res.cryptkeyres_u.deskey; return 0; } -libc_hidden_nolink (key_get_conv, GLIBC_2_1) +libc_hidden_nolink_sunrpc (key_get_conv, GLIBC_2_1) /* * Hack to allow the keyserver to use AUTH_DES (for authenticated -- cgit v1.2.1