don't accept connections from ports below 512

[unix-history] / usr / src / libexec / rlogind / rlogind.c

diff --git a/usr/src/libexec/rlogind/rlogind.c b/usr/src/libexec/rlogind/rlogind.c
index 42dfc59..eec0cb3 100644 (file)
--- a/usr/src/libexec/rlogind/rlogind.c
+++ b/usr/src/libexec/rlogind/rlogind.c
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)rlogind.c  5.10 (Berkeley) %G%";
+static char sccsid[] = "@(#)rlogind.c  5.13 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -104,7 +104,8 @@ doit(f, fromp)
                hp->h_name = inet_ntoa(fromp->sin_addr);
        }
        if (fromp->sin_family != AF_INET ||
                hp->h_name = inet_ntoa(fromp->sin_addr);
        }
        if (fromp->sin_family != AF_INET ||

-           fromp->sin_port >= IPPORT_RESERVED)
+           fromp->sin_port >= IPPORT_RESERVED ||
+           fromp->sin_port < IPPORT_RESERVED/2)

                fatal(f, "Permission denied");
        write(f, "", 1);
        for (c = 'p'; c <= 's'; c++) {
                fatal(f, "Permission denied");
        write(f, "", 1);
        for (c = 'p'; c <= 's'; c++) {


@@ -160,6 +161,7 @@ gotpty:
        signal(SIGCHLD, cleanup);
        setpgrp(0, 0);
        protocol(f, p);
        signal(SIGCHLD, cleanup);
        setpgrp(0, 0);
        protocol(f, p);

+       signal(SIGCHLD, SIG_IGN);

        cleanup();
 }
 
        cleanup();
 }
 


@@ -176,18 +178,18 @@ control(pty, cp, n)
        char *cp;
        int n;
 {
        char *cp;
        int n;
 {

-       struct winsize *wp;
+       struct winsize w;

 
 

-       if (n < 4+sizeof (*wp) || cp[2] != 's' || cp[3] != 's')
+       if (n < 4+sizeof (w) || cp[2] != 's' || cp[3] != 's')

                return (0);
        oobdata[0] &= ~TIOCPKT_WINDOW;  /* we know he heard */
                return (0);
        oobdata[0] &= ~TIOCPKT_WINDOW;  /* we know he heard */

-       wp = (struct winsize *)(cp+4);
-       wp->ws_row = ntohs(wp->ws_row);
-       wp->ws_col = ntohs(wp->ws_col);
-       wp->ws_xpixel = ntohs(wp->ws_xpixel);
-       wp->ws_ypixel = ntohs(wp->ws_ypixel);
-       (void)ioctl(pty, TIOCSWINSZ, wp);
-       return (4+sizeof (*wp));
+       bcopy(cp+4, (char *)&w, sizeof(w));
+       w.ws_row = ntohs(w.ws_row);
+       w.ws_col = ntohs(w.ws_col);
+       w.ws_xpixel = ntohs(w.ws_xpixel);
+       w.ws_ypixel = ntohs(w.ws_ypixel);
+       (void)ioctl(pty, TIOCSWINSZ, &w);
+       return (4+sizeof (w));

 }
 
 /*
 }
 
 /*