diff options
| author | nw141292 <none@none> | 2006-04-10 11:21:09 -0700 |
|---|---|---|
| committer | nw141292 <none@none> | 2006-04-10 11:21:09 -0700 |
| commit | 55837012c4ad060d5e73ac667219a43d58229b4e (patch) | |
| tree | cb9d777c0e1c95c20eaea09c87ff2838f3c23935 /usr/src/cmd/ssh/libssh/common/kexgsss.c | |
| parent | 44cd46cadd9aab751dae6a4023c1cb5bf316d274 (diff) | |
| download | illumos-gate-55837012c4ad060d5e73ac667219a43d58229b4e.tar.gz | |
6241781 sshd does not gss_store_cred() credentials delegated in re-keys
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/kexgsss.c')
| -rw-r--r-- | usr/src/cmd/ssh/libssh/common/kexgsss.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/kexgsss.c b/usr/src/cmd/ssh/libssh/common/kexgsss.c index d777874feb..e6a6d67e61 100644 --- a/usr/src/cmd/ssh/libssh/common/kexgsss.c +++ b/usr/src/cmd/ssh/libssh/common/kexgsss.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -46,8 +46,10 @@ #include "ssh2.h" #include "ssh-gss.h" #include "monitor_wrap.h" +#include "auth.h" Gssctxt *xxx_gssctxt; +extern Authctxt *x_authctxt; static void kex_gss_send_error(Gssctxt *ctxt); @@ -88,9 +90,9 @@ kexgss_server(Kex *kex) fatal("Couldn't match the negotiated GSS key exchange"); } - ssh_gssapi_build_ctx(&ctxt, 0, oid); + ssh_gssapi_build_ctx(&xxx_gssctxt, 0, oid); - xxx_gssctxt = ctxt; + ctxt = xxx_gssctxt; do { debug("Wait SSH2_MSG_GSSAPI_INIT"); @@ -194,6 +196,8 @@ kexgss_server(Kex *kex) kex->session_id_len = 20; kex->session_id = xmalloc(kex->session_id_len); (void) memcpy(kex->session_id, hash, kex->session_id_len); + } else if (x_authctxt != NULL && x_authctxt->success) { + ssh_gssapi_storecreds(ctxt, x_authctxt); } /* Should fix kex_dh_hash to output hash length */ |