add offsets, new fields

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

diff --git a/usr/src/usr.bin/login/login.c b/usr/src/usr.bin/login/login.c
index eb39ce0..8df6e18 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -1,6 +1,18 @@
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif not lint
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)login.c     4.36 (Berkeley) 85/04/01";
-#endif
+static char sccsid[] = "@(#)login.c    5.16 (Berkeley) %G%";
+#endif not lint

 
 /*
  * login [ name ]
 
 /*
  * login [ name ]


@@ -24,11 +36,16 @@ static      char *sccsid = "@(#)login.c     4.36 (Berkeley) 85/04/01";
 #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


@@ -70,9 +87,11 @@ struct       ltchars ltc = {
 struct winsize win = { 0, 0, 0, 0 };
 
 int    rflag;
 struct winsize win = { 0, 0, 0, 0 };
 
 int    rflag;

+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)


@@ -85,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);


@@ -98,22 +118,43 @@ 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
         */

-       if (argc > 1) {
+       (void) gethostname(me, sizeof(me));
+       domain = index(me, '.');
+       while (argc > 1) {

                if (strcmp(argv[1], "-r") == 0) {
                if (strcmp(argv[1], "-r") == 0) {

-                       rflag = doremotelogin(argv[2]);
+                       if (rflag || hflag) {
+                               printf("Only one of -r and -h allowed\n");
+                               exit(1);
+                       }
+                       rflag = 1;
+                       usererr = doremotelogin(argv[2]);
+                       if ((p = index(argv[2], '.')) && strcmp(p, domain) == 0)
+                               *p = 0;

                        SCPYN(utmp.ut_host, argv[2]);
                        SCPYN(utmp.ut_host, argv[2]);

-                       argc = 0;
+                       argc -= 2;
+                       argv += 2;
+                       continue;

                }
                if (strcmp(argv[1], "-h") == 0 && getuid() == 0) {
                }
                if (strcmp(argv[1], "-h") == 0 && getuid() == 0) {

+                       if (rflag || hflag) {
+                               printf("Only one of -r and -h allowed\n");
+                               exit(1);
+                       }

                        hflag = 1;
                        hflag = 1;

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

                        SCPYN(utmp.ut_host, argv[2]);
                        SCPYN(utmp.ut_host, argv[2]);

-                       argc = 0;
+                       argc -= 2;
+                       argv += 2;
+                       continue;

                }
                if (strcmp(argv[1], "-p") == 0) {
                        argc--;
                        argv++;
                        pflag = 1;
                }
                if (strcmp(argv[1], "-p") == 0) {
                        argc--;
                        argv++;
                        pflag = 1;

+                       continue;

                }
                }

+               break;

        }
        ioctl(0, TIOCLSET, &zero);
        ioctl(0, TIOCNXCL, 0);
        }
        ioctl(0, TIOCLSET, &zero);
        ioctl(0, TIOCNXCL, 0);


@@ -127,25 +168,27 @@ 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);
        ioctl(0, TIOCSLTC, &ltc);
        ioctl(0, TIOCSETC, &tc);
        ioctl(0, TIOCSETP, &ttyb);

-       for (t = getdtablesize(); t > 3; t--)
+       for (t = getdtablesize(); t > 2; t--)

                close(t);
        ttyn = ttyname(0);
                close(t);
        ttyn = ttyname(0);

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

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

-       openlog("login", LOG_ODELAY, 0);
+       openlog("login", LOG_ODELAY, LOG_AUTH);

        t = 0;
        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.


@@ -158,13 +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);
                        SCPYN(utmp.ut_name, lusername);

-                       /* autologin failed, prompt for passwd */
-                       if (rflag == -1)
-                               rflag = 0;
-               } else
+               else

                        getloginname(&utmp);
                        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);


@@ -174,7 +215,7 @@ main(argc, argv)
                 * a password exists for this user, prompt
                 * for one and verify it.
                 */
                 * a password exists for this user, prompt
                 * for one and verify it.
                 */

-               if (!rflag && *pwd->pw_passwd != '\0') {
+               if (usererr == -1 && *pwd->pw_passwd != '\0') {

                        char *pp;
 
                        setpriority(PRIO_PROCESS, 0, -4);
                        char *pp;
 
                        setpriority(PRIO_PROCESS, 0, -4);


@@ -199,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_SECURITY, "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_SECURITY,
-                                   "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);


@@ -230,13 +283,13 @@ main(argc, argv)
                 * Remote login invalid must have been because
                 * of a restriction of some sort, no extra chances.
                 */
                 * Remote login invalid must have been because
                 * of a restriction of some sort, no extra chances.
                 */

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

                        exit(1);
        } while (invalid);
 /* committed to login turn off timeout */
        alarm(0);
 
                        exit(1);
        } while (invalid);
 /* committed to login turn off timeout */
        alarm(0);
 

