From 765696aac59b7146777e4dfda0d8d35df0bb29e1 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Sun, 4 Dec 2005 01:08:42 +0000
Subject: More hiding, 300 left

---
 libc/inet/rpc/auth_unix.c    |  1 +
 libc/inet/rpc/clnt_perror.c  |  9 +++++----
 libc/inet/rpc/clnt_tcp.c     |  1 +
 libc/inet/rpc/clnt_udp.c     |  2 ++
 libc/inet/rpc/clnt_unix.c    |  1 +
 libc/inet/rpc/getrpcport.c   |  2 ++
 libc/inet/rpc/pmap_getport.c |  9 +++------
 libc/inet/rpc/rcmd.c         |  1 +
 libc/inet/rpc/rexec.c        | 16 ++++++----------
 libc/inet/rpc/ruserpass.c    |  5 ++++-
 libc/inet/rpc/svc.c          | 14 ++++++++------
 libc/inet/rpc/svc_simple.c   |  3 +++
 libc/inet/rpc/svc_unix.c     |  1 +
 libc/inet/rpc/xdr.c          | 14 ++++++++------
 14 files changed, 46 insertions(+), 33 deletions(-)

(limited to 'libc/inet/rpc')

diff --git a/libc/inet/rpc/auth_unix.c b/libc/inet/rpc/auth_unix.c
index 0ae5fe6a9..9c16774fd 100644
--- a/libc/inet/rpc/auth_unix.c
+++ b/libc/inet/rpc/auth_unix.c
@@ -40,6 +40,7 @@
 
 #define sysconf __sysconf
 #define getegid __getegid
+#define geteuid __geteuid
 #define xdrmem_create __xdrmem_create
 
 #define __FORCE_GLIBC
diff --git a/libc/inet/rpc/clnt_perror.c b/libc/inet/rpc/clnt_perror.c
index 595ddde9a..6561e2631 100644
--- a/libc/inet/rpc/clnt_perror.c
+++ b/libc/inet/rpc/clnt_perror.c
@@ -302,8 +302,8 @@ clnt_perrno (enum clnt_stat num)
 }
 
 
-char *
-clnt_spcreateerror (const char *msg)
+char attribute_hidden *
+__clnt_spcreateerror (const char *msg)
 {
   char chrbuf[1024];
   char *str = _buf ();
@@ -345,16 +345,17 @@ clnt_spcreateerror (const char *msg)
   *++cp = '\0';
   return str;
 }
+strong_alias(__clnt_spcreateerror,clnt_spcreateerror)
 
 void
 clnt_pcreateerror (const char *msg)
 {
 #ifdef USE_IN_LIBIO
   if (_IO_fwide (stderr, 0) > 0)
-    (void) __fwprintf (stderr, L"%s", clnt_spcreateerror (msg));
+    (void) __fwprintf (stderr, L"%s", __clnt_spcreateerror (msg));
   else
 #endif
-    (void) fputs (clnt_spcreateerror (msg), stderr);
+    (void) fputs (__clnt_spcreateerror (msg), stderr);
 }
 
 struct auth_errtab
diff --git a/libc/inet/rpc/clnt_tcp.c b/libc/inet/rpc/clnt_tcp.c
index 11f790529..c04265d8f 100644
--- a/libc/inet/rpc/clnt_tcp.c
+++ b/libc/inet/rpc/clnt_tcp.c
@@ -53,6 +53,7 @@ static char sccsid[] = "@(#)clnt_tcp.c 1.37 87/10/05 Copyr 1984 Sun Micro";
 #define authnone_create __authnone_create
 #define xdrrec_create __xdrrec_create
 #define xdrmem_create __xdrmem_create
+#define pmap_getport __pmap_getport
 
 #define __FORCE_GLIBC
 #include <features.h>
diff --git a/libc/inet/rpc/clnt_udp.c b/libc/inet/rpc/clnt_udp.c
index 2b84f5b82..4aba505b2 100644
--- a/libc/inet/rpc/clnt_udp.c
+++ b/libc/inet/rpc/clnt_udp.c
@@ -43,6 +43,8 @@ static char sccsid[] = "@(#)clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 #define authnone_create __authnone_create
 #define xdrmem_create __xdrmem_create
 
+#define pmap_getport __pmap_getport
+
 #define __FORCE_GLIBC
 #include <features.h>
 
diff --git a/libc/inet/rpc/clnt_unix.c b/libc/inet/rpc/clnt_unix.c
index 7372e51b9..3af68d9c8 100644
--- a/libc/inet/rpc/clnt_unix.c
+++ b/libc/inet/rpc/clnt_unix.c
@@ -50,6 +50,7 @@
 #define xdrrec_create __xdrrec_create
 #define xdrmem_create __xdrmem_create
 #define getegid __getegid
+#define geteuid __geteuid
 
 #define __FORCE_GLIBC
 #include <features.h>
