BSD 4_4_Lite1 release

[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 6accb11..ef75733 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -1,30 +1,44 @@
 /*-
 /*-

- * Copyright (c) 1980, 1987, 1988 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-char copyright[] =
-"@(#) Copyright (c) 1980, 1987, 1988 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1987, 1988, 1991, 1993, 1994\n\
+       The Regents of the University of California.  All rights reserved.\n";

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

-static char sccsid[] = "@(#)login.c    5.63 (Berkeley) 6/29/90";
+static char sccsid[] = "@(#)login.c    8.4 (Berkeley) 4/2/94";

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


@@ -38,58 +52,77 @@ static char sccsid[] = "@(#)login.c 5.63 (Berkeley) 6/29/90";
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/file.h>

-#include <sgtty.h>

 
 

-#include <utmp.h>
-#include <signal.h>
+#include <err.h>

 #include <errno.h>
 #include <errno.h>

-#include <ttyent.h>
-#include <syslog.h>

 #include <grp.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <grp.h>
 #include <pwd.h>
 #include <setjmp.h>

+#include <signal.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdlib.h>

 #include <string.h>
 #include <string.h>

+#include <syslog.h>
+#include <ttyent.h>

 #include <tzfile.h>
 #include <tzfile.h>

+#include <unistd.h>
+#include <utmp.h>
+

 #include "pathnames.h"
 
 #include "pathnames.h"
 

+void    badlogin __P((char *));
+void    checknologin __P((void));
+void    dolastlog __P((int));
+void    getloginname __P((void));
+void    motd __P((void));
+int     rootterm __P((char *));
+void    sigint __P((int));
+void    sleepexit __P((int));
+char   *stypeof __P((char *));
+void    timedout __P((int));
+#ifdef KERBEROS
+int     klogin __P((struct passwd *, char *, char *, char *));
+#endif
+
+extern void login __P((struct utmp *));
+

 #define        TTYGRPNAME      "tty"           /* name of group to own ttys */
 
 /*
  * This bounds the time given to login.  Not a define so it can
  * be patched on machines where it's too small.
  */
 #define        TTYGRPNAME      "tty"           /* name of group to own ttys */
 
 /*
  * This bounds the time given to login.  Not a define so it can
  * be patched on machines where it's too small.
  */

-int    timeout = 300;
+u_int  timeout = 300;
+

 #ifdef KERBEROS
 int    notickets = 1;
 #ifdef KERBEROS
 int    notickets = 1;

+char   *instance;
+char   *krbtkfile_env;
+int    authok;

 #endif
 
 struct passwd *pwd;
 int    failures;
 char   term[64], *envinit[1], *hostname, *username, *tty;
 
 #endif
 
 struct passwd *pwd;
 int    failures;
 char   term[64], *envinit[1], *hostname, *username, *tty;
 

+int

 main(argc, argv)
        int argc;
 main(argc, argv)
        int argc;

-       char **argv;
+       char *argv[];

 {
 {

-       extern int optind;
-       extern char *optarg, **environ;
-       struct timeval tp;
+       extern char **environ;

        struct group *gr;
        struct group *gr;

-       register int ch;
-       register char *p;
-       int ask, fflag, hflag, pflag, cnt, uid;
-       int quietlog, rval;
-       char *domain, *salt, *ttyn;
+       struct stat st;
+       struct timeval tp;
+       struct utmp utmp;
+       int ask, ch, cnt, fflag, hflag, pflag, quietlog, rootlogin, rval;
+       uid_t uid;
+       char *domain, *p, *salt, *ttyn;

        char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
        char localhost[MAXHOSTNAMELEN];
        char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
        char localhost[MAXHOSTNAMELEN];

-       char *ctime(), *ttyname(), *stypeof(), *crypt(), *getpass();
-       time_t time();
-       off_t lseek();
-       void timedout();

 
        (void)signal(SIGALRM, timedout);
 
        (void)signal(SIGALRM, timedout);

-       (void)alarm((u_int)timeout);
+       (void)alarm(timeout);

        (void)signal(SIGQUIT, SIG_IGN);
        (void)signal(SIGINT, SIG_IGN);
        (void)setpriority(PRIO_PROCESS, 0, 0);
        (void)signal(SIGQUIT, SIG_IGN);
        (void)signal(SIGINT, SIG_IGN);
        (void)setpriority(PRIO_PROCESS, 0, 0);


@@ -98,7 +131,7 @@ main(argc, argv)
 
        /*
         * -p is used by getty to tell login not to destroy the environment
 
        /*
         * -p is used by getty to tell login not to destroy the environment

-        * -f is used to skip a second login authentication 
+        * -f is used to skip a second login authentication

         * -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
         */


@@ -106,7 +139,7 @@ main(argc, argv)
        if (gethostname(localhost, sizeof(localhost)) < 0)
                syslog(LOG_ERR, "couldn't get local hostname: %m");
        else
        if (gethostname(localhost, sizeof(localhost)) < 0)
                syslog(LOG_ERR, "couldn't get local hostname: %m");
        else

-               domain = index(localhost, '.');
+               domain = strchr(localhost, '.');

 
        fflag = hflag = pflag = 0;
        uid = getuid();
 
        fflag = hflag = pflag = 0;
        uid = getuid();


@@ -116,13 +149,10 @@ main(argc, argv)
                        fflag = 1;
                        break;
                case 'h':
                        fflag = 1;
                        break;
                case 'h':

-                       if (uid) {
-                               (void)fprintf(stderr,
-                                   "login: -h for super-user only.\n");
-                               exit(1);
-                       }
+                       if (uid)
+                               errx(1, "-h option: %s", strerror(EPERM));

                        hflag = 1;
                        hflag = 1;

-                       if (domain && (p = index(optarg, '.')) &&
+                       if (domain && (p = strchr(optarg, '.')) &&

                            strcasecmp(p, domain) == 0)
                                *p = 0;
                        hostname = optarg;
                            strcasecmp(p, domain) == 0)
                                *p = 0;
                        hostname = optarg;


@@ -135,28 +165,27 @@ main(argc, argv)
                        if (!uid)
                                syslog(LOG_ERR, "invalid flag %c", ch);
                        (void)fprintf(stderr,
                        if (!uid)
                                syslog(LOG_ERR, "invalid flag %c", ch);
                        (void)fprintf(stderr,

-                           "usage: login [-fp] [username]\n");
+                           "usage: login [-fp] [-h hostname] [username]\n");

                        exit(1);
                }
        argc -= optind;
        argv += optind;
                        exit(1);
                }
        argc -= optind;
        argv += optind;

+

        if (*argv) {
                username = *argv;
        if (*argv) {
                username = *argv;

-               if (strlen(username) > UT_NAMESIZE)
-                       username[UT_NAMESIZE] = '\0';

                ask = 0;
        } else
                ask = 1;
 
        for (cnt = getdtablesize(); cnt > 2; cnt--)
                ask = 0;
        } else
                ask = 1;
 
        for (cnt = getdtablesize(); cnt > 2; cnt--)

-               close(cnt);
+               (void)close(cnt);

 
 

-       ttyn = ttyname(0);
+       ttyn = ttyname(STDIN_FILENO);

        if (ttyn == NULL || *ttyn == '\0') {
        if (ttyn == NULL || *ttyn == '\0') {

-               (void)sprintf(tname, "%s??", _PATH_TTY);
+               (void)snprintf(tname, sizeof(tname), "%s??", _PATH_TTY);

                ttyn = tname;
        }
                ttyn = tname;
        }

-       if (tty = rindex(ttyn, '/'))
+       if (tty = strrchr(ttyn, '/'))

                ++tty;
        else
                tty = ttyn;
                ++tty;
        else
                tty = ttyn;


@@ -166,6 +195,18 @@ main(argc, argv)
                        fflag = 0;
                        getloginname();
                }
                        fflag = 0;
                        getloginname();
                }