-       if (quota(Q_SETUID, pwd->pw_uid, 0, 0) < 0) {
+       if (quota(Q_SETUID, pwd->pw_uid, 0, 0) < 0 && errno != EINVAL) {

                if (errno == EUSERS)
                        printf("%s.\n%s.\n",
                           "Too many users logged on already",
                if (errno == EUSERS)
                        printf("%s.\n%s.\n",
                           "Too many users logged on already",


@@ -283,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);
-       if (!hflag)                                     /* XXX */
+       chown(ttyn, pwd->pw_uid, TTYGID(pwd->pw_gid));
+       if (!hflag && !rflag)                                   /* XXX */

                ioctl(0, TIOCSWINSZ, &win);
                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';


@@ -307,13 +360,13 @@ main(argc, argv)
                envnew[i] = environ[i];
        environ = envnew;
 
                envnew[i] = environ[i];
        environ = envnew;
 

-       setenv("HOME=", pwd->pw_dir);
-       setenv("SHELL=", pwd->pw_shell);
+       setenv("HOME=", pwd->pw_dir, 1);
+       setenv("SHELL=", pwd->pw_shell, 1);

        if (term[0] == '\0')
                strncpy(term, stypeof(tty), sizeof(term));
        if (term[0] == '\0')
                strncpy(term, stypeof(tty), sizeof(term));

-       setenv("TERM=", term);
-       setenv("USER=", pwd->pw_name);
-       setenv("PATH=", ":/usr/ucb:/bin:/usr/bin");
+       setenv("TERM=", term, 0);
+       setenv("USER=", pwd->pw_name, 1);
+       setenv("PATH=", ":/usr/ucb:/bin:/usr/bin", 0);

 
        if ((namep = rindex(pwd->pw_shell, '/')) == NULL)
                namep = pwd->pw_shell;
 
        if ((namep = rindex(pwd->pw_shell, '/')) == NULL)
                namep = pwd->pw_shell;


@@ -323,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_SECURITY, "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;
 


@@ -425,75 +482,19 @@ stypeof(ttyid)
 doremotelogin(host)
        char *host;
 {
 doremotelogin(host)
        char *host;
 {

-       FILE *hostf;
-       int first = 1;
-

        getstr(rusername, sizeof (rusername), "remuser");
        getstr(lusername, sizeof (lusername), "locuser");
        getstr(term, sizeof(term), "Terminal type");
        if (getuid()) {
                pwd = &nouser;
        getstr(rusername, sizeof (rusername), "remuser");
        getstr(lusername, sizeof (lusername), "locuser");
        getstr(term, sizeof(term), "Terminal type");
        if (getuid()) {
                pwd = &nouser;

-               goto bad;
+               return(-1);

        }
        pwd = getpwnam(lusername);
        if (pwd == NULL) {
                pwd = &nouser;
        }
        pwd = getpwnam(lusername);
        if (pwd == NULL) {
                pwd = &nouser;

-               goto bad;
-       }
-       hostf = pwd->pw_uid ? fopen("/etc/hosts.equiv", "r") : 0;
-again:
-       if (hostf) {
-               char ahost[32];
-
-               while (fgets(ahost, sizeof (ahost), hostf)) {
-                       register char *p;
-                       char *user;
-
-                       p = ahost;
-                       while (*p != '\n' && *p != ' ' && *p != '\t' && *p != '\0')
-                               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 (!strcmp(host, ahost) &&
-                           !strcmp(rusername, *user ? user : lusername)) {
-                               fclose(hostf);
-                               return (1);
-                       }
-               }
-               fclose(hostf);
-       }
-       if (first == 1) {
-               char *rhosts = ".rhosts";
-               struct stat sbuf;
-
-               first = 0;
-               if (chdir(pwd->pw_dir) < 0)
-                       goto again;
-               if (lstat(rhosts, &sbuf) < 0)
-                       goto again;
-               if ((sbuf.st_mode & S_IFMT) == S_IFLNK) {
-                       printf("login: .rhosts is a soft link.\r\n");
-                       goto bad;
-               }
-               hostf = fopen(rhosts, "r");
-               fstat(fileno(hostf), &sbuf);
-               if (sbuf.st_uid && sbuf.st_uid != pwd->pw_uid) {
-                       printf("login: Bad .rhosts ownership.\r\n");
-                       fclose(hostf);
-                       goto bad;
-               }
-               goto again;
+               return(-1);

        }
        }

-bad:
-       return (-1);
+       return(ruserok(host, (pwd->pw_uid == 0), rusername, lusername));

 }
 
 getstr(buf, cnt, err)
 }
 
 getstr(buf, cnt, err)


@@ -525,7 +526,6 @@ doremoteterm(term, tp)
 {
        register char *cp = index(term, '/'), **cpp;
        char *speed;
 {
        register char *cp = index(term, '/'), **cpp;
        char *speed;

-       struct winsize ws;

 
        if (cp) {
                *cp++ = '\0';
 
        if (cp) {
                *cp++ = '\0';


@@ -538,27 +538,6 @@ doremoteterm(term, tp)
                                tp->sg_ispeed = tp->sg_ospeed = cpp-speeds;
                                break;
                        }
                                tp->sg_ispeed = tp->sg_ospeed = cpp-speeds;
                                break;
                        }

-               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)
-                       win = ws;

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


@@ -570,7 +549,7 @@ done:
  * This procedure assumes the memory for the first level of environ
  * was allocated using malloc.
  */
  * This procedure assumes the memory for the first level of environ
  * was allocated using malloc.
  */

-setenv(var, value)
+setenv(var, value, clobber)

        char *var, *value;
 {
        extern char **environ;
        char *var, *value;
 {
        extern char **environ;


@@ -581,6 +560,8 @@ setenv(var, value)
        for (index = 0; environ[index] != NULL; index++) {
                if (strncmp(environ[index], var, varlen) == 0) {
                        /* found it */
        for (index = 0; environ[index] != NULL; index++) {
                if (strncmp(environ[index], var, varlen) == 0) {
                        /* found it */

+                       if (!clobber)
+                               return;

                        environ[index] = malloc(varlen + vallen + 1);
                        strcpy(environ[index], var);
                        strcat(environ[index], value);
                        environ[index] = malloc(varlen + vallen + 1);
                        strcpy(environ[index], var);
                        strcat(environ[index], value);


@@ -597,3 +578,18 @@ setenv(var, value)
        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);
+}