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 9758115..ef75733 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -1,23 +1,48 @@
 /*-
 /*-

- * Copyright (c) 1980, 1987, 1988, 1991 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.

  *
  *

- * %sccs.include.redist.c%
+ * 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, 1991 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.70 (Berkeley) %G%";
+static char sccsid[] = "@(#)login.c    8.4 (Berkeley) 4/2/94";

 #endif /* not lint */
 
 /*
  * login [ name ]
 #endif /* not lint */
 
 /*
  * login [ name ]

- * login -r hostname   (for rlogind)

  * login -h hostname   (for telnetd, etc.)
  * login -f name       (for pre-authenticated login: datakit, xterm, etc.)
  */
  * login -h hostname   (for telnetd, etc.)
  * login -f name       (for pre-authenticated login: datakit, xterm, etc.)
  */


@@ -28,27 +53,47 @@ static char sccsid[] = "@(#)login.c 5.70 (Berkeley) %G%";
 #include <sys/resource.h>
 #include <sys/file.h>
 
 #include <sys/resource.h>
 #include <sys/file.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;
-int    rootlogin;
+u_int  timeout = 300;
+

 #ifdef KERBEROS
 int    notickets = 1;
 char   *instance;
 #ifdef KERBEROS
 int    notickets = 1;
 char   *instance;


@@ -60,34 +105,24 @@ struct     passwd *pwd;
 int    failures;
 char   term[64], *envinit[1], *hostname, *username, *tty;
 
 int    failures;
 char   term[64], *envinit[1], *hostname, *username, *tty;
 

-char *months[] =
-       { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug",
-         "Sep", "Oct", "Nov", "Dec" };
-
+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;
-       struct tm *ttp;
-       struct timeval tp;
+       extern char **environ;

        struct group *gr;
        struct group *gr;

-       register int ch;
-       register char *p;
-       int ask, fflag, hflag, pflag, rflag, cnt;
-       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);


@@ -96,8 +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

-        * -r is used by rlogind to cause the autologin protocol;
-        * -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
         */


@@ -105,33 +139,20 @@ 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 = rflag = 0;
+       fflag = hflag = pflag = 0;

        uid = getuid();
        uid = getuid();

