new shutdown style

SCCS-vsn: old/init/init.c 4.4
SCCS-vsn: sbin/init/init.c 4.4
SCCS-vsn: usr.bin/login/login.c 4.10
SCCS-vsn: usr.bin/login/login.c.1 4.10

diff --git a/usr/src/old/init/init.c b/usr/src/old/init/init.c
index 589979e..e7e2b37 100644 (file)
--- a/usr/src/old/init/init.c
+++ b/usr/src/old/init/init.c
@@ -1,9 +1,10 @@
-static char *sccsid = "@(#)init.c      4.3 (Berkeley) %G%";
+static char *sccsid = "@(#)init.c      4.4 (Berkeley) %G%";

 #include <signal.h>
 #include <sys/types.h>
 #include <utmp.h>
 #include <setjmp.h>
 #include <sys/reboot.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <utmp.h>
 #include <setjmp.h>
 #include <sys/reboot.h>

+#include <errno.h>

 
 #define        LINSIZ  sizeof(wtmp.ut_line)
 #define        TABSIZ  100
 
 #define        LINSIZ  sizeof(wtmp.ut_line)
 #define        TABSIZ  100


@@ -41,8 +42,10 @@ int  fi;
 int    mergflag;
 char   tty[20];
 jmp_buf        sjbuf, shutpass;
 int    mergflag;
 char   tty[20];
 jmp_buf        sjbuf, shutpass;

+time_t time0;

 
 int    reset();
 
 int    reset();

+int    idle();

 char   *strcpy(), *strcat();
 long   lseek();
 
 char   *strcpy(), *strcat();
 long   lseek();
 


@@ -51,11 +54,12 @@ main()
        register int r11;               /* passed thru from boot */
        int howto, oldhowto;
 
        register int r11;               /* passed thru from boot */
        int howto, oldhowto;
 

+       time0 = time(0);

        howto = r11;
        setjmp(sjbuf);
        signal(SIGTERM, reset);
        howto = r11;
        setjmp(sjbuf);
        signal(SIGTERM, reset);

+       signal(SIGTSTP, idle);

        signal(SIGSTOP, SIG_IGN);
        signal(SIGSTOP, SIG_IGN);

