ask for login name second time around on rlogin

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

diff --git a/usr/src/usr.bin/login/login.c.1 b/usr/src/usr.bin/login/login.c.1
index 29e4687..fd607ed 100644 (file)
--- a/usr/src/usr.bin/login/login.c.1
+++ b/usr/src/usr.bin/login/login.c.1
@@ -170,10 +170,10 @@ main(argc, argv)
                tty++;
        openlog("login", LOG_ODELAY, LOG_AUTH);
        t = 0;
                tty++;
        openlog("login", LOG_ODELAY, LOG_AUTH);
        t = 0;

+       invalid = FALSE;

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

-               invalid = FALSE;

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


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

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

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

+               invalid = FALSE;

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