-       while ((ch = getopt(argc, argv, "fh:pr:")) != EOF)
+       while ((ch = getopt(argc, argv, "fh:p")) != EOF)

                switch (ch) {
                case 'f':
                switch (ch) {
                case 'f':

-                       if (rflag) {
-                               fprintf(stderr,
-                                   "login: only one of -r and -f allowed.\n");
-                               exit(1);
-                       }

                        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 (rflag) {
-                               fprintf(stderr,
-                                   "login: only one of -r and -h allowed.\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;


@@ -139,56 +160,32 @@ main(argc, argv)
                case 'p':
                        pflag = 1;
                        break;
                case 'p':
                        pflag = 1;
                        break;

-               case 'r':
-                       if (hflag || fflag) {
-                               fprintf(stderr,
-                                   "login: -f and -h not allowed with -r.\n");
-                               exit(1);
-                       }
-                       if (getuid()) {
-                               fprintf(stderr,
-                                   "login: -r for super-user only.\n");
-                               exit(1);
-                       }
-                       /* "-r hostname" must be last args */
-                       if (optind != argc) {
-                               fprintf(stderr, "Syntax error.\n");
-                               exit(1);
-                       }
-                       rflag = 1;
-                       passwd_req = (doremotelogin(optarg) == -1);
-                       if (domain && (p = index(optarg, '.')) &&
-                           !strcmp(p, domain))
-                               *p = '\0';
-                       hostname = optarg;
-                       break;

                case '?':
                default:
                        if (!uid)
                                syslog(LOG_ERR, "invalid flag %c", ch);
                        (void)fprintf(stderr,
                case '?':
                default:
                        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;
                ask = 0;
        } else
                ask = 1;
        if (*argv) {
                username = *argv;
                ask = 0;
        } else
                ask = 1;

-       if (rflag)
-               ask = 0;

 
        for (cnt = getdtablesize(); cnt > 2; cnt--)
 
        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;


@@ -198,15 +195,14 @@ main(argc, argv)
                        fflag = 0;
                        getloginname();
                }
                        fflag = 0;
                        getloginname();
                }

+               rootlogin = 0;

 #ifdef KERBEROS
 #ifdef KERBEROS

-               if ((instance = index(username, '.')) != NULL) {
+               if ((instance = strchr(username, '.')) != NULL) {

                        if (strncmp(instance, ".root", 5) == 0)
                        if (strncmp(instance, ".root", 5) == 0)

-                               rootlogin++;
+                               rootlogin = 1;

                        *instance++ = '\0';
                        *instance++ = '\0';

-               } else {
-                       rootlogin = 0;
+               } else

                        instance = "";
                        instance = "";

-               }

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


@@ -248,18 +244,17 @@ main(argc, argv)
                if (pwd) {
 #ifdef KERBEROS
                        rval = klogin(pwd, instance, localhost, p);
                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;
                        if (rval == 0)
                                authok = 1;

-                       else if (rval == 1) {
-                               if (pwd->pw_uid != 0)
-                                       rootlogin = 0;
+                       else if (rval == 1)

                                rval = strcmp(crypt(p, salt), pwd->pw_passwd);
                                rval = strcmp(crypt(p, salt), pwd->pw_passwd);

-                       }

 #else
                        rval = strcmp(crypt(p, salt), pwd->pw_passwd);
 #endif
                }
 #else
                        rval = strcmp(crypt(p, salt), pwd->pw_passwd);
 #endif
                }

-               bzero(p, strlen(p));
+               memset(p, 0, strlen(p));

 
                (void)setpriority(PRIO_PROCESS, 0, 0);
 
 
                (void)setpriority(PRIO_PROCESS, 0, 0);
 


@@ -306,39 +301,18 @@ main(argc, argv)
        endpwent();
 
        /* if user not super-user, check for disabled logins */
        endpwent();
 
        /* if user not super-user, check for disabled logins */

-       if (!(rootlogin))
+       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 = "/";
                (void)printf("Logging in with home = \"/\".\n");
        }
                if (chdir("/"))
                        exit(0);
                pwd->pw_dir = "/";
                (void)printf("Logging in with home = \"/\".\n");
        }

-#define        TWOWEEKS        (14*24*60*60)
-       if (pwd->pw_change || pwd->pw_expire)
-               (void)gettimeofday(&tp, (struct timezone *)NULL);
-       if (pwd->pw_change)
-               if (tp.tv_sec >= pwd->pw_change) {
-                       printf("Sorry -- your password has expired.\n");
-                       sleepexit(1);
-               }
-               else if (tp.tv_sec - pwd->pw_change < TWOWEEKS) {
-                       ttp = localtime(&pwd->pw_change);
-                       printf("Warning: your password expires on %s %d, 19%d\n",
-                           months[ttp->tm_mon], ttp->tm_mday, ttp->tm_year);
-               }
-       if (pwd->pw_expire)
-               if (tp.tv_sec >= pwd->pw_expire) {
-                       printf("Sorry -- your account has expired.\n");
-                       sleepexit(1);
-               }
-               else if (tp.tv_sec - pwd->pw_expire < TWOWEEKS) {
-                       ttp = localtime(&pwd->pw_expire);
-                       printf("Warning: your account expires on %s %d, 19%d\n",
-                           months[ttp->tm_mon], ttp->tm_mday, ttp->tm_year);
-               }
+
+       quietlog = access(_PATH_HUSHLOGIN, F_OK) == 0;

 
        if (pwd->pw_change || pwd->pw_expire)
                (void)gettimeofday(&tp, (struct timezone *)NULL);
 
        if (pwd->pw_change || pwd->pw_expire)
                (void)gettimeofday(&tp, (struct timezone *)NULL);