+               rootlogin = 0;
+#ifdef KERBEROS
+               if ((instance = strchr(username, '.')) != NULL) {
+                       if (strncmp(instance, ".root", 5) == 0)
+                               rootlogin = 1;
+                       *instance++ = '\0';
+               } else
+                       instance = "";
+#endif
+               if (strlen(username) > UT_NAMESIZE)
+                       username[UT_NAMESIZE] = '\0';
+

                /*
                 * Note if trying multiple user names; log failures for
                 * previous user name, but don't bother logging one failure
                /*
                 * Note if trying multiple user names; log failures for
                 * previous user name, but don't bother logging one failure


@@ -193,12 +234,38 @@ main(argc, argv)
                    fflag && (uid == 0 || uid == pwd->pw_uid)))
                        break;
                fflag = 0;
                    fflag && (uid == 0 || uid == pwd->pw_uid)))
                        break;
                fflag = 0;

+               if (pwd && pwd->pw_uid == 0)
+                       rootlogin = 1;
+
+               (void)setpriority(PRIO_PROCESS, 0, -4);
+
+               p = getpass("Password:");
+
+               if (pwd) {
+#ifdef KERBEROS
+                       rval = klogin(pwd, instance, localhost, p);
+                       if (rval != 0 && rootlogin && pwd->pw_uid != 0)
+                               rootlogin = 0;
+                       if (rval == 0)
+                               authok = 1;
+                       else if (rval == 1)
+                               rval = strcmp(crypt(p, salt), pwd->pw_passwd);
+#else
+                       rval = strcmp(crypt(p, salt), pwd->pw_passwd);
+#endif
+               }
+               memset(p, 0, strlen(p));
+
+               (void)setpriority(PRIO_PROCESS, 0, 0);

 
                /*
 
                /*

-                * If trying to log in as root, but with insecure terminal,
-                * refuse the login attempt.
+                * If trying to log in as root without Kerberos,
+                * but with insecure terminal, refuse the login attempt.

                 */
                 */

