OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix sunrpc static library 

* include/shlib-compat.h (libc_sunrpc_symbol): New macro.
	* sunrpc/svc_simple.c: Use it for registerrpc.
	* sunrpc/xcrypt.c: Use it for passwd2des.
This commit is contained in:
Andreas Jaeger 2012-05-21 21:34:05 +02:00
parent 662742187c
commit 07c58f8f35
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-05-21 Andreas Jaeger <aj@suse.de>
* include/shlib-compat.h (libc_sunrpc_symbol): New macro.
* sunrpc/svc_simple.c: Use it for registerrpc.
* sunrpc/xcrypt.c: Use it for passwd2des.
* malloc/malloc.c: Include shlib-compat.h for SHLIB_COMPAT.
2012-05-21 H.J. Lu <hongjiu.lu@intel.com>

10
include/shlib-compat.h
View File

@ -91,4 +91,14 @@
#endif
# ifdef LINK_OBSOLETE_RPC
/* Export the symbol for both static and dynamic linking. */
# define libc_sunrpc_symbol(name, aliasname, version) \
strong_alias (name, aliasname)
# else
/* Export the symbol only for shared-library compatibility. */
# define libc_sunrpc_symbol(name, aliasname, version) \
compat_symbol (libc, name, aliasname, version);
# endif
#endif /* shlib-compat.h */

5
sunrpc/svc_simple.c
View File

@ -43,6 +43,7 @@
#include <wchar.h>
#include <libio/iolibio.h>
#include <shlib-compat.h>
struct proglst_
{
@ -121,7 +122,9 @@ __registerrpc (u_long prognum, u_long versnum, u_long procnum,
free (buf);
return -1;
}
compat_symbol (libc, __registerrpc, registerrpc, GLIBC_2_0);
libc_sunrpc_symbol (__registerrpc, registerrpc, GLIBC_2_0)
static void
universal (struct svc_req *rqstp, SVCXPRT *transp_l)

3
sunrpc/xcrypt.c
View File

@ -47,6 +47,7 @@ static char sccsid[] = "@(#)xcrypt.c 1.3 89/03/24 Copyr 1986 Sun Micro";
#include <string.h>
#include <sys/types.h>
#include <rpc/des_crypt.h>
#include <shlib-compat.h>
static const char hex[16] =
{
@ -89,7 +90,7 @@ passwd2des_internal (char *pw, char *key)
#ifdef _LIBC
libc_hidden_def (passwd2des_internal)
compat_symbol (libc, passwd2des_internal, passwd2des, GLIBC_2_1);
libc_sunrpc_symbol(passwd2des_internal, passwd2des, GLIBC_2_1)
#else
void passwd2des (char *pw, char *key)
{