From 9a8058b57457911fab0e3b4b6f0a97740e7a816d Mon Sep 17 00:00:00 2001 From: jp161948 Date: Fri, 30 Nov 2007 08:38:32 -0800 Subject: 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 --- usr/src/cmd/ssh/libssh/common/ssh-gss.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'usr/src/cmd/ssh/libssh/common/ssh-gss.c') diff --git a/usr/src/cmd/ssh/libssh/common/ssh-gss.c b/usr/src/cmd/ssh/libssh/common/ssh-gss.c index 17af3f0c41..fcf8e11b51 100644 --- a/usr/src/cmd/ssh/libssh/common/ssh-gss.c +++ b/usr/src/cmd/ssh/libssh/common/ssh-gss.c @@ -21,7 +21,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. */ @@ -44,7 +44,6 @@ #include "log.h" #include "compat.h" #include "xlist.h" -#include "monitor_wrap.h" #include @@ -523,13 +522,17 @@ void ssh_gssapi_set_oid(Gssctxt *ctx, gss_OID oid) { /* All this effort to report an error ... */ void -ssh_gssapi_error(Gssctxt *ctxt, const char *where) { - if (where) - debug("GSS-API error while %s: %s", where, - ssh_gssapi_last_error(ctxt,NULL,NULL)); +ssh_gssapi_error(Gssctxt *ctxt, const char *where) +{ + char *errmsg = ssh_gssapi_last_error(ctxt, NULL, NULL); + + if (where != NULL) + debug("GSS-API error while %s: %s", where, errmsg); else - debug("GSS-API error: %s", - ssh_gssapi_last_error(ctxt,NULL,NULL)); + debug("GSS-API error: %s", errmsg); + + /* ssh_gssapi_last_error() can't return NULL */ + xfree(errmsg); } char * -- cgit v1.2.3