-               if (pwd && pwd->pw_uid == 0 && !rootterm(tty)) {
+#ifdef KERBEROS
+               if (authok == 0)
+#endif
+               if (pwd && rootlogin && !rootterm(tty)) {

                        (void)fprintf(stderr,
                            "%s login refused on this terminal.\n",
                            pwd->pw_name);
                        (void)fprintf(stderr,
                            "%s login refused on this terminal.\n",
                            pwd->pw_name);


@@ -213,23 +280,6 @@ main(argc, argv)
                        continue;
                }
 
                        continue;
                }
 

-               (void)setpriority(PRIO_PROCESS, 0, -4);
-
-               p = getpass("Password:");
-
-               if (pwd) {
-#ifdef KERBEROS
-                       rval = klogin(pwd, localhost, p);
-                       if (rval == 1)
-                               rval = strcmp(crypt(p, salt), pwd->pw_passwd);
-#else
-                       rval = strcmp(crypt(p, salt), pwd->pw_passwd);
-#endif
-               }
-               bzero(p, strlen(p));
-
-               (void)setpriority(PRIO_PROCESS, 0, 0);
-

                if (pwd && !rval)
                        break;
 
                if (pwd && !rval)
                        break;
 


@@ -248,15 +298,14 @@ main(argc, argv)
        /* committed to login -- turn off timeout */
        (void)alarm((u_int)0);
 
        /* committed to login -- turn off timeout */
        (void)alarm((u_int)0);
 

-       /* paranoia... */

        endpwent();
 
        /* if user not super-user, check for disabled logins */
        endpwent();
 
        /* if user not super-user, check for disabled logins */

