add new opcodes

[unix-history] / usr / src / lib / libc / net / rcmd.c

diff --git a/usr/src/lib/libc/net/rcmd.c b/usr/src/lib/libc/net/rcmd.c
index 2491a51..81a1b47 100644 (file)
--- a/usr/src/lib/libc/net/rcmd.c
+++ b/usr/src/lib/libc/net/rcmd.c
@@ -4,14 +4,16 @@
  * specifies the terms and conditions for redistribution.
  */
 
  * specifies the terms and conditions for redistribution.
  */
 

-#ifndef lint
-static char sccsid[] = "@(#)rcmd.c     5.8 (Berkeley) %G%";
-#endif not lint
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)rcmd.c     5.11 (Berkeley) %G%";
+#endif LIBC_SCCS and not lint

 
 #include <stdio.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <sys/param.h>
 
 #include <stdio.h>
 #include <ctype.h>
 #include <pwd.h>
 #include <sys/param.h>

+#include <sys/file.h>
+#include <sys/signal.h>

 #include <sys/socket.h>
 #include <sys/stat.h>
 
 #include <sys/socket.h>
 #include <sys/stat.h>
 


@@ -25,46 +27,66 @@ char        *index(), *sprintf();
 
 rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
        char **ahost;
 
 rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
        char **ahost;

-       int rport;
+       u_short rport;

        char *locuser, *remuser, *cmd;
        int *fd2p;
 {
        char *locuser, *remuser, *cmd;
        int *fd2p;
 {

-       int s, timo = 1;
+       int s, timo = 1, pid, oldmask;

        struct sockaddr_in sin, sin2, from;
        char c;
        int lport = IPPORT_RESERVED - 1;
        struct hostent *hp;
 
        struct sockaddr_in sin, sin2, from;
        char c;
        int lport = IPPORT_RESERVED - 1;
        struct hostent *hp;
 

+       pid = getpid();

        hp = gethostbyname(*ahost);
        if (hp == 0) {
                fprintf(stderr, "%s: unknown host\n", *ahost);
                return (-1);
        }
        *ahost = hp->h_name;
        hp = gethostbyname(*ahost);
        if (hp == 0) {
                fprintf(stderr, "%s: unknown host\n", *ahost);
                return (-1);
        }
        *ahost = hp->h_name;

-retry:
-       s = rresvport(&lport);
-       if (s < 0) {
-               if (errno == EAGAIN)
-                       fprintf(stderr, "socket: All ports in use\n");
-               else
-                       perror("rcmd: socket");
-               return (-1);
-       }
-       sin.sin_family = hp->h_addrtype;
-       bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
-       sin.sin_port = rport;
-       if (connect(s, (caddr_t)&sin, sizeof (sin), 0) < 0) {
+       oldmask = sigblock(sigmask(SIGURG));
+       for (;;) {
+               s = rresvport(&lport);
+               if (s < 0) {
+                       if (errno == EAGAIN)
+                               fprintf(stderr, "socket: All ports in use\n");
+                       else
+                               perror("rcmd: socket");
+                       sigsetmask(oldmask);
+                       return (-1);
+               }
+               fcntl(s, F_SETOWN, pid);
+               sin.sin_family = hp->h_addrtype;
+               bcopy(hp->h_addr_list[0], (caddr_t)&sin.sin_addr, hp->h_length);
+               sin.sin_port = rport;
+               if (connect(s, (caddr_t)&sin, sizeof (sin), 0) >= 0)
+                       break;

                (void) close(s);
                if (errno == EADDRINUSE) {
                        lport--;
                (void) close(s);
                if (errno == EADDRINUSE) {
                        lport--;

-                       goto retry;
+                       continue;

                }
                if (errno == ECONNREFUSED && timo <= 16) {
                        sleep(timo);
                        timo *= 2;
                }
                if (errno == ECONNREFUSED && timo <= 16) {
                        sleep(timo);
                        timo *= 2;

-                       goto retry;
+                       continue;
+               }
+               if (hp->h_addr_list[1] != NULL) {
+                       int oerrno = errno;
+
+                       fprintf(stderr,
+                           "connect to address %s: ", inet_ntoa(sin.sin_addr));
+                       errno = oerrno;
+                       perror(0);
+                       hp->h_addr_list++;
+                       bcopy(hp->h_addr_list[0], (caddr_t)&sin.sin_addr,
+                           hp->h_length);
+                       fprintf(stderr, "Trying %s...\n",
+                               inet_ntoa(sin.sin_addr));
+                       continue;

                }
                perror(hp->h_name);
                }
                perror(hp->h_name);

+               sigsetmask(oldmask);

                return (-1);
        }
        lport--;
                return (-1);
        }
        lport--;


@@ -116,12 +138,14 @@ retry:
                }
                goto bad2;
        }
                }
                goto bad2;
        }