diff --git a/libc/inet/rpc/getrpcport.c b/libc/inet/rpc/getrpcport.c
index 5470fbff6..518d190f8 100644
--- a/libc/inet/rpc/getrpcport.c
+++ b/libc/inet/rpc/getrpcport.c
@@ -35,6 +35,8 @@ static  char sccsid[] = "@(#)getrpcport.c 1.3 87/08/11 SMI";
  * Copyright (c) 1985 by Sun Microsystems, Inc.
  */
 
+#define pmap_getport __pmap_getport
+
 #define __FORCE_GLIBC
 #include <features.h>
 
diff --git a/libc/inet/rpc/pmap_getport.c b/libc/inet/rpc/pmap_getport.c
index 45ed4eae8..79492747b 100644
--- a/libc/inet/rpc/pmap_getport.c
+++ b/libc/inet/rpc/pmap_getport.c
@@ -53,12 +53,8 @@ static const struct timeval tottimeout =
  * Calls the pmap service remotely to do the lookup.
  * Returns 0 if no map exists.
  */
-u_short
-pmap_getport (address, program, version, protocol)
-     struct sockaddr_in *address;
-     u_long program;
-     u_long version;
-     u_int protocol;
+u_short attribute_hidden
+__pmap_getport (struct sockaddr_in *address, u_long program, u_long version, u_int protocol)
 {
   u_short port = 0;
   int socket = -1;
@@ -92,3 +88,4 @@ pmap_getport (address, program, version, protocol)
   address->sin_port = 0;
   return port;
 }
+strong_alias(__pmap_getport,pmap_getport)
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c
index e050480ce..43fe44cc2 100644
--- a/libc/inet/rpc/rcmd.c
+++ b/libc/inet/rpc/rcmd.c
@@ -38,6 +38,7 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #define bcopy __bcopy
 #define sysconf __sysconf
 #define getline __getline
+#define geteuid __geteuid
 
 #define __FORCE_GLIBC
 #include <features.h>
diff --git a/libc/inet/rpc/rexec.c b/libc/inet/rpc/rexec.c
index 00e68ff6b..b93cf7644 100644
--- a/libc/inet/rpc/rexec.c
+++ b/libc/inet/rpc/rexec.c
@@ -47,15 +47,10 @@ extern int __libc_sa_len (sa_family_t __af) __THROW attribute_hidden;
 
 int	rexecoptions;
 char	ahostbuf[NI_MAXHOST];
-extern int ruserpass(const char *host, const char **aname, const char **apass);
+extern int __ruserpass(const char *host, const char **aname, const char **apass) attribute_hidden;
 
-int
-rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
-	char **ahost;
-	int rport;
-	const char *name, *pass, *cmd;
-	int *fd2p;
-	sa_family_t af;
+int attribute_hidden
+__rexec_af(char **ahost, int rport, const char *name, const char *pass, const char *cmd, int *fd2p, sa_family_t af)
 {
 	struct sockaddr_storage sa2, from;
 	struct addrinfo hints, *res0;
@@ -88,7 +83,7 @@ rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
 	else{
 		*ahost = NULL;
 	}
-	ruserpass(res0->ai_canonname, &name, &pass);
+	__ruserpass(res0->ai_canonname, &name, &pass);
 retry:
 	s = socket(res0->ai_family, res0->ai_socktype, 0);
 	if (s < 0) {
@@ -179,6 +174,7 @@ bad:
 	freeaddrinfo(res0);
 	return (-1);
 }
+strong_alias(__rexec_af,rexec_af)
 
 int
 rexec(ahost, rport, name, pass, cmd, fd2p)
@@ -187,5 +183,5 @@ rexec(ahost, rport, name, pass, cmd, fd2p)
 	const char *name, *pass, *cmd;
 	int *fd2p;
 {
-	return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
+	return __rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
 }
diff --git a/libc/inet/rpc/ruserpass.c b/libc/inet/rpc/ruserpass.c
index edb5170e9..b6fd482c5 100644
--- a/libc/inet/rpc/ruserpass.c
+++ b/libc/inet/rpc/ruserpass.c
@@ -29,7 +29,9 @@
 
 #define __fsetlocking __fsetlocking_internal
 #define getgid __getgid
+#define getuid __getuid
 #define getegid __getegid
+#define geteuid __geteuid
 
 #define __FORCE_GLIBC
 #include <features.h>
@@ -95,7 +97,7 @@ static const struct toktab {
 
 
 
-int ruserpass(const char *host, const char **aname, const char **apass)
+int attribute_hidden __ruserpass(const char *host, const char **aname, const char **apass)
 {
 	char *hdir, *buf, *tmp;
 	char myname[1024], *mydomain;
@@ -292,6 +294,7 @@ bad:
 	(void) fclose(cfile);
 	return (-1);
 }
+strong_alias(__ruserpass,ruserpass)
 
 static int
 token()
diff --git a/libc/inet/rpc/svc.c b/libc/inet/rpc/svc.c
index b14cbd803..faccab58e 100644
--- a/libc/inet/rpc/svc.c
+++ b/libc/inet/rpc/svc.c
@@ -230,8 +230,8 @@ svc_unregister (rpcprog_t prog, rpcvers_t vers)
 /* ******************* REPLY GENERATION ROUTINES  ************ */
 
 /* Send a reply to an rpc request */
-bool_t
-svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
+bool_t attribute_hidden
+__svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
 	       caddr_t xdr_location)
 {
   struct rpc_msg rply;
@@ -244,6 +244,7 @@ svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
   rply.acpted_rply.ar_results.proc = xdr_results;
   return SVC_REPLY (xprt, &rply);
 }
+strong_alias(__svc_sendreply,svc_sendreply)
 
 /* No procedure error reply */
 void
@@ -285,8 +286,8 @@ svcerr_systemerr (register SVCXPRT *xprt)
 }
 
 /* Authentication error reply */