-       if (pwd->pw_uid)
+       if (!rootlogin)

                checknologin();
 
        if (chdir(pwd->pw_dir) < 0) {
                checknologin();
 
        if (chdir(pwd->pw_dir) < 0) {

-               (void)printf("No directory %s!\n", pwd->pw_dir);
+               (void)printf("No home directory %s!\n", pwd->pw_dir);

                if (chdir("/"))
                        exit(0);
                pwd->pw_dir = "/";
                if (chdir("/"))
                        exit(0);
                pwd->pw_dir = "/";


@@ -271,39 +320,32 @@ main(argc, argv)
                if (tp.tv_sec >= pwd->pw_change) {
                        (void)printf("Sorry -- your password has expired.\n");
                        sleepexit(1);
                if (tp.tv_sec >= pwd->pw_change) {
                        (void)printf("Sorry -- your password has expired.\n");
                        sleepexit(1);

-               }
-               else if (pwd->pw_change - tp.tv_sec <
+               } else if (pwd->pw_change - tp.tv_sec <

                    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
                        (void)printf("Warning: your password expires on %s",
                    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
                        (void)printf("Warning: your password expires on %s",

-                           ctime(&pwd->pw_expire));
+                           ctime(&pwd->pw_change));

        if (pwd->pw_expire)
                if (tp.tv_sec >= pwd->pw_expire) {
                        (void)printf("Sorry -- your account has expired.\n");
                        sleepexit(1);
        if (pwd->pw_expire)
                if (tp.tv_sec >= pwd->pw_expire) {
                        (void)printf("Sorry -- your account has expired.\n");
                        sleepexit(1);

-               }
-               else if (pwd->pw_expire - tp.tv_sec <
+               } else if (pwd->pw_expire - tp.tv_sec <

                    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
                        (void)printf("Warning: your account expires on %s",
                            ctime(&pwd->pw_expire));
 
                    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
                        (void)printf("Warning: your account expires on %s",
                            ctime(&pwd->pw_expire));
 

-       /* nothing else left to fail -- really log in */
-       {
-               struct utmp utmp;
-
-               bzero((void *)&utmp, sizeof(utmp));
-               (void)time(&utmp.ut_time);
-               strncpy(utmp.ut_name, username, sizeof(utmp.ut_name));
-               if (hostname)
-                       strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
-               strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line));
-               login(&utmp);
-       }
+       /* Nothing else left to fail -- really log in. */
+       memset((void *)&utmp, 0, sizeof(utmp));
+       (void)time(&utmp.ut_time);
+       (void)strncpy(utmp.ut_name, username, sizeof(utmp.ut_name));
+       if (hostname)
+               (void)strncpy(utmp.ut_host, hostname, sizeof(utmp.ut_host));
+       (void)strncpy(utmp.ut_line, tty, sizeof(utmp.ut_line));
+       login(&utmp);

 
        dolastlog(quietlog);
 
        (void)chown(ttyn, pwd->pw_uid,
            (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);
 
        dolastlog(quietlog);
 
        (void)chown(ttyn, pwd->pw_uid,
            (gr = getgrnam(TTYGRPNAME)) ? gr->gr_gid : pwd->pw_gid);

-       (void)chmod(ttyn, 0620);

        (void)setgid(pwd->pw_gid);
 
        initgroups(username, pwd->pw_gid);
        (void)setgid(pwd->pw_gid);
 
        initgroups(username, pwd->pw_gid);


@@ -311,26 +353,32 @@ main(argc, argv)
        if (*pwd->pw_shell == '\0')
                pwd->pw_shell = _PATH_BSHELL;
 
        if (*pwd->pw_shell == '\0')
                pwd->pw_shell = _PATH_BSHELL;
 

-       /* destroy environment unless user has requested preservation */
+       /* Destroy environment unless user has requested its preservation. */

        if (!pflag)
                environ = envinit;
        (void)setenv("HOME", pwd->pw_dir, 1);
        (void)setenv("SHELL", pwd->pw_shell, 1);
        if (term[0] == '\0')
        if (!pflag)
                environ = envinit;
        (void)setenv("HOME", pwd->pw_dir, 1);
        (void)setenv("SHELL", pwd->pw_shell, 1);
        if (term[0] == '\0')

-               strncpy(term, stypeof(tty), sizeof(term));
+               (void)strncpy(term, stypeof(tty), sizeof(term));

        (void)setenv("TERM", term, 0);
        (void)setenv("TERM", term, 0);

+       (void)setenv("LOGNAME", pwd->pw_name, 1);

        (void)setenv("USER", pwd->pw_name, 1);
        (void)setenv("PATH", _PATH_DEFPATH, 0);
        (void)setenv("USER", pwd->pw_name, 1);
        (void)setenv("PATH", _PATH_DEFPATH, 0);

+#ifdef KERBEROS
+       if (krbtkfile_env)
+               (void)setenv("KRBTKFILE", krbtkfile_env, 1);
+#endif

 
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);
 
        if (tty[sizeof("tty")-1] == 'd')
                syslog(LOG_INFO, "DIALUP %s, %s", tty, pwd->pw_name);

-       /* if fflag is on, assume caller/authenticator has logged root login */
-       if (pwd->pw_uid == 0 && fflag == 0)
+
+       /* If fflag is on, assume caller/authenticator has logged root login. */
+       if (rootlogin && fflag == 0)

                if (hostname)
                if (hostname)

-                       syslog(LOG_NOTICE, "ROOT LOGIN ON %s FROM %s",
-                           tty, hostname);
+                       syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s FROM %s",
+                           username, tty, hostname);

                else
                else

-                       syslog(LOG_NOTICE, "ROOT LOGIN ON %s", tty);
+                       syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s", username, tty);

 
 #ifdef KERBEROS
        if (!quietlog && notickets == 1)
 
 #ifdef KERBEROS
        if (!quietlog && notickets == 1)


@@ -338,10 +386,13 @@ main(argc, argv)
 #endif
 
        if (!quietlog) {
 #endif
 
        if (!quietlog) {

-               struct stat st;
-
+               (void)printf("%s\n\t%s  %s\n\n",
+           "Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994",
+                   "The Regents of the University of California. ",
+                   "All rights reserved.");

                motd();
                motd();

-               (void)sprintf(tbuf, "%s/%s", _PATH_MAILDIR, pwd->pw_name);
+               (void)snprintf(tbuf,
+                   sizeof(tbuf), "%s/%s", _PATH_MAILDIR, pwd->pw_name);

                if (stat(tbuf, &st) == 0 && st.st_size != 0)
                        (void)printf("You have %smail.\n",
                            (st.st_mtime > st.st_atime) ? "new " : "");
                if (stat(tbuf, &st) == 0 && st.st_size != 0)
                        (void)printf("You have %smail.\n",
                            (st.st_mtime > st.st_atime) ? "new " : "");


@@ -353,25 +404,34 @@ main(argc, argv)
        (void)signal(SIGTSTP, SIG_IGN);
 
        tbuf[0] = '-';
        (void)signal(SIGTSTP, SIG_IGN);
 
        tbuf[0] = '-';

-       strcpy(tbuf + 1, (p = rindex(pwd->pw_shell, '/')) ?
+       (void)strcpy(tbuf + 1, (p = strrchr(pwd->pw_shell, '/')) ?

            p + 1 : pwd->pw_shell);
 
        if (setlogin(pwd->pw_name) < 0)
                syslog(LOG_ERR, "setlogin() failure: %m");
 
            p + 1 : pwd->pw_shell);
 
        if (setlogin(pwd->pw_name) < 0)
                syslog(LOG_ERR, "setlogin() failure: %m");
 

-       /* discard permissions last so can't get killed and drop core */
-       (void)setuid(pwd->pw_uid);
+       /* Discard permissions last so can't get killed and drop core. */
+       if (rootlogin)
+               (void) setuid(0);
+       else
+               (void) setuid(pwd->pw_uid);

 
        execlp(pwd->pw_shell, tbuf, 0);
 
        execlp(pwd->pw_shell, tbuf, 0);

-       (void)fprintf(stderr, "login: no shell: %s.\n", strerror(errno));
-       exit(0);
+       err(1, "%s", pwd->pw_shell);

 }
 
 }
 

+#ifdef KERBEROS
+#define        NBUFSIZ         (UT_NAMESIZE + 1 + 5)   /* .root suffix */
+#else
+#define        NBUFSIZ         (UT_NAMESIZE + 1)
+#endif
+
+void

 getloginname()
 {
 getloginname()
 {

-       register int ch;
-       register char *p;
-       static char nbuf[UT_NAMESIZE + 1];
+       int ch;
+       char *p;
+       static char nbuf[NBUFSIZ];

 
        for (;;) {
                (void)printf("login: ");
 
        for (;;) {
                (void)printf("login: ");


@@ -380,7 +440,7 @@ getloginname()
                                badlogin(username);
                                exit(0);
                        }
                                badlogin(username);
                                exit(0);
                        }

-                       if (p < nbuf + UT_NAMESIZE)
+                       if (p < nbuf + (NBUFSIZ - 1))

                                *p++ = ch;
                }
                if (p > nbuf)
                                *p++ = ch;
                }
                if (p > nbuf)


@@ -395,28 +455,22 @@ getloginname()
        }
 }
 
        }
 }
 

