From e5d801b2d6aab34943ecb74550a852aa69c82f38 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 20 Apr 2004 09:46:41 +0000 Subject: Resolve conflicts. --- crypto/openssh/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'crypto/openssh/session.c') 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 /* -- cgit v1.1