+       sigsetmask(oldmask);

        return (s);
 bad2:
        if (lport)
                (void) close(*fd2p);
 bad:
        (void) close(s);
        return (s);
 bad2:
        if (lport)
                (void) close(*fd2p);
 bad:
        (void) close(s);

+       sigsetmask(oldmask);

        return (-1);
 }
 
        return (-1);
 }
 


@@ -160,7 +184,6 @@ ruserok(rhost, superuser, ruser, luser)
 {
        FILE *hostf;
        char fhost[MAXHOSTNAMELEN];
 {
        FILE *hostf;
        char fhost[MAXHOSTNAMELEN];

-       char ahost[MAXHOSTNAMELEN];

        int first = 1;
        register char *sp, *p;
        int baselen = -1;
        int first = 1;
        register char *sp, *p;
        int baselen = -1;


@@ -180,27 +203,9 @@ ruserok(rhost, superuser, ruser, luser)
        hostf = superuser ? (FILE *)0 : fopen("/etc/hosts.equiv", "r");
 again:
        if (hostf) {
        hostf = superuser ? (FILE *)0 : fopen("/etc/hosts.equiv", "r");
 again:
        if (hostf) {

-               while (fgets(ahost, sizeof (ahost), hostf)) {
-                       char *user;
-
-                       p = ahost;
-                       while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0')
-                               *p++ = isupper(*p) ? tolower(*p) : *p;
-                       if (*p == ' ' || *p == '\t') {
-                               *p++ = '\0';
-                               while (*p == ' ' || *p == '\t')
-                                       p++;
-                               user = p;
-                               while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0')
-                                       p++;
-                       } else
-                               user = p;
-                       *p = '\0';
-                       if (_checkhost(fhost, ahost, baselen) &&
-                           !strcmp(ruser, *user ? user : luser)) {
-                               (void) fclose(hostf);
-                               return (0);
-                       }
+               if (!_validuser(hostf, fhost, luser, ruser, baselen)) {
+                       (void) fclose(hostf);
+                       return(0);

                }
                (void) fclose(hostf);
        }
                }
                (void) fclose(hostf);
        }


@@ -226,6 +231,39 @@ again:
        return (-1);
 }
 
        return (-1);
 }
 

+_validuser(hostf, rhost, luser, ruser, baselen)
+char *rhost, *luser, *ruser;
+FILE *hostf;
+int baselen;
+{
+       char *user;
+       char ahost[MAXHOSTNAMELEN];
+       register char *p;
+
+       while (fgets(ahost, sizeof (ahost), hostf)) {
+               p = ahost;
+               while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0') {
+                       *p = isupper(*p) ? tolower(*p) : *p;
+                       p++;
+               }
+               if (*p == ' ' || *p == '\t') {
+                       *p++ = '\0';
+                       while (*p == ' ' || *p == '\t')
+                               p++;
+                       user = p;
+                       while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0')
+                               p++;
+               } else
+                       user = p;
+               *p = '\0';
+               if (_checkhost(rhost, ahost, baselen) &&
+                   !strcmp(ruser, *user ? user : luser)) {
+                       return (0);
+               }
+       }
+       return (-1);
+}
+

 _checkhost(rhost, lhost, len)
 char *rhost, *lhost;
 int len;
 _checkhost(rhost, lhost, len)
 char *rhost, *lhost;
 int len;


@@ -251,8 +289,10 @@ int len;
                if ((domainp = index(ldomain, '.') + 1) == (char *)1)
                        return(0);
                cp = domainp;
                if ((domainp = index(ldomain, '.') + 1) == (char *)1)
                        return(0);
                cp = domainp;

-               while (*cp)
-                       *cp++ = isupper(*cp) ? tolower(*cp) : *cp;
+               while (*cp) {
+                       *cp = isupper(*cp) ? tolower(*cp) : *cp;
+                       cp++;
+               }

        }
        if (domainp == (char *)1)
                return(0);
        }
        if (domainp == (char *)1)
                return(0);