-void
-timedout()
-{
-       (void)fprintf(stderr, "Login timed out after %d seconds\n", timeout);
-       exit(0);
-}
-
+int

 rootterm(ttyn)
        char *ttyn;
 {
        struct ttyent *t;
 
 rootterm(ttyn)
        char *ttyn;
 {
        struct ttyent *t;
 

-       return((t = getttynam(ttyn)) && t->ty_status&TTY_SECURE);
+       return ((t = getttynam(ttyn)) && t->ty_status & TTY_SECURE);

 }
 
 jmp_buf motdinterrupt;
 
 }
 
 jmp_buf motdinterrupt;
 

+void

 motd()
 {
 motd()
 {

-       register int fd, nchars;
+       int fd, nchars;

        sig_t oldint;
        sig_t oldint;

-       int sigint();

        char tbuf[8192];
 
        if ((fd = open(_PATH_MOTDFILE, O_RDONLY, 0)) < 0)
        char tbuf[8192];
 
        if ((fd = open(_PATH_MOTDFILE, O_RDONLY, 0)) < 0)


@@ -429,14 +483,29 @@ motd()
        (void)close(fd);
 }
 
        (void)close(fd);
 }
 

-sigint()
+/* ARGSUSED */
+void
+sigint(signo)
+       int signo;

 {
 {

+

        longjmp(motdinterrupt, 1);
 }
 
        longjmp(motdinterrupt, 1);
 }
 

