diff options
| author | jp161948 <none@none> | 2007-11-30 08:38:32 -0800 |
|---|---|---|
| committer | jp161948 <none@none> | 2007-11-30 08:38:32 -0800 |
| commit | 9a8058b57457911fab0e3b4b6f0a97740e7a816d (patch) | |
| tree | abc8710af81f76e7213e3c4ca6bedab695f049a3 /usr/src/cmd/ssh/libssh/common/kexgsss.c | |
| parent | e46e4715a19570ec80958ef89a3f1232c476728a (diff) | |
| download | illumos-gate-9a8058b57457911fab0e3b4b6f0a97740e7a816d.tar.gz | |
PSARC/2007/034 ssh/sshd resync with OpenSSH
5040151 ssh(1) and sshd(1M) should re-key periodically as per-recent recommendations
6492415 ignore UsePrivilegeSeparation keyword in SunSSH
6624784 a few typos in SunSSH source code or its documentation
6626371 cmd/ssh/libssh/common/xlist.c should be cstyle clean
6627880 memory leaks in SunSSH's GSS-API code
6627881 memory leaks in SunSSH's g11n code
6627884 memory leaks in SunSSH's alternative privilege separation code
6627890 memory leaks in cmd/ssh/sshd/auth2-pam.c
6628516 old OpenSSH privilege separation code is not needed in SunSSH
--HG--
rename : usr/src/cmd/ssh/include/monitor.h => deleted_files/usr/src/cmd/ssh/include/monitor.h
rename : usr/src/cmd/ssh/include/monitor_fdpass.h => deleted_files/usr/src/cmd/ssh/include/monitor_fdpass.h
rename : usr/src/cmd/ssh/include/monitor_mm.h => deleted_files/usr/src/cmd/ssh/include/monitor_mm.h
rename : usr/src/cmd/ssh/include/monitor_wrap.h => deleted_files/usr/src/cmd/ssh/include/monitor_wrap.h
rename : usr/src/cmd/ssh/libssh/common/monitor_fdpass.c => deleted_files/usr/src/cmd/ssh/libssh/common/monitor_fdpass.c
rename : usr/src/cmd/ssh/libssh/common/monitor_wrap.c => deleted_files/usr/src/cmd/ssh/libssh/common/monitor_wrap.c
rename : usr/src/cmd/ssh/sshd/monitor.c => deleted_files/usr/src/cmd/ssh/sshd/monitor.c
rename : usr/src/cmd/ssh/sshd/monitor_mm.c => deleted_files/usr/src/cmd/ssh/sshd/monitor_mm.c
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/kexgsss.c')
| -rw-r--r-- | usr/src/cmd/ssh/libssh/common/kexgsss.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/kexgsss.c b/usr/src/cmd/ssh/libssh/common/kexgsss.c index e6a6d67e61..61f3fb70f1 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 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -45,7 +45,6 @@ #include "dh.h" #include "ssh2.h" #include "ssh-gss.h" -#include "monitor_wrap.h" #include "auth.h" Gssctxt *xxx_gssctxt; @@ -127,8 +126,7 @@ kexgss_server(Kex *kex) type); } - maj_status=PRIVSEP(ssh_gssapi_accept_ctx(ctxt,&recv_tok, - &send_tok)); + maj_status = ssh_gssapi_accept_ctx(ctxt,&recv_tok, &send_tok); xfree(recv_tok.value); /* We allocated this, not gss */ |