1 files changed, 18 insertions, 42 deletions

diff --git a/src/lib/libc/net/rcmd.c b/src/lib/libc/net/rcmd.c
index 96d6256760..bfe8c3ae56 100644
--- a/src/lib/libc/net/rcmd.c
+++ b/src/lib/libc/net/rcmd.c
@@ -29,7 +29,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char *rcsid = "$OpenBSD: rcmd.c,v 1.51 2005/03/08 18:34:42 deraadt Exp $";
+static char *rcsid = "$OpenBSD: rcmd.c,v 1.52 2005/03/25 13:24:12 otto Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/param.h>
@@ -59,22 +59,15 @@ static int __icheckhost(struct sockaddr *, socklen_t, const char *);
 static char *__gethostloop(struct sockaddr *, socklen_t);
 
 int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-        char **ahost;
-        in_port_t rport;
-        const char *locuser, *remuser, *cmd;
-        int *fd2p;
+rcmd(char **ahost, int rport, const char *locuser, const char *remuser,
+    const char *cmd, int *fd2p)
 {
         return rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
 }
 
 int
-rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
-        char **ahost;
-        in_port_t rport;
-        const char *locuser, *remuser, *cmd;
-        int *fd2p;
-        int af;
+rcmd_af(char **ahost, int porta, const char *locuser, const char *remuser,
+    const char *cmd, int *fd2p, int af)
 {
         static char hbuf[MAXHOSTNAMELEN];
         char pbuf[NI_MAXSERV];
@@ -87,6 +80,7 @@ rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
         int s, lport, timo;
         char c, *p;
         int refused;
+        in_port_t rport = porta;
 
         /* call rcmdsh() with specified remote shell if appropriate. */
         if (!issetugid() && (p = getenv("RSH")) && *p) {
@@ -322,9 +316,7 @@ int	__check_rhosts_file = 1;
 char    *__rcmd_errstr;
 
 int
-ruserok(rhost, superuser, ruser, luser)
-        const char *rhost, *ruser, *luser;
-        int superuser;
+ruserok(const char *rhost, int superuser, const char *ruser, const char *luser)
 {
         struct addrinfo hints, *res, *r;
         int error;
@@ -357,10 +349,7 @@ ruserok(rhost, superuser, ruser, luser)
  * Returns 0 if ok, -1 if not ok.
  */
 int
-iruserok(raddr, superuser, ruser, luser)
-        u_int32_t raddr;
-        int superuser;
-        const char *ruser, *luser;
+iruserok(u_int32_t raddr, int superuser, const char *ruser, const char *luser)
 {
         struct sockaddr_in sin;
 
@@ -373,14 +362,11 @@ iruserok(raddr, superuser, ruser, luser)
 }
 
 int
-iruserok_sa(raddr, rlen, superuser, ruser, luser)
-        const void *raddr;
-        int rlen;
-        int superuser;
-        const char *ruser, *luser;
+iruserok_sa(const void *raddr, int rlen, int superuser, const char *ruser,
+    const char *luser)
 {
         struct sockaddr *sa;
-        register char *cp;
+        char *cp;
         struct stat sbuf;
         struct passwd *pwd;
         FILE *hostf;
@@ -450,10 +436,8 @@ again:
  * Returns 0 if ok, -1 if not ok.
  */
 int
-__ivaliduser(hostf, raddrl, luser, ruser)
-        FILE *hostf;
-        in_addr_t raddrl;
-        const char *luser, *ruser;
+__ivaliduser(FILE *hostf, in_addr_t raddrl, const char *luser,
+    const char *ruser)
 {
         struct sockaddr_in sin;
 
@@ -466,13 +450,10 @@ __ivaliduser(hostf, raddrl, luser, ruser)
 }
 
 int
-__ivaliduser_sa(hostf, raddr, salen, luser, ruser)
-        FILE *hostf;
-        struct sockaddr *raddr;
-        socklen_t salen;
-        const char *luser, *ruser;
+__ivaliduser_sa(FILE *hostf, struct sockaddr *raddr, socklen_t salen,
+    const char *luser, const char *ruser)
 {
-        register char *user, *p;
+        char *user, *p;
         char *buf;
         const char *auser, *ahost;
         int hostok, userok;
@@ -613,10 +594,7 @@ bail:
  * semblance of an A->PTR->A loop, allow a simple #.#.#.# match to work.
  */
 static int
-__icheckhost(raddr, salen, lhost)
-        struct sockaddr *raddr;
-        socklen_t salen;
-        const char *lhost;
+__icheckhost(struct sockaddr *raddr, socklen_t salen, const char *lhost)
 {
         struct addrinfo hints, *res, *r;
         char h1[NI_MAXHOST], h2[NI_MAXHOST];
@@ -662,9 +640,7 @@ __icheckhost(raddr, salen, lhost)
  * be found, pack the result of inet_ntoa() into the string.
  */
 static char *
-__gethostloop(raddr, salen)
-        struct sockaddr *raddr;
-        socklen_t salen;
+__gethostloop(struct sockaddr *raddr, socklen_t salen)
 {
         static char remotehost[NI_MAXHOST];
         char h1[NI_MAXHOST], h2[NI_MAXHOST];