+/* ARGSUSED */
+void
+timedout(signo)
+       int signo;
+{
+
+       (void)fprintf(stderr, "Login timed out after %d seconds\n", timeout);
+       exit(0);
+}
+
+void

 checknologin()
 {
 checknologin()
 {

-       register int fd, nchars;
+       int fd, nchars;

        char tbuf[8192];
 
        if ((fd = open(_PATH_NOLOGIN, O_RDONLY, 0)) >= 0) {
        char tbuf[8192];
 
        if ((fd = open(_PATH_NOLOGIN, O_RDONLY, 0)) >= 0) {


@@ -446,12 +515,12 @@ checknologin()
        }
 }
 
        }
 }
 

+void

 dolastlog(quiet)
        int quiet;
 {
        struct lastlog ll;
        int fd;
 dolastlog(quiet)
        int quiet;
 {
        struct lastlog ll;
        int fd;

-       char *ctime();

 
        if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
                (void)lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
 
        if ((fd = open(_PATH_LASTLOG, O_RDWR, 0)) >= 0) {
                (void)lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);


@@ -462,34 +531,45 @@ dolastlog(quiet)
                                    24-5, (char *)ctime(&ll.ll_time));
                                if (*ll.ll_host != '\0')
                                        (void)printf("from %.*s\n",
                                    24-5, (char *)ctime(&ll.ll_time));
                                if (*ll.ll_host != '\0')
                                        (void)printf("from %.*s\n",

-                                           sizeof(ll.ll_host), ll.ll_host);
+                                           (int)sizeof(ll.ll_host),
+                                           ll.ll_host);

                                else
                                        (void)printf("on %.*s\n",
                                else
                                        (void)printf("on %.*s\n",

-                                           sizeof(ll.ll_line), ll.ll_line);
+                                           (int)sizeof(ll.ll_line),
+                                           ll.ll_line);

                        }
                        (void)lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
                }
                        }
                        (void)lseek(fd, (off_t)pwd->pw_uid * sizeof(ll), L_SET);
                }

