add offsets, new fields

[unix-history] / usr / src / usr.bin / login / login.c.1

diff --git a/usr/src/usr.bin/login/login.c.1 b/usr/src/usr.bin/login/login.c.1
index 29e4687..f83de76 100644 (file)
--- a/usr/src/usr.bin/login/login.c.1
+++ b/usr/src/usr.bin/login/login.c.1
@@ -11,7 +11,7 @@ char copyright[] =
 #endif not lint
 
 #ifndef lint
 #endif not lint
 
 #ifndef lint

-static char sccsid[] = "@(#)login.c.1  5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)login.c.1  5.16 (Berkeley) %G%";

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


@@ -36,11 +36,16 @@ static char sccsid[] = "@(#)login.c.1       5.8 (Berkeley) %G%";
 #include <errno.h>
 #include <ttyent.h>
 #include <syslog.h>
 #include <errno.h>
 #include <ttyent.h>
 #include <syslog.h>

+#include <grp.h>
+
+#define TTYGRPNAME     "tty"           /* name of group to own ttys */
+#define TTYGID(gid)    tty_gid(gid)    /* gid that owns all ttys */

 
 #define        SCMPN(a, b)     strncmp(a, b, sizeof(a))
 #define        SCPYN(a, b)     strncpy(a, b, sizeof(a))
 
 #define NMAX   sizeof(utmp.ut_name)
 
 #define        SCMPN(a, b)     strncmp(a, b, sizeof(a))
 #define        SCPYN(a, b)     strncpy(a, b, sizeof(a))
 
 #define NMAX   sizeof(utmp.ut_name)

+#define HMAX   sizeof(utmp.ut_host)

 
 #define        FALSE   0
 #define        TRUE    -1
 
 #define        FALSE   0
 #define        TRUE    -1


@@ -86,6 +91,7 @@ int   usererr = -1;
 char   rusername[NMAX+1], lusername[NMAX+1];
 char   rpassword[NMAX+1];
 char   name[NMAX+1];
 char   rusername[NMAX+1], lusername[NMAX+1];
 char   rpassword[NMAX+1];
 char   name[NMAX+1];

+char   me[MAXHOSTNAMELEN];

 char   *rhost;
 
 main(argc, argv)
 char   *rhost;
 
 main(argc, argv)


@@ -98,6 +104,7 @@ main(argc, argv)
        char *ttyn, *tty;
        int ldisc = 0, zero = 0, i;
        char **envnew;
        char *ttyn, *tty;
        int ldisc = 0, zero = 0, i;
        char **envnew;

+       char *p, *domain, *index();

 
        signal(SIGALRM, timedout);
        alarm(timeout);
 
        signal(SIGALRM, timedout);
        alarm(timeout);


@@ -111,6 +118,8 @@ main(argc, argv)
         * -h is used by other servers to pass the name of the
         * remote host to login so that it may be placed in utmp and wtmp
         */
         * -h is used by other servers to pass the name of the
         * remote host to login so that it may be placed in utmp and wtmp
         */

