remove BSD ifdefs

SCCS-vsn: usr.bin/login/login.c 5.45

diff --git a/usr/src/usr.bin/login/login.c b/usr/src/usr.bin/login/login.c
index 625a3aa..7e9b8c9 100644 (file)
--- a/usr/src/usr.bin/login/login.c
+++ b/usr/src/usr.bin/login/login.c
@@ -22,7 +22,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)login.c    5.44 (Berkeley) %G%";
+static char sccsid[] = "@(#)login.c    5.45 (Berkeley) %G%";

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


@@ -344,7 +344,6 @@ main(argc, argv)
                (void)printf("Logging in with home = \"/\".\n");
        }
 
                (void)printf("Logging in with home = \"/\".\n");
        }
 

-#if BSD > 43

 #define        TWOWEEKS        (14*24*60*60)
        if (pwd->pw_change || pwd->pw_expire)
                (void)gettimeofday(&tp, (struct timezone *)NULL);
 #define        TWOWEEKS        (14*24*60*60)
        if (pwd->pw_change || pwd->pw_expire)
                (void)gettimeofday(&tp, (struct timezone *)NULL);


@@ -395,7 +394,6 @@ main(argc, argv)
                            months[ttp->tm_mon], ttp->tm_mday,
                            TM_YEAR_BASE + ttp->tm_year);
                }
                            months[ttp->tm_mon], ttp->tm_mday,
                            TM_YEAR_BASE + ttp->tm_year);
                }

-#endif

 
        /* nothing else left to fail -- really log in */
        {
 
        /* nothing else left to fail -- really log in */
        {


@@ -469,10 +467,8 @@ main(argc, argv)
        strcpy(tbuf + 1, (p = rindex(pwd->pw_shell, '/')) ?
            p + 1 : pwd->pw_shell);
 
        strcpy(tbuf + 1, (p = rindex(pwd->pw_shell, '/')) ?
            p + 1 : pwd->pw_shell);
 

-#if    BSD > 43

        if (setlogname(pwd->pw_name, strlen(pwd->pw_name)) < 0)
                syslog(LOG_ERR, "setlogname() failure: %m");
        if (setlogname(pwd->pw_name, strlen(pwd->pw_name)) < 0)
                syslog(LOG_ERR, "setlogname() failure: %m");

-#endif

 
        /* 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 */
        (void)setuid(pwd->pw_uid);