-       signal(SIGTSTP, SIG_IGN);

        signal(SIGTTIN, SIG_IGN);
        signal(SIGTTOU, SIG_IGN);
        for(EVER) {
        signal(SIGTTIN, SIG_IGN);
        signal(SIGTTOU, SIG_IGN);
        for(EVER) {


@@ -114,17 +118,31 @@ shutreset()
 
 shutend()
 {
 
 shutend()
 {

-       register i;
+       register i, f;

 
 

+       acct(0);

        signal(SIGALRM, SIG_DFL);
        for(i=0; i<10; i++)
                close(i);
        signal(SIGALRM, SIG_DFL);
        for(i=0; i<10; i++)
                close(i);

+       f = open(wtmpf, 1);
+       if (f >= 0) {
+               lseek(f, 0L, 2);
+               SCPYN(wtmp.ut_line, "~");
+               SCPYN(wtmp.ut_name, "shutdown");
+               time(&wtmp.ut_time);
+               write(f, (char *)&wtmp, sizeof(wtmp));
+               close(f);
+       }
+       return(1);

 }
 
 single()
 {
        register pid;
 }
 
 single()
 {
        register pid;

+       register xpid;
+       extern  errno;

 
 

+   do {

        pid = fork();
        if(pid == 0) {
 /*
        pid = fork();
        if(pid == 0) {
 /*


@@ -139,8 +157,10 @@ single()
                execl(shell, minus, (char *)0);
                exit(0);
        }
                execl(shell, minus, (char *)0);
                exit(0);
        }

-       while(wait((int *)0) != pid)
-               ;
+       while((xpid = wait((int *)0)) != pid)
+               if (xpid == -1 && errno == ECHILD)
+                       break;
+   } while (xpid == -1);

 }
 
 runcom(oldhowto)
 }
 
 runcom(oldhowto)


@@ -169,7 +189,11 @@ runcom(oldhowto)
                lseek(f, 0L, 2);
                SCPYN(wtmp.ut_line, "~");
                SCPYN(wtmp.ut_name, "reboot");
                lseek(f, 0L, 2);
                SCPYN(wtmp.ut_line, "~");
                SCPYN(wtmp.ut_name, "reboot");

-               time(&wtmp.ut_time);
+               if (time0) {
+                       wtmp.ut_time = time0;
+                       time0 = 0;
+               } else
+                       time(&wtmp.ut_time);

                write(f, (char *)&wtmp, sizeof(wtmp));
                close(f);
        }
                write(f, (char *)&wtmp, sizeof(wtmp));
                close(f);
        }


@@ -371,3 +395,25 @@ reset()
 {
        longjmp(sjbuf, 1);
 }
 {
        longjmp(sjbuf, 1);
 }

+
+idle()
+{
+       register struct tab *p;
+       register pid;
+
+       signal(SIGTSTP, idle);
+       for (;;) {
+               pid = wait((int *) 0);
+               if (mergflag)
+                       return;
+               if (pid == -1)
+                       pause();
+               else {
+                       for (ALL)
+                               if (p->pid == pid) {
+                                       rmut(p);
+                                       p->pid = -1;
+                               }
+               }
+       }
+}

diff --git a/usr/src/sbin/init/init.c b/usr/src/sbin/init/init.c
index 589979e..e7e2b37 100644 (file)
--- a/usr/src/sbin/init/init.c
+++ b/usr/src/sbin/init/init.c
@@ -1,9 +1,10 @@
-static char *sccsid = "@(#)init.c      4.3 (Berkeley) %G%";
+static char *sccsid = "@(#)init.c      4.4 (Berkeley) %G%";

 #include <signal.h>
 #include <sys/types.h>
 #include <utmp.h>
 #include <setjmp.h>
 #include <sys/reboot.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <utmp.h>
 #include <setjmp.h>
 #include <sys/reboot.h>

+#include <errno.h>

 
 #define        LINSIZ  sizeof(wtmp.ut_line)
 #define        TABSIZ  100
 
 #define        LINSIZ  sizeof(wtmp.ut_line)
 #define        TABSIZ  100


@@ -41,8 +42,10 @@ int  fi;
 int    mergflag;
 char   tty[20];
 jmp_buf        sjbuf, shutpass;
 int    mergflag;
 char   tty[20];
 jmp_buf        sjbuf, shutpass;

+time_t time0;

 
 int    reset();
 
 int    reset();

+int    idle();

 char   *strcpy(), *strcat();
 long   lseek();
 
 char   *strcpy(), *strcat();
 long   lseek();
 


@@ -51,11 +54,12 @@ main()
        register int r11;               /* passed thru from boot */
        int howto, oldhowto;
 
        register int r11;               /* passed thru from boot */
        int howto, oldhowto;
 

+       time0 = time(0);

        howto = r11;
        setjmp(sjbuf);
        signal(SIGTERM, reset);
        howto = r11;
        setjmp(sjbuf);
        signal(SIGTERM, reset);

+       signal(SIGTSTP, idle);

        signal(SIGSTOP, SIG_IGN);
        signal(SIGSTOP, SIG_IGN);

-       signal(SIGTSTP, SIG_IGN);

        signal(SIGTTIN, SIG_IGN);
        signal(SIGTTOU, SIG_IGN);
        for(EVER) {
        signal(SIGTTIN, SIG_IGN);
        signal(SIGTTOU, SIG_IGN);
        for(EVER) {


@@ -114,17 +118,31 @@ shutreset()
 
 shutend()
 {
 
 shutend()
 {

-       register i;
+       register i, f;

 
 

+       acct(0);

        signal(SIGALRM, SIG_DFL);
        for(i=0; i<10; i++)
                close(i);
        signal(SIGALRM, SIG_DFL);
        for(i=0; i<10; i++)
                close(i);

+       f = open(wtmpf, 1);
+       if (f >= 0) {
+               lseek(f, 0L, 2);
+               SCPYN(wtmp.ut_line, "~");
+               SCPYN(wtmp.ut_name, "shutdown");
+               time(&wtmp.ut_time);
+               write(f, (char *)&wtmp, sizeof(wtmp));
+               close(f);
+       }
+       return(1);

 }
 
 single()
 {
        register pid;
 }
 
 single()
 {
        register pid;

+       register xpid;
+       extern  errno;

 
 

+   do {

        pid = fork();
        if(pid == 0) {
 /*
        pid = fork();
        if(pid == 0) {
 /*


@@ -139,8 +157,10 @@ single()
                execl(shell, minus, (char *)0);
                exit(0);
        }
                execl(shell, minus, (char *)0);
                exit(0);
        }

-       while(wait((int *)0) != pid)
-               ;
+       while((xpid = wait((int *)0)) != pid)
+               if (xpid == -1 && errno == ECHILD)
+                       break;
+   } while (xpid == -1);

 }
 
 runcom(oldhowto)
 }
 
 runcom(oldhowto)


@@ -169,7 +189,11 @@ runcom(oldhowto)
                lseek(f, 0L, 2);
                SCPYN(wtmp.ut_line, "~");
                SCPYN(wtmp.ut_name, "reboot");
                lseek(f, 0L, 2);
                SCPYN(wtmp.ut_line, "~");
                SCPYN(wtmp.ut_name, "reboot");

-               time(&wtmp.ut_time);
+               if (time0) {
+                       wtmp.ut_time = time0;
+                       time0 = 0;
+               } else
+                       time(&wtmp.ut_time);

                write(f, (char *)&wtmp, sizeof(wtmp));
                close(f);
        }
                write(f, (char *)&wtmp, sizeof(wtmp));
                close(f);
        }


@@ -371,3 +395,25 @@ reset()
 {
        longjmp(sjbuf, 1);
 }
 {
        longjmp(sjbuf, 1);
 }

+
+idle()
+{
+       register struct tab *p;
+       register pid;
+
+       signal(SIGTSTP, idle);
+       for (;;) {
+               pid = wait((int *) 0);
+               if (mergflag)
+                       return;
+               if (pid == -1)
+                       pause();
+               else {
+                       for (ALL)
+                               if (p->pid == pid) {
+                                       rmut(p);
+                                       p->pid = -1;
+                               }
+               }
+       }
+}

diff --git a/usr/src/usr.bin/login/login.c b/usr/src/usr.bin/login/login.c
index ed8ccf3..26b265a 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)login.c     4.9 (Berkeley) %G%";
+static char *sccsid = "@(#)login.c     4.10 (Berkeley) 81/02/28";

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


@@ -12,12 +12,21 @@ static      char *sccsid = "@(#)login.c     4.9 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <lastlog.h>
 #include <whoami.h>
 #include <sys/stat.h>
 #include <lastlog.h>
 #include <whoami.h>

-#define SCPYN(a, b)    strncpy(a, b, sizeof(a))
+#ifdef UNAME
+#include <sys/utsname.h>
+#endif
+
+#define        SCPYN(a, b)     strncpy(a, b, sizeof(a))

 
 #define NMAX sizeof(utmp.ut_name)
 #define LMAX sizeof(utmp.ut_line)
 
 
 #define NMAX sizeof(utmp.ut_name)
 #define LMAX sizeof(utmp.ut_line)
 

-char   user[20];
+#define        FALSE   0
+#define        TRUE    -1
+
+char   nolog[] =       "/etc/nologin";
+char   qlog[]  =       ".hushlogin";
+char   securetty[] =   "/etc/securetty";

 char   maildir[30] =   "/usr/spool/mail/";
 char   lastlog[] =     "/usr/adm/lastlog";
 struct passwd nouser = {"", "nope"};
 char   maildir[30] =   "/usr/spool/mail/";
 char   lastlog[] =     "/usr/adm/lastlog";
 struct passwd nouser = {"", "nope"};


@@ -27,7 +36,8 @@ char  minusnam[16] = "-";
 char   homedir[64] = "HOME=";
 char   shell[64] = "SHELL=";
 char   term[64] = "TERM=";
 char   homedir[64] = "HOME=";
 char   shell[64] = "SHELL=";
 char   term[64] = "TERM=";

-char   *envinit[] = {homedir, shell, "PATH=:/usr/ucb:/bin:/usr/bin", term, user,0};
+char   user[20] = "USER=";
+char   *envinit[] = {homedir, shell, "PATH=:/usr/ucb:/bin:/usr/bin", term, user, 0};

 struct passwd *pwd;
 
 struct passwd *getpwnam();
 struct passwd *pwd;
 
 struct passwd *getpwnam();


@@ -52,17 +62,26 @@ extern      char **environ;
 struct tchars tc = {
        CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
 };
 struct tchars tc = {
        CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
 };

+#ifdef TIOCLSET

 struct ltchars ltc = {
        CTRL(z), CTRL(y), CTRL(r), CTRL(o), CTRL(w), CTRL(v)
 };
 struct ltchars ltc = {
        CTRL(z), CTRL(y), CTRL(r), CTRL(o), CTRL(w), CTRL(v)
 };

+#endif

 
 main(argc, argv)
 char **argv;
 {
        register char *namep;
        int t, f, c;
 
 main(argc, argv)
 char **argv;
 {
        register char *namep;
        int t, f, c;

+       int invalid;
+       int quietlog;
+       int i;
+       FILE *nlfd;

        char *ttyn;
        char *ttyn;

-       int ldisc = 0;
+       int     ldisc = 0;
+#ifdef UNAME
+       struct utsname uts;
+#endif

 
        alarm(60);
        signal(SIGQUIT, SIG_IGN);
 
        alarm(60);
        signal(SIGQUIT, SIG_IGN);


@@ -70,101 +89,110 @@ char **argv;
        nice(-100);
        nice(20);
        nice(0);
        nice(-100);
        nice(20);
        nice(0);

+#ifdef TIOCLSET

        ioctl(0, TIOCLSET, 0);
        ioctl(0, TIOCLSET, 0);

+#endif

        ioctl(0, TIOCNXCL, 0);
        gtty(0, &ttyb);
        ioctl(0, TIOCNXCL, 0);
        gtty(0, &ttyb);

-       ttyb.sg_erase = '#';
-       ttyb.sg_kill = '@';
+       ttyb.sg_erase = CERASE;
+       ttyb.sg_kill = CKILL;

        stty(0, &ttyb);
        ioctl(0, TIOCSETC, &tc);
        stty(0, &ttyb);
        ioctl(0, TIOCSETC, &tc);

+#ifdef TIOCLSET

        ioctl(0, TIOCSLTC, &ltc);
        ioctl(0, TIOCSLTC, &ltc);

+#endif

        for (t=3; t<20; t++)
                close(t);
        ttyn = ttyname(0);
        for (t=3; t<20; t++)
                close(t);
        ttyn = ttyname(0);

-       if (ttyn==0)
+       if (ttyn==(char *)0)

                ttyn = "/dev/tty??";
 
                ttyn = "/dev/tty??";
 

-    loop:
-       ldisc = 0;
-       ioctl(0, TIOCSETD, &ldisc);
-       SCPYN(utmp.ut_name, "");
-       if (argc>1) {
-               SCPYN(utmp.ut_name, argv[1]);
-               argc = 0;
-       }
-       while (utmp.ut_name[0] == '\0') {
-               namep = utmp.ut_name;
-               printf("login: ");
-               while ((c = getchar()) != '\n') {
-                       if(c == ' ')
-                               c = '_';
-                       if (c == EOF)
-                               exit(0);
-                       if (namep < utmp.ut_name+NMAX)
-                               *namep++ = c;
-               }
-       }
-       setpwent();
-       if ((pwd = getpwnam(utmp.ut_name)) == NULL)
-               pwd = &nouser;
-       endpwent();
-       if (!strcmp(pwd->pw_shell, "/bin/csh")) {
-               ldisc = NTTYDISC;
+       do {
+               ldisc = 0;

                ioctl(0, TIOCSETD, &ldisc);
                ioctl(0, TIOCSETD, &ldisc);

-       }
-       if (*pwd->pw_passwd != '\0') {
-               nice(-4);
-               namep = crypt(getpass("Password:"),pwd->pw_passwd);
-               nice(4);
-               if (strcmp(namep, pwd->pw_passwd)) {
-bad:
+               invalid = FALSE;
+               SCPYN(utmp.ut_name, "");
+               if (argc>1) {
+                       SCPYN(utmp.ut_name, argv[1]);
+                       argc = 0;
+               }
+               while (utmp.ut_name[0] == '\0') {
+                       namep = utmp.ut_name;
+#ifdef UNAME
+                       if (uname(&uts) != -1)
+                               printf("%s login: ", uts.nodename);
+                       else
+#endif
+                               printf("login: ");
+                       while ((c = getchar()) != '\n') {
+                               if (c == ' ')
+                                       c = '_';
+                               if (c == EOF)
+                                       exit(0);
+                               if (namep < utmp.ut_name+NMAX)
+                                       *namep++ = c;
+                       }
+               }
+               setpwent();
+               if ((pwd = getpwnam(utmp.ut_name)) == NULL)
+                       pwd = &nouser;
+               endpwent();
+               if (!strcmp(pwd->pw_shell, "/bin/csh")) {
+                       ldisc = NTTYDISC;
+                       ioctl(0, TIOCSETD, &ldisc);
+               }
+               if (*pwd->pw_passwd != '\0') {
+                       nice(-4);
+                       namep = crypt(getpass("Password:"),pwd->pw_passwd);
+                       nice(4);
+                       if (strcmp(namep, pwd->pw_passwd))
+                               invalid = TRUE;
+               }
+               if (pwd->pw_uid != 0 && (nlfd = fopen(nolog, "r")) > 0) {
+                       /* logins are disabled except for root */
+                       while ((c = getc(nlfd)) != EOF)
+                               putchar(c);
+                       fflush(stdout);
+                       sleep(5);
+                       exit(0);
+               }
+               if (!invalid && pwd->pw_uid == 0 &&
+                   !rootterm(ttyn+sizeof("/dev/")-1)) {
+                       FILE *console = fopen("/dev/console", "w");
+                       if (console != NULL) {
+                               fprintf(console, "\r\nROOT LOGIN REFUSED %s\r\n"
+                                   , ttyn+sizeof("/dev/")-1
+                               );
+                               fclose(console);
+                       }
+                       invalid = TRUE;
+               }
+               if (invalid) {

                        printf("Login incorrect\n");
                        printf("Login incorrect\n");

-                       if (ttyn[LMAX] == 'd') {
+                       if (ttyn[sizeof("/dev/tty")-1] == 'd') {

                                FILE *console = fopen("/dev/console", "w");
                                if (console != NULL) {
                                FILE *console = fopen("/dev/console", "w");
                                if (console != NULL) {

-                                       fprintf(console, "\r\nBADDIALUP %s %s\r\n", ttyn+5, utmp.ut_name);
+                                       fprintf(console, "\r\nBADDIALUP %s %s\r\n"
+                                           , ttyn+sizeof("/dev/")-1
+                                           , utmp.ut_name);

                                        fclose(console);
                                }
                        }
                                        fclose(console);
                                }
                        }

-                       goto loop;

                }
                }

-       }
-       sprintf(user, "USER=%.*s", NMAX, pwd->pw_name);
-#ifdef ERNIE
-       if (pwd->pw_uid == 0 && ttyn[5] != 'c')
-               goto bad;
-#endif
-       if (ttyn[LMAX] == 'd') {
-               FILE *console = fopen("/dev/console", "w");
-               if (console != NULL) {
-                       fprintf(console, "\r\nDIALUP %s %s\r\n", ttyn+5, pwd->pw_name);
-                       fclose(console);
+               if (*pwd->pw_shell == '\0')
+                       pwd->pw_shell = "/bin/sh";
+               i = strlen(pwd->pw_shell);
+               if (chdir(pwd->pw_dir) < 0 && !invalid ) {
+                       if (chdir("/") < 0) {
+                               printf("No directory!\n");
+                               invalid = TRUE;
+                       } else {
+                               printf("No directory!  Logging in with home=/\n");
+                               pwd->pw_dir = "/";
+                       }

                }
                }

-       }
-       if((f = open(lastlog, 2)) >= 0) {
-               struct lastlog ll;
+       } while (invalid);

 
 

-               lseek(f, (long) pwd->pw_uid * sizeof (struct lastlog), 0);
-               if (read(f, (char *) &ll, sizeof ll) == sizeof ll && ll.ll_time != 0) {
-                       register char *ep = (char *) ctime(&ll.ll_time);
-                       printf("Last login: ");
-                       ep[24 - 5] = 0;
-                       printf("%s on %.*s\n", ep, LMAX, ll.ll_line);
-               }
-               lseek(f, (long) pwd->pw_uid * sizeof (struct lastlog), 0);
-               time(&ll.ll_time);
-               strcpyn(ll.ll_line, ttyn+5, LMAX);
-               write(f, (char *) &ll, sizeof ll);
-               close(f);
-       }
-       if(chdir(pwd->pw_dir) < 0) {
-           printf("Logging with home=/\n");
-           pwd->pw_dir = "/";
-           if(chdir("/") < 0) {
-               printf("No directory\n");
-               goto loop;
-           }
-       }

        time(&utmp.ut_time);
        t = ttyslot();
        if (t>0 && (f = open("/etc/utmp", 1)) >= 0) {
        time(&utmp.ut_time);
        t = ttyslot();
        if (t>0 && (f = open("/etc/utmp", 1)) >= 0) {


@@ -178,15 +206,36 @@ bad:
                write(f, (char *)&utmp, sizeof(utmp));
                close(f);
        }
                write(f, (char *)&utmp, sizeof(utmp));
                close(f);
        }

+       quietlog = FALSE;
+       if (access(qlog, 0) == 0)
+               quietlog = TRUE;
+       if ( !quietlog && (f = open(lastlog, 2)) >= 0 ) {
+               struct lastlog ll;
+
+               lseek(f, (long)pwd->pw_uid * sizeof (struct lastlog), 0);
+               if (read(f, (char *) &ll, sizeof ll) == sizeof ll &&
+                   ll.ll_time != 0) {
+                       printf("Last login: %.*s on %.*s\n"
+                           , 24-5
+                           , (char *) ctime(&ll.ll_time)
+                           , sizeof(ll.ll_line)
+                           , ll.ll_line
+                       );
+               }
+               lseek(f, (long)pwd->pw_uid * sizeof (struct lastlog), 0);
+               time(&ll.ll_time);
+               SCPYN(ll.ll_line, rindex(ttyn, '/')+1);
+               write(f, (char *) &ll, sizeof ll);
+               close(f);
+       }

        chown(ttyn, pwd->pw_uid, pwd->pw_gid);
        setgid(pwd->pw_gid);
        setuid(pwd->pw_uid);
        chown(ttyn, pwd->pw_uid, pwd->pw_gid);
        setgid(pwd->pw_gid);
        setuid(pwd->pw_uid);

-       if (*pwd->pw_shell == '\0')
-               pwd->pw_shell = "/bin/sh";

        environ = envinit;
        strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
        strncat(shell, pwd->pw_shell, sizeof(shell)-7);
        strncat(term, stypeof(ttyn), sizeof(term)-6);
        environ = envinit;
        strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
        strncat(shell, pwd->pw_shell, sizeof(shell)-7);
        strncat(term, stypeof(ttyn), sizeof(term)-6);

+       strncat(user, pwd->pw_name, sizeof(user)-6);

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


@@ -194,23 +243,36 @@ bad:
        strcat(minusnam, namep);
        alarm(0);
 #ifdef ARPAVAX
        strcat(minusnam, namep);
        alarm(0);
 #ifdef ARPAVAX

-       if (pwd->pw_gid == 31)
+       if (pwd->pw_gid == 27)                  /* UGLY ! */

                umask(2);
        else
                umask(2);
        else

-#else
-               umask(022);

 #endif
 #endif

-       showmotd();
-       strcat(maildir, pwd->pw_name);
-       if(access(maildir,4)==0) {
-               struct stat statb;
-               stat(maildir, &statb);
-               if (statb.st_size)
-                       printf("You have mail.\n");
+               umask(022);
+       if (ttyn[sizeof("/dev/tty")-1] == 'd') {
+               FILE *console = fopen("/dev/console", "w");
+               if (console != NULL) {
+                       fprintf(console, "\r\nDIALUP %s %s\r\n"
+                           , ttyn+sizeof("/dev/")-1
+                           , pwd->pw_name
+                       );
+                       fclose(console);
+               }

        }
        }

+       if ( !quietlog ) {
+               showmotd();
+               strcat(maildir, pwd->pw_name);
+               if (access(maildir,4)==0) {
+                       struct stat statb;
+                       stat(maildir, &statb);
+                       if (statb.st_size)
+                               printf("You have mail.\n");
+               }
+       }
+       

        signal(SIGQUIT, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        execlp(pwd->pw_shell, minusnam, 0);
        signal(SIGQUIT, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        execlp(pwd->pw_shell, minusnam, 0);

+       perror(pwd->pw_shell);

        printf("No shell\n");
        exit(0);
 }
        printf("No shell\n");
        exit(0);
 }


@@ -222,20 +284,43 @@ catch()
        stopmotd++;
 }
 
        stopmotd++;
 }
 

+/*
+ * return true if OK for root to login on this terminal
+ */
+rootterm(tty)
+       char    *tty;
+{
+       register FILE *fd;
+       char    buf[100];
+
+       if ((fd = fopen(securetty, "r")) == NULL)
+               return(1);
+       while (fgets(buf, sizeof buf, fd) != NULL) {
+               buf[strlen(buf)-1] = '\0';
+               if (strcmp(tty, buf) == 0) {
+                       fclose(fd);
+                       return(1);
+               }
+       }
+       fclose(fd);
+       return(0);
+}
+

 showmotd()
 {
        FILE *mf;
        register c;
 
        signal(SIGINT, catch);
 showmotd()
 {
        FILE *mf;
        register c;
 
        signal(SIGINT, catch);

-       if((mf = fopen("/etc/motd","r")) != NULL) {
-               while((c = getc(mf)) != EOF && stopmotd == 0)
+       if ((mf = fopen("/etc/motd","r")) != NULL) {
+               while ((c = getc(mf)) != EOF && stopmotd == 0)

                        putchar(c);
                fclose(mf);
        }
        signal(SIGINT, SIG_IGN);
 }
 
                        putchar(c);
                fclose(mf);
        }
        signal(SIGINT, SIG_IGN);
 }
 

+#undef UNKNOWN

 #define UNKNOWN "su"
 
 char *
 #define UNKNOWN "su"
 
 char *


@@ -260,9 +345,11 @@ char       *ttyid;
        /* scan the file */
        while (fgets(buf, sizeof buf, f) != NULL)
        {
        /* scan the file */
        while (fgets(buf, sizeof buf, f) != NULL)
        {

-               for (t=buf; *t!=' '; t++)
+               for (t=buf; *t!=' ' && *t != '\t'; t++)

                        ;
                *t++ = 0;
                        ;
                *t++ = 0;

+               while (*t == ' ' || *t == '\t')
+                       t++;

                for (p=t; *p>' '; p++)
                        ;
                *p = 0;
                for (p=t; *p>' '; p++)
                        ;
                *p = 0;

diff --git a/usr/src/usr.bin/login/login.c.1 b/usr/src/usr.bin/login/login.c.1
index ffc597f..84f1633 100644 (file)
--- a/usr/src/usr.bin/login/login.c.1
+++ b/usr/src/usr.bin/login/login.c.1
@@ -1,4 +1,4 @@
-static char *sccsid = "@(#)login.c.1   4.9 (Berkeley) %G%";
+static char *sccsid = "@(#)login.c.1   4.10 (Berkeley) 81/02/28";

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


@@ -12,12 +12,21 @@ static      char *sccsid = "@(#)login.c.1   4.9 (Berkeley) %G%";
 #include <sys/stat.h>
 #include <lastlog.h>
 #include <whoami.h>
 #include <sys/stat.h>
 #include <lastlog.h>
 #include <whoami.h>

-#define SCPYN(a, b)    strncpy(a, b, sizeof(a))
+#ifdef UNAME
+#include <sys/utsname.h>
+#endif
+
+#define        SCPYN(a, b)     strncpy(a, b, sizeof(a))

 
 #define NMAX sizeof(utmp.ut_name)
 #define LMAX sizeof(utmp.ut_line)
 
 
 #define NMAX sizeof(utmp.ut_name)
 #define LMAX sizeof(utmp.ut_line)
 

-char   user[20];
+#define        FALSE   0
+#define        TRUE    -1
+
+char   nolog[] =       "/etc/nologin";
+char   qlog[]  =       ".hushlogin";
+char   securetty[] =   "/etc/securetty";

 char   maildir[30] =   "/usr/spool/mail/";
 char   lastlog[] =     "/usr/adm/lastlog";
 struct passwd nouser = {"", "nope"};
 char   maildir[30] =   "/usr/spool/mail/";
 char   lastlog[] =     "/usr/adm/lastlog";
 struct passwd nouser = {"", "nope"};


@@ -27,7 +36,8 @@ char  minusnam[16] = "-";
 char   homedir[64] = "HOME=";
 char   shell[64] = "SHELL=";
 char   term[64] = "TERM=";
 char   homedir[64] = "HOME=";
 char   shell[64] = "SHELL=";
 char   term[64] = "TERM=";

-char   *envinit[] = {homedir, shell, "PATH=:/usr/ucb:/bin:/usr/bin", term, user,0};
+char   user[20] = "USER=";
+char   *envinit[] = {homedir, shell, "PATH=:/usr/ucb:/bin:/usr/bin", term, user, 0};

 struct passwd *pwd;
 
 struct passwd *getpwnam();
 struct passwd *pwd;
 
 struct passwd *getpwnam();


@@ -52,17 +62,26 @@ extern      char **environ;
 struct tchars tc = {
        CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
 };
 struct tchars tc = {
        CINTR, CQUIT, CSTART, CSTOP, CEOT, CBRK
 };

+#ifdef TIOCLSET

 struct ltchars ltc = {
        CTRL(z), CTRL(y), CTRL(r), CTRL(o), CTRL(w), CTRL(v)
 };
 struct ltchars ltc = {
        CTRL(z), CTRL(y), CTRL(r), CTRL(o), CTRL(w), CTRL(v)
 };

+#endif

 
 main(argc, argv)
 char **argv;
 {
        register char *namep;
        int t, f, c;
 
 main(argc, argv)
 char **argv;
 {
        register char *namep;
        int t, f, c;

+       int invalid;
+       int quietlog;
+       int i;
+       FILE *nlfd;

        char *ttyn;
        char *ttyn;

-       int ldisc = 0;
+       int     ldisc = 0;
+#ifdef UNAME
+       struct utsname uts;
+#endif

 
        alarm(60);
        signal(SIGQUIT, SIG_IGN);
 
        alarm(60);
        signal(SIGQUIT, SIG_IGN);


@@ -70,101 +89,110 @@ char **argv;
        nice(-100);
        nice(20);
        nice(0);
        nice(-100);
        nice(20);
        nice(0);

+#ifdef TIOCLSET

        ioctl(0, TIOCLSET, 0);
        ioctl(0, TIOCLSET, 0);

+#endif

        ioctl(0, TIOCNXCL, 0);
        gtty(0, &ttyb);
        ioctl(0, TIOCNXCL, 0);
        gtty(0, &ttyb);

-       ttyb.sg_erase = '#';
-       ttyb.sg_kill = '@';
+       ttyb.sg_erase = CERASE;
+       ttyb.sg_kill = CKILL;

        stty(0, &ttyb);
        ioctl(0, TIOCSETC, &tc);
        stty(0, &ttyb);
        ioctl(0, TIOCSETC, &tc);

+#ifdef TIOCLSET

        ioctl(0, TIOCSLTC, &ltc);
        ioctl(0, TIOCSLTC, &ltc);

+#endif

        for (t=3; t<20; t++)
                close(t);
        ttyn = ttyname(0);
        for (t=3; t<20; t++)
                close(t);
        ttyn = ttyname(0);

-       if (ttyn==0)
+       if (ttyn==(char *)0)

                ttyn = "/dev/tty??";
 
                ttyn = "/dev/tty??";
 

-    loop:
-       ldisc = 0;
-       ioctl(0, TIOCSETD, &ldisc);
-       SCPYN(utmp.ut_name, "");
-       if (argc>1) {
-               SCPYN(utmp.ut_name, argv[1]);
-               argc = 0;
-       }
-       while (utmp.ut_name[0] == '\0') {
-               namep = utmp.ut_name;
-               printf("login: ");
-               while ((c = getchar()) != '\n') {
-                       if(c == ' ')
-                               c = '_';
-                       if (c == EOF)
-                               exit(0);
-                       if (namep < utmp.ut_name+NMAX)
-                               *namep++ = c;
-               }
-       }
-       setpwent();
-       if ((pwd = getpwnam(utmp.ut_name)) == NULL)
-               pwd = &nouser;
-       endpwent();
-       if (!strcmp(pwd->pw_shell, "/bin/csh")) {
-               ldisc = NTTYDISC;
+       do {
+               ldisc = 0;

                ioctl(0, TIOCSETD, &ldisc);
                ioctl(0, TIOCSETD, &ldisc);

-       }
-       if (*pwd->pw_passwd != '\0') {
-               nice(-4);
-               namep = crypt(getpass("Password:"),pwd->pw_passwd);
-               nice(4);
-               if (strcmp(namep, pwd->pw_passwd)) {
-bad:
+               invalid = FALSE;
+               SCPYN(utmp.ut_name, "");
+               if (argc>1) {
+                       SCPYN(utmp.ut_name, argv[1]);
+                       argc = 0;
+               }
+               while (utmp.ut_name[0] == '\0') {
+                       namep = utmp.ut_name;
+#ifdef UNAME
+                       if (uname(&uts) != -1)
+                               printf("%s login: ", uts.nodename);
+                       else
+#endif
+                               printf("login: ");
+                       while ((c = getchar()) != '\n') {
+                               if (c == ' ')
+                                       c = '_';
+                               if (c == EOF)
+                                       exit(0);
+                               if (namep < utmp.ut_name+NMAX)
+                                       *namep++ = c;
+                       }
+               }
+               setpwent();
+               if ((pwd = getpwnam(utmp.ut_name)) == NULL)
+                       pwd = &nouser;
+               endpwent();
+               if (!strcmp(pwd->pw_shell, "/bin/csh")) {
+                       ldisc = NTTYDISC;
+                       ioctl(0, TIOCSETD, &ldisc);
+               }
+               if (*pwd->pw_passwd != '\0') {
+                       nice(-4);
+                       namep = crypt(getpass("Password:"),pwd->pw_passwd);
+                       nice(4);
+                       if (strcmp(namep, pwd->pw_passwd))
+                               invalid = TRUE;
+               }
+               if (pwd->pw_uid != 0 && (nlfd = fopen(nolog, "r")) > 0) {
+                       /* logins are disabled except for root */
+                       while ((c = getc(nlfd)) != EOF)
+                               putchar(c);
+                       fflush(stdout);
+                       sleep(5);
+                       exit(0);
+               }
+               if (!invalid && pwd->pw_uid == 0 &&
+                   !rootterm(ttyn+sizeof("/dev/")-1)) {
+                       FILE *console = fopen("/dev/console", "w");
+                       if (console != NULL) {
+                               fprintf(console, "\r\nROOT LOGIN REFUSED %s\r\n"
+                                   , ttyn+sizeof("/dev/")-1
+                               );
+                               fclose(console);
+                       }
+                       invalid = TRUE;
+               }
+               if (invalid) {

                        printf("Login incorrect\n");
                        printf("Login incorrect\n");

-                       if (ttyn[LMAX] == 'd') {
+                       if (ttyn[sizeof("/dev/tty")-1] == 'd') {

                                FILE *console = fopen("/dev/console", "w");
                                if (console != NULL) {
                                FILE *console = fopen("/dev/console", "w");
                                if (console != NULL) {

-                                       fprintf(console, "\r\nBADDIALUP %s %s\r\n", ttyn+5, utmp.ut_name);
+                                       fprintf(console, "\r\nBADDIALUP %s %s\r\n"
+                                           , ttyn+sizeof("/dev/")-1
+                                           , utmp.ut_name);

                                        fclose(console);
                                }
                        }
                                        fclose(console);
                                }
                        }

-                       goto loop;

                }
                }

-       }
-       sprintf(user, "USER=%.*s", NMAX, pwd->pw_name);
-#ifdef ERNIE
-       if (pwd->pw_uid == 0 && ttyn[5] != 'c')
-               goto bad;
-#endif
-       if (ttyn[LMAX] == 'd') {
-               FILE *console = fopen("/dev/console", "w");
-               if (console != NULL) {
-                       fprintf(console, "\r\nDIALUP %s %s\r\n", ttyn+5, pwd->pw_name);
-                       fclose(console);
+               if (*pwd->pw_shell == '\0')
+                       pwd->pw_shell = "/bin/sh";
+               i = strlen(pwd->pw_shell);
+               if (chdir(pwd->pw_dir) < 0 && !invalid ) {
+                       if (chdir("/") < 0) {
+                               printf("No directory!\n");
+                               invalid = TRUE;
+                       } else {
+                               printf("No directory!  Logging in with home=/\n");
+                               pwd->pw_dir = "/";
+                       }

                }
                }

-       }
-       if((f = open(lastlog, 2)) >= 0) {
-               struct lastlog ll;
+       } while (invalid);

 
 

-               lseek(f, (long) pwd->pw_uid * sizeof (struct lastlog), 0);
-               if (read(f, (char *) &ll, sizeof ll) == sizeof ll && ll.ll_time != 0) {
-                       register char *ep = (char *) ctime(&ll.ll_time);
-                       printf("Last login: ");
-                       ep[24 - 5] = 0;
-                       printf("%s on %.*s\n", ep, LMAX, ll.ll_line);
-               }
-               lseek(f, (long) pwd->pw_uid * sizeof (struct lastlog), 0);
-               time(&ll.ll_time);
-               strcpyn(ll.ll_line, ttyn+5, LMAX);
-               write(f, (char *) &ll, sizeof ll);
-               close(f);
-       }
-       if(chdir(pwd->pw_dir) < 0) {
-           printf("Logging with home=/\n");
-           pwd->pw_dir = "/";
-           if(chdir("/") < 0) {
-               printf("No directory\n");
-               goto loop;
-           }
-       }

        time(&utmp.ut_time);
        t = ttyslot();
        if (t>0 && (f = open("/etc/utmp", 1)) >= 0) {
        time(&utmp.ut_time);
        t = ttyslot();
        if (t>0 && (f = open("/etc/utmp", 1)) >= 0) {


@@ -178,15 +206,36 @@ bad:
                write(f, (char *)&utmp, sizeof(utmp));
                close(f);
        }
                write(f, (char *)&utmp, sizeof(utmp));
                close(f);
        }

+       quietlog = FALSE;
+       if (access(qlog, 0) == 0)
+               quietlog = TRUE;
+       if ( !quietlog && (f = open(lastlog, 2)) >= 0 ) {
+               struct lastlog ll;
+
+               lseek(f, (long)pwd->pw_uid * sizeof (struct lastlog), 0);
+               if (read(f, (char *) &ll, sizeof ll) == sizeof ll &&
+                   ll.ll_time != 0) {
+                       printf("Last login: %.*s on %.*s\n"
+                           , 24-5
+                           , (char *) ctime(&ll.ll_time)
+                           , sizeof(ll.ll_line)
+                           , ll.ll_line
+                       );
+               }
+               lseek(f, (long)pwd->pw_uid * sizeof (struct lastlog), 0);
+               time(&ll.ll_time);
+               SCPYN(ll.ll_line, rindex(ttyn, '/')+1);
+               write(f, (char *) &ll, sizeof ll);
+               close(f);
+       }

        chown(ttyn, pwd->pw_uid, pwd->pw_gid);
        setgid(pwd->pw_gid);
        setuid(pwd->pw_uid);
        chown(ttyn, pwd->pw_uid, pwd->pw_gid);
        setgid(pwd->pw_gid);
        setuid(pwd->pw_uid);

-       if (*pwd->pw_shell == '\0')
-               pwd->pw_shell = "/bin/sh";

        environ = envinit;
        strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
        strncat(shell, pwd->pw_shell, sizeof(shell)-7);
        strncat(term, stypeof(ttyn), sizeof(term)-6);
        environ = envinit;
        strncat(homedir, pwd->pw_dir, sizeof(homedir)-6);
        strncat(shell, pwd->pw_shell, sizeof(shell)-7);
        strncat(term, stypeof(ttyn), sizeof(term)-6);

+       strncat(user, pwd->pw_name, sizeof(user)-6);

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


@@ -194,23 +243,36 @@ bad:
        strcat(minusnam, namep);
        alarm(0);
 #ifdef ARPAVAX
        strcat(minusnam, namep);
        alarm(0);
 #ifdef ARPAVAX

-       if (pwd->pw_gid == 31)
+       if (pwd->pw_gid == 27)                  /* UGLY ! */

                umask(2);
        else
                umask(2);
        else

-#else
-               umask(022);

 #endif
 #endif

-       showmotd();
-       strcat(maildir, pwd->pw_name);
-       if(access(maildir,4)==0) {
-               struct stat statb;
-               stat(maildir, &statb);
-               if (statb.st_size)
-                       printf("You have mail.\n");
+               umask(022);
+       if (ttyn[sizeof("/dev/tty")-1] == 'd') {
+               FILE *console = fopen("/dev/console", "w");
+               if (console != NULL) {
+                       fprintf(console, "\r\nDIALUP %s %s\r\n"
+                           , ttyn+sizeof("/dev/")-1
+                           , pwd->pw_name
+                       );
+                       fclose(console);
+               }

        }
        }

+       if ( !quietlog ) {
+               showmotd();
+               strcat(maildir, pwd->pw_name);
+               if (access(maildir,4)==0) {
+                       struct stat statb;
+                       stat(maildir, &statb);
+                       if (statb.st_size)
+                               printf("You have mail.\n");
+               }
+       }
+       

        signal(SIGQUIT, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        execlp(pwd->pw_shell, minusnam, 0);
        signal(SIGQUIT, SIG_DFL);
        signal(SIGINT, SIG_DFL);
        execlp(pwd->pw_shell, minusnam, 0);

+       perror(pwd->pw_shell);

        printf("No shell\n");
        exit(0);
 }
        printf("No shell\n");
        exit(0);
 }


@@ -222,20 +284,43 @@ catch()
        stopmotd++;
 }
 
        stopmotd++;
 }
 

+/*
+ * return true if OK for root to login on this terminal
+ */
+rootterm(tty)
+       char    *tty;
+{
+       register FILE *fd;
+       char    buf[100];
+
+       if ((fd = fopen(securetty, "r")) == NULL)
+               return(1);
+       while (fgets(buf, sizeof buf, fd) != NULL) {
+               buf[strlen(buf)-1] = '\0';
+               if (strcmp(tty, buf) == 0) {
+                       fclose(fd);
+                       return(1);
+               }
+       }
+       fclose(fd);
+       return(0);
+}
+

 showmotd()
 {
        FILE *mf;
        register c;
 
        signal(SIGINT, catch);
 showmotd()
 {
        FILE *mf;
        register c;
 
        signal(SIGINT, catch);

-       if((mf = fopen("/etc/motd","r")) != NULL) {
-               while((c = getc(mf)) != EOF && stopmotd == 0)
+       if ((mf = fopen("/etc/motd","r")) != NULL) {
+               while ((c = getc(mf)) != EOF && stopmotd == 0)

                        putchar(c);
                fclose(mf);
        }
        signal(SIGINT, SIG_IGN);
 }
 
                        putchar(c);
                fclose(mf);
        }
        signal(SIGINT, SIG_IGN);
 }
 

+#undef UNKNOWN

 #define UNKNOWN "su"
 
 char *
 #define UNKNOWN "su"
 
 char *


@@ -260,9 +345,11 @@ char       *ttyid;
        /* scan the file */
        while (fgets(buf, sizeof buf, f) != NULL)
        {
        /* scan the file */
        while (fgets(buf, sizeof buf, f) != NULL)
        {

-               for (t=buf; *t!=' '; t++)
+               for (t=buf; *t!=' ' && *t != '\t'; t++)

                        ;
                *t++ = 0;
                        ;
                *t++ = 0;

+               while (*t == ' ' || *t == '\t')
+                       t++;

                for (p=t; *p>' '; p++)
                        ;
                *p = 0;
                for (p=t; *p>' '; p++)
                        ;
                *p = 0;