-               bzero((void *)&ll, sizeof(ll));
+               memset((void *)&ll, 0, sizeof(ll));

                (void)time(&ll.ll_time);
                (void)time(&ll.ll_time);

-               strncpy(ll.ll_line, tty, sizeof(ll.ll_line));
+               (void)strncpy(ll.ll_line, tty, sizeof(ll.ll_line));

                if (hostname)
                if (hostname)

-                       strncpy(ll.ll_host, hostname, sizeof(ll.ll_host));
+                       (void)strncpy(ll.ll_host, hostname, sizeof(ll.ll_host));

                (void)write(fd, (char *)&ll, sizeof(ll));
                (void)close(fd);
        }
 }
 
                (void)write(fd, (char *)&ll, sizeof(ll));
                (void)close(fd);
        }
 }
 

+void

 badlogin(name)
        char *name;
 {
 badlogin(name)
        char *name;
 {

+

        if (failures == 0)
                return;
        if (failures == 0)
                return;

-       if (hostname)
-               syslog(LOG_NOTICE, "%d LOGIN FAILURE%s FROM %s, %s",
+       if (hostname) {
+               syslog(LOG_NOTICE, "%d LOGIN FAILURE%s FROM %s",
+                   failures, failures > 1 ? "S" : "", hostname);
+               syslog(LOG_AUTHPRIV|LOG_NOTICE,
+                   "%d LOGIN FAILURE%s FROM %s, %s",

                    failures, failures > 1 ? "S" : "", hostname, name);
                    failures, failures > 1 ? "S" : "", hostname, name);

-       else
-               syslog(LOG_NOTICE, "%d LOGIN FAILURE%s ON %s, %s",
+       } else {
+               syslog(LOG_NOTICE, "%d LOGIN FAILURE%s ON %s",
+                   failures, failures > 1 ? "S" : "", tty);
+               syslog(LOG_AUTHPRIV|LOG_NOTICE,
+                   "%d LOGIN FAILURE%s ON %s, %s",

                    failures, failures > 1 ? "S" : "", tty, name);
                    failures, failures > 1 ? "S" : "", tty, name);

+       }

 }
 
 #undef UNKNOWN
 }
 
 #undef UNKNOWN


@@ -501,12 +581,14 @@ stypeof(ttyid)
 {
        struct ttyent *t;
 
 {
        struct ttyent *t;
 

-       return(ttyid && (t = getttynam(ttyid)) ? t->ty_type : UNKNOWN);
+       return (ttyid && (t = getttynam(ttyid)) ? t->ty_type : UNKNOWN);

 }
 
 }
 

+void

 sleepexit(eval)
        int eval;
 {
 sleepexit(eval)
        int eval;
 {

-       sleep((u_int)5);
+
+       (void)sleep(5);

        exit(eval);
 }
        exit(eval);
 }