diff options
author | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2004-04-20 09:46:41 +0000 |
commit | e5d801b2d6aab34943ecb74550a852aa69c82f38 (patch) | |
tree | 052572b83faf3cab81bed572534efc6912debcbf /crypto/openssh/session.c | |
parent | efa35724649769e9a081ef6970590dd0b0a97370 (diff) | |
download | FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.zip FreeBSD-src-e5d801b2d6aab34943ecb74550a852aa69c82f38.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/session.c')
-rw-r--r-- | crypto/openssh/session.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c index 3913214..3f9049f 100644 --- a/crypto/openssh/session.c +++ b/crypto/openssh/session.c @@ -202,6 +202,7 @@ display_loginmsg(void) printf("%s\n", (char *)buffer_ptr(&loginmsg)); buffer_clear(&loginmsg); } + fflush(stdout); } void @@ -493,6 +494,13 @@ do_exec_no_pty(Session *s, const char *command) close(err[0]); /* + * Clear loginmsg, since it's the child's responsibility to display + * it to the user, otherwise multiple sessions may accumulate + * multiple copies of the login messages. + */ + buffer_clear(&loginmsg); + + /* * Enter the interactive session. Note: server_loop must be able to * handle the case that fdin and fdout are the same. */ @@ -1116,9 +1124,9 @@ do_setup_env(Session *s, const char *shell) } #endif #ifdef KRB5 - if (s->authctxt->krb5_ticket_file) + if (s->authctxt->krb5_ccname) child_set_env(&env, &envsize, "KRB5CCNAME", - s->authctxt->krb5_ticket_file); + s->authctxt->krb5_ccname); #endif #ifdef USE_PAM /* |