RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2003/08/31 13:29:05 

[session.c]
     call ssh_gssapi_storecreds conditionally from do_exec();
     with sxw@inf.ed.ac.uk
This commit is contained in:
Damien Miller 2003-09-02 22:55:45 +10:00
parent b5829f56eb
commit 324948b320
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -22,6 +22,10 @@
- markus@cvs.openbsd.org 2003/08/31 12:14:22 - markus@cvs.openbsd.org 2003/08/31 12:14:22
[progressmeter.c] [progressmeter.c]
do write to buf[-1] do write to buf[-1]
- markus@cvs.openbsd.org 2003/08/31 13:29:05
[session.c]
call ssh_gssapi_storecreds conditionally from do_exec();
with sxw@inf.ed.ac.uk
20030829 20030829
- (bal) openbsd-compat/ clean up. Considate headers, add in Id on our - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@ -937,4 +941,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2925 2003/09/02 12:53:32 djm Exp $ $Id: ChangeLog,v 1.2926 2003/09/02 12:55:45 djm Exp $

22
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.162 2003/08/28 12:54:34 markus Exp $"); RCSID("$OpenBSD: session.c,v 1.163 2003/08/31 13:29:05 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -394,12 +394,6 @@ do_exec_no_pty(Session *s, const char *command)
session_proctitle(s); session_proctitle(s);
#ifdef GSSAPI
temporarily_use_uid(s->pw);
ssh_gssapi_storecreds();
restore_uid();
#endif
#if defined(USE_PAM) #if defined(USE_PAM)
if (options.use_pam) { if (options.use_pam) {
do_pam_session(s->pw->pw_name, NULL); do_pam_session(s->pw->pw_name, NULL);
@ -529,12 +523,6 @@ do_exec_pty(Session *s, const char *command)
ptyfd = s->ptyfd; ptyfd = s->ptyfd;
ttyfd = s->ttyfd; ttyfd = s->ttyfd;
#ifdef GSSAPI
temporarily_use_uid(s->pw);
ssh_gssapi_storecreds();
restore_uid();
#endif
#if defined(USE_PAM) #if defined(USE_PAM)
if (options.use_pam) { if (options.use_pam) {
do_pam_session(s->pw->pw_name, s->tty); do_pam_session(s->pw->pw_name, s->tty);
@ -663,6 +651,14 @@ do_exec(Session *s, const char *command)
debug("Forced command '%.900s'", command); debug("Forced command '%.900s'", command);
} }
#ifdef GSSAPI
if (options.gss_authentication) {
temporarily_use_uid(s->pw);
ssh_gssapi_storecreds();
restore_uid();
}
#endif
if (s->ttyfd != -1) if (s->ttyfd != -1)
do_exec_pty(s, command); do_exec_pty(s, command);
else else