-void
-svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
+void attribute_hidden
+__svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
 {
   struct rpc_msg rply;
 
@@ -296,12 +297,13 @@ svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
   rply.rjcted_rply.rj_why = why;
   SVC_REPLY (xprt, &rply);
 }
+strong_alias(__svcerr_auth,svcerr_auth)
 
 /* Auth too weak error reply */
 void
 svcerr_weakauth (SVCXPRT *xprt)
 {
-  svcerr_auth (xprt, AUTH_TOOWEAK);
+  __svcerr_auth (xprt, AUTH_TOOWEAK);
 }
 
 /* Program unavailable error reply */
@@ -446,7 +448,7 @@ svc_getreq_common (const int fd)
 	    }
 	  else if ((why = _authenticate (&r, &msg)) != AUTH_OK)
 	    {
-	      svcerr_auth (xprt, why);
+	      __svcerr_auth (xprt, why);
 	      goto call_done;
 	    }
 
diff --git a/libc/inet/rpc/svc_simple.c b/libc/inet/rpc/svc_simple.c
index da3c71211..e9a43b97a 100644
--- a/libc/inet/rpc/svc_simple.c
+++ b/libc/inet/rpc/svc_simple.c
@@ -37,6 +37,9 @@ static char sccsid[] = "@(#)svc_simple.c 1.18 87/08/11 Copyr 1984 Sun Micro";
  *
  * Copyright (C) 1984, Sun Microsystems, Inc.
  */
+
+#define svc_sendreply __svc_sendreply
+
 #define __FORCE_GLIBC
 #define _GNU_SOURCE
 #include <features.h>
diff --git a/libc/inet/rpc/svc_unix.c b/libc/inet/rpc/svc_unix.c
index 5d3025876..bc4cb2c20 100644
--- a/libc/inet/rpc/svc_unix.c
+++ b/libc/inet/rpc/svc_unix.c
@@ -40,6 +40,7 @@
 #define xdrrec_create __xdrrec_create
 #define xprt_register __xprt_register
 #define getegid __getegid
+#define geteuid __geteuid
 
 #define __FORCE_GLIBC
 #include <features.h>
diff --git a/libc/inet/rpc/xdr.c b/libc/inet/rpc/xdr.c
index 7d69022dc..46e214431 100644
--- a/libc/inet/rpc/xdr.c
+++ b/libc/inet/rpc/xdr.c
@@ -220,8 +220,8 @@ xdr_u_long (XDR *xdrs, u_long *ulp)
  * XDR hyper integers
  * same as xdr_u_hyper - open coded to save a proc call!
  */
-bool_t
-xdr_hyper (XDR *xdrs, quad_t *llp)
+bool_t attribute_hidden
+__xdr_hyper (XDR *xdrs, quad_t *llp)
 {
   long t1;
   unsigned long int t2;
@@ -247,14 +247,15 @@ xdr_hyper (XDR *xdrs, quad_t *llp)
 
   return FALSE;
 }
+strong_alias(__xdr_hyper,xdr_hyper)
 
 
 /*
  * XDR hyper integers
  * same as xdr_hyper - open coded to save a proc call!
  */
-bool_t
-xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
+bool_t attribute_hidden
+__xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
 {
   unsigned long t1;
   unsigned long t2;
@@ -280,17 +281,18 @@ xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
 
   return FALSE;
 }
+strong_alias(__xdr_u_hyper,xdr_u_hyper)
 
 bool_t
 xdr_longlong_t (XDR *xdrs, quad_t *llp)
 {
-  return xdr_hyper (xdrs, llp);
+  return __xdr_hyper (xdrs, llp);
 }
 
 bool_t
 xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
 {
-  return xdr_u_hyper (xdrs, ullp);
+  return __xdr_u_hyper (xdrs, ullp);
 }
 
 /*
-- 
cgit v1.2.3