+       (void) gethostname(me, sizeof(me));
+       domain = index(me, '.');

        while (argc > 1) {
                if (strcmp(argv[1], "-r") == 0) {
                        if (rflag || hflag) {
        while (argc > 1) {
                if (strcmp(argv[1], "-r") == 0) {
                        if (rflag || hflag) {


@@ -119,6 +128,8 @@ main(argc, argv)
                        }
                        rflag = 1;
                        usererr = doremotelogin(argv[2]);
                        }
                        rflag = 1;
                        usererr = doremotelogin(argv[2]);

+                       if ((p = index(argv[2], '.')) && strcmp(p, domain) == 0)
+                               *p = 0;

                        SCPYN(utmp.ut_host, argv[2]);
                        argc -= 2;
                        argv += 2;
                        SCPYN(utmp.ut_host, argv[2]);
                        argc -= 2;
                        argv += 2;


@@ -130,6 +141,8 @@ main(argc, argv)
                                exit(1);
                        }
                        hflag = 1;
                                exit(1);
                        }
                        hflag = 1;

+                       if ((p = index(argv[2], '.')) && strcmp(p, domain) == 0)
+                               *p = 0;

                        SCPYN(utmp.ut_host, argv[2]);
                        argc -= 2;
                        argv += 2;
                        SCPYN(utmp.ut_host, argv[2]);
                        argc -= 2;
                        argv += 2;


@@ -155,13 +168,15 @@ main(argc, argv)
         */
        if (rflag)
                doremoteterm(term, &ttyb);
         */
        if (rflag)
                doremoteterm(term, &ttyb);

+       ttyb.sg_erase = CERASE;
+       ttyb.sg_kill = CKILL;

        ioctl(0, TIOCSLTC, &ltc);
        ioctl(0, TIOCSETC, &tc);
        ioctl(0, TIOCSETP, &ttyb);
        for (t = getdtablesize(); t > 2; t--)
                close(t);
        ttyn = ttyname(0);
        ioctl(0, TIOCSLTC, &ltc);
        ioctl(0, TIOCSETC, &tc);
        ioctl(0, TIOCSETP, &ttyb);
        for (t = getdtablesize(); t > 2; t--)
                close(t);
        ttyn = ttyname(0);

-       if (ttyn == (char *)0)
+       if (ttyn == (char *)0 || *ttyn == '\0')

                ttyn = "/dev/tty??";
        tty = rindex(ttyn, '/');
        if (tty == NULL)
                ttyn = "/dev/tty??";
        tty = rindex(ttyn, '/');
        if (tty == NULL)


@@ -170,10 +185,10 @@ main(argc, argv)
                tty++;
        openlog("login", LOG_ODELAY, LOG_AUTH);
        t = 0;
                tty++;
        openlog("login", LOG_ODELAY, LOG_AUTH);
        t = 0;

+       invalid = FALSE;

        do {
                ldisc = 0;
                ioctl(0, TIOCSETD, &ldisc);
        do {
                ldisc = 0;
                ioctl(0, TIOCSETD, &ldisc);

-               invalid = FALSE;

                SCPYN(utmp.ut_name, "");
                /*
                 * Name specified, take it.
                SCPYN(utmp.ut_name, "");
                /*
                 * Name specified, take it.


@@ -186,10 +201,11 @@ main(argc, argv)
                 * If remote login take given name,
                 * otherwise prompt user for something.
                 */
                 * If remote login take given name,
                 * otherwise prompt user for something.
                 */

-               if (rflag)
+               if (rflag && !invalid)

                        SCPYN(utmp.ut_name, lusername);
                else
                        getloginname(&utmp);
                        SCPYN(utmp.ut_name, lusername);
                else
                        getloginname(&utmp);

+               invalid = FALSE;

                if (!strcmp(pwd->pw_shell, "/bin/csh")) {
                        ldisc = NTTYDISC;
                        ioctl(0, TIOCSETD, &ldisc);
                if (!strcmp(pwd->pw_shell, "/bin/csh")) {
                        ldisc = NTTYDISC;
                        ioctl(0, TIOCSETD, &ldisc);


@@ -224,15 +240,27 @@ main(argc, argv)
                 * see if root logins on this terminal are permitted.
                 */
                if (!invalid && pwd->pw_uid == 0 && !rootterm(tty)) {
                 * see if root logins on this terminal are permitted.
                 */
                if (!invalid && pwd->pw_uid == 0 && !rootterm(tty)) {

-                       syslog(LOG_CRIT, "ROOT LOGIN REFUSED %s", tty);
+                       if (utmp.ut_host[0])
+                               syslog(LOG_CRIT,
+                                   "ROOT LOGIN REFUSED ON %s FROM %.*s",
+                                   tty, HMAX, utmp.ut_host);
+                       else
+                               syslog(LOG_CRIT,
+                                   "ROOT LOGIN REFUSED ON %s", tty);

                        invalid = TRUE;
                }
                if (invalid) {
                        printf("Login incorrect\n");
                        if (++t >= 5) {
                        invalid = TRUE;
                }
                if (invalid) {
                        printf("Login incorrect\n");
                        if (++t >= 5) {

-                               syslog(LOG_CRIT,
-                                   "REPEATED LOGIN FAILURES %s, %s",
-                                       tty, utmp.ut_name);
+                               if (utmp.ut_host[0])
+                                       syslog(LOG_CRIT,
+                                           "REPEATED LOGIN FAILURES ON %s FROM %.*s, %.*s",
+                                           tty, HMAX, utmp.ut_host,
+                                           NMAX, utmp.ut_name);
+                               else
+                                       syslog(LOG_CRIT,
+                                           "REPEATED LOGIN FAILURES ON %s, %.*s",
+                                               tty, NMAX, utmp.ut_name);

                                ioctl(0, TIOCHPCL, (struct sgttyb *) 0);
                                close(0), close(1), close(2);
                                sleep(10);
                                ioctl(0, TIOCHPCL, (struct sgttyb *) 0);
                                close(0), close(1), close(2);
                                sleep(10);


@@ -308,10 +336,10 @@ main(argc, argv)
                write(f, (char *) &ll, sizeof ll);
                close(f);
        }
                write(f, (char *) &ll, sizeof ll);
                close(f);
        }

-       chown(ttyn, pwd->pw_uid, pwd->pw_gid);
+       chown(ttyn, pwd->pw_uid, TTYGID(pwd->pw_gid));

        if (!hflag && !rflag)                                   /* XXX */
                ioctl(0, TIOCSWINSZ, &win);
        if (!hflag && !rflag)                                   /* XXX */
                ioctl(0, TIOCSWINSZ, &win);

-       chmod(ttyn, 0622);
+       chmod(ttyn, 0620);

        setgid(pwd->pw_gid);
        strncpy(name, utmp.ut_name, NMAX);
        name[NMAX] = '\0';
        setgid(pwd->pw_gid);
        strncpy(name, utmp.ut_name, NMAX);
        name[NMAX] = '\0';


@@ -348,7 +376,11 @@ main(argc, argv)
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
        if (pwd->pw_uid == 0)
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
        if (pwd->pw_uid == 0)

-               syslog(LOG_NOTICE, "ROOT LOGIN %s", tty);
+               if (utmp.ut_host[0])
+                       syslog(LOG_NOTICE, "ROOT LOGIN %s FROM %.*s",
+                           tty, HMAX, utmp.ut_host);
+               else
+                       syslog(LOG_NOTICE, "ROOT LOGIN %s", tty);

        if (!quietlog) {
                struct stat st;
 
        if (!quietlog) {
                struct stat st;
 


@@ -506,44 +538,10 @@ doremoteterm(term, tp)
                                tp->sg_ispeed = tp->sg_ospeed = cpp-speeds;
                                break;
                        }
                                tp->sg_ispeed = tp->sg_ospeed = cpp-speeds;
                                break;
                        }

-               compatsiz(cp);

        }
        tp->sg_flags = ECHO|CRMOD|ANYP|XTABS;
 }
 
        }
        tp->sg_flags = ECHO|CRMOD|ANYP|XTABS;
 }
 

-/* BEGIN TRASH
- *
- * This is here only long enough to get us by to the revised rlogin
- */
-compatsiz(cp)
-       char *cp;
-{
-       struct winsize ws;
-
-       ws.ws_row = ws.ws_col = -1;
-       ws.ws_xpixel = ws.ws_ypixel = -1;
-       if (cp) {
-               ws.ws_row = atoi(cp);
-               cp = index(cp, ',');
-               if (cp == 0)
-                       goto done;
-               ws.ws_col = atoi(++cp);
-               cp = index(cp, ',');
-               if (cp == 0)
-                       goto done;
-               ws.ws_xpixel = atoi(++cp);
-               cp = index(cp, ',');
-               if (cp == 0)
-                       goto done;
-               ws.ws_ypixel = atoi(++cp);
-       }
-done:
-       if (ws.ws_row != -1 && ws.ws_col != -1 &&
-           ws.ws_xpixel != -1 && ws.ws_ypixel != -1)
-               ioctl(0, TIOCSWINSZ, &ws);
-}
-/* END TRASH */
-

 /*
  * Set the value of var to be arg in the Unix 4.2 BSD environment env.
  * Var should end with '='.
 /*
  * Set the value of var to be arg in the Unix 4.2 BSD environment env.
  * Var should end with '='.


@@ -580,3 +578,18 @@ setenv(var, value, clobber)
        strcat(environ[index], value);
        environ[++index] = NULL;
 }
        strcat(environ[index], value);
        environ[++index] = NULL;
 }

+
+tty_gid(default_gid)
+       int default_gid;
+{
+       struct group *getgrnam(), *gr;
+       int gid = default_gid;
+
+       gr = getgrnam(TTYGRPNAME);
+       if (gr != (struct group *) 0)
+               gid = gr->gr_gid;
+
+       endgrent();
+
+       return (gid);
+}