diff options
| author | ache <ache@FreeBSD.org> | 2002-04-23 12:36:11 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2002-04-23 12:36:11 +0000 |
| commit | 162e53dcfef2b11da812009e1267cf700c240669 (patch) | |
| tree | 3648e951f240936c83708423b4dc7d1eb7d4b392 /crypto/openssh | |
| parent | 90094c67a16d89b3653201488f9e98ee89d6623a (diff) | |
| download | FreeBSD-src-162e53dcfef2b11da812009e1267cf700c240669.zip FreeBSD-src-162e53dcfef2b11da812009e1267cf700c240669.tar.gz | |
1) Proberly conditionalize PAM "last login" printout.
2) For "copyright" case #ifdef HAVE_LOGIN_CAP was placed on too big block,
narrow it down.
3) Don't check the same conditions twice (for "copyright" and "welcome"),
put them under single block.
4) Print \n between "copyright" and "welcome" as our login does.
Reviewed by: des (1)
Diffstat (limited to 'crypto/openssh')
| -rw-r--r-- | crypto/openssh/session.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 2901242..eddcf6c 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -619,9 +619,6 @@ do_login(Session *s, const char *command) #ifndef USE_PAM pid_t pid = getpid(); #endif -#ifdef HAVE_LOGIN_CAP - const char *fname; -#endif /* HAVE_LOGIN_CAP */ #ifdef __FreeBSD__ #define DEFAULT_WARN (2L * 7L * 86400L) /* Two weeks */ struct timeval tv; @@ -671,10 +668,6 @@ do_login(Session *s, const char *command) do_pam_chauthtok(); } #endif -#ifdef USE_PAM - if (!check_quietlogin(s, command) && !pam_password_change_required()) - print_pam_messages(); -#endif /* USE_PAM */ #ifdef __FreeBSD__ if (pw->pw_change || pw->pw_expire) (void)gettimeofday(&tv, NULL); @@ -736,7 +729,12 @@ do_login(Session *s, const char *command) } #endif /* HAVE_LOGIN_CAP */ -#ifndef USE_PAM +#ifdef USE_PAM + if (command == NULL && options.print_lastlog && + !check_quietlogin(s, command) && + !options.use_login && !pam_password_change_required()) + print_pam_messages(); +#else /* !USE_PAM */ /* * If the user has logged in before, display the time of last * login. However, don't display anything extra if a command @@ -759,30 +757,29 @@ do_login(Session *s, const char *command) } #endif /* !USE_PAM */ -#ifdef HAVE_LOGIN_CAP if (command == NULL && !check_quietlogin(s, command) && !options.use_login) { - fname = login_getcapstr(lc, "copyright", NULL, NULL); +#ifdef HAVE_LOGIN_CAP + const char *fname = login_getcapstr(lc, "copyright", NULL, NULL); if (fname != NULL && (f = fopen(fname, "r")) != NULL) { while (fgets(buf, sizeof(buf), f) != NULL) fputs(buf, stdout); fclose(f); } else +#endif /* HAVE_LOGIN_CAP */ (void)printf("%s\n\t%s %s\n", "Copyright (c) 1980, 1983, 1986, 1988, 1990, 1991, 1993, 1994", "The Regents of the University of California. ", "All rights reserved."); - } -#endif /* HAVE_LOGIN_CAP */ - + (void)printf("\n"); /* * Print /etc/motd unless a command was specified or printing * it was disabled in server options or login(1) will be * used. Note that some machines appear to print it in * /etc/profile or similar. */ - if (command == NULL && !check_quietlogin(s, command) && !options.use_login) do_motd(); + } } /* |