@@ -349,7 +323,7 @@ main(argc, argv)
                } else if (pwd->pw_change - tp.tv_sec <
                    2 * DAYSPERWEEK * SECSPERDAY && !quietlog)
                        (void)printf("Warning: your password expires on %s",
                } else if (pwd->pw_change - tp.tv_sec <
                    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");
        if (pwd->pw_expire)
                if (tp.tv_sec >= pwd->pw_expire) {
                        (void)printf("Sorry -- your account has expired.\n");


@@ -359,18 +333,14 @@ main(argc, argv)
                        (void)printf("Warning: your account expires on %s",
                            ctime(&pwd->pw_expire));
 
                        (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);
 
 
        dolastlog(quietlog);
 


@@ -383,14 +353,15 @@ 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);
 #ifdef KERBEROS
        (void)setenv("USER", pwd->pw_name, 1);
        (void)setenv("PATH", _PATH_DEFPATH, 0);
 #ifdef KERBEROS


@@ -400,7 +371,8 @@ main(argc, argv)
 
        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 fflag is on, assume caller/authenticator has logged root login. */

        if (rootlogin && fflag == 0)
                if (hostname)
                        syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s FROM %s",
        if (rootlogin && fflag == 0)
                if (hostname)
                        syslog(LOG_NOTICE, "ROOT LOGIN (%s) ON %s FROM %s",


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

-               struct stat st;
-
-               printf(
-"Copyright (c) 1980,1983,1986,1988,1990,1991 The Regents of the University\n%s",
-"of California.  All rights reserved.\n\n");
+               (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 " : "");


@@ -432,33 +404,33 @@ 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 */
+       /* 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);
        if (rootlogin)
                (void) setuid(0);
        else
                (void) setuid(pwd->pw_uid);
 
        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
 }
 
 #ifdef KERBEROS

-#define        NBUFSIZ         (UT_NAMESIZE + 1 + 5) /* .root suffix */
+#define        NBUFSIZ         (UT_NAMESIZE + 1 + 5)   /* .root suffix */

 #else
 #define        NBUFSIZ         (UT_NAMESIZE + 1)
 #endif
 
 #else
 #define        NBUFSIZ         (UT_NAMESIZE + 1)
 #endif
 

+void

 getloginname()
 {
 getloginname()
 {

-       register int ch;
-       register char *p;
+       int ch;
+       char *p;

        static char nbuf[NBUFSIZ];
 
        for (;;) {
        static char nbuf[NBUFSIZ];
 
        for (;;) {


@@ -483,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;

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


@@ -517,15 +483,29 @@ motd()
        (void)close(fd);
 }
 
        (void)close(fd);
 }
 

+/* ARGSUSED */

 void
 void

-sigint()
+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) {


@@ -535,13 +515,12 @@ checknologin()
        }
 }
 
        }
 }
 

+void

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

-       char *ctime();
-       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);


@@ -552,26 +531,30 @@ 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 (hostname) {
        if (failures == 0)
                return;
        if (hostname) {


@@ -598,55 +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);
-       exit(eval);
-}
-
-doremotelogin(host)
-       char *host;
-{
-       static char lusername[UT_NAMESIZE+1];
-       char rusername[UT_NAMESIZE+1];
-
-       getstr(rusername, sizeof(rusername), "remuser");
-       getstr(lusername, sizeof(lusername), "locuser");
-       getstr(term, sizeof(term), "Terminal type");
-       username = lusername;
-       pwd = getpwnam(username);
-       if (pwd == NULL)
-               return(-1);
-       return(ruserok(host, (pwd->pw_uid == 0), rusername, username));
-}
-
-char *speeds[] = {
-       "0", "50", "75", "110", "134", "150", "200", "300", "600",
-       "1200", "1800", "2400", "4800", "9600", "19200", "38400",
-};
-#define        NSPEEDS (sizeof(speeds) / sizeof(speeds[0]))

 
 

-doremoteterm(tp)
-       struct sgttyb *tp;
-{
-       register char *cp = index(term, '/'), **cpp;
-       char *speed;
-
-       if (cp) {
-               *cp++ = '\0';
-               speed = cp;
-               cp = index(speed, '/');
-               if (cp)
-                       *cp++ = '\0';
-               for (cpp = speeds; cpp < &speeds[NSPEEDS]; cpp++)
-                       if (strcmp(*cpp, speed) == 0) {
-                               tp->sg_ispeed = tp->sg_ospeed = cpp-speeds;
-                               break;
-                       }
-       }
-       tp->sg_flags = ECHO|CRMOD|ANYP|XTABS;
+       (void)sleep(5);
+       exit(eval);

 }
 }