diff options
author | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2006-03-22 20:41:37 +0000 |
commit | 7c07891caf91823c65d0ed7f700a1cfe983e15cc (patch) | |
tree | fb276a713da5dc24fdafffe04d15c0de14e138e2 /crypto/openssh/sshconnect2.c | |
parent | c2efe9a3053e865e5c7bf36de808ec154ddb8c36 (diff) | |
download | FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.zip FreeBSD-src-7c07891caf91823c65d0ed7f700a1cfe983e15cc.tar.gz |
Merge conflicts.
Diffstat (limited to 'crypto/openssh/sshconnect2.c')
-rw-r--r-- | crypto/openssh/sshconnect2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openssh/sshconnect2.c b/crypto/openssh/sshconnect2.c index ee7932d..adf9672 100644 --- a/crypto/openssh/sshconnect2.c +++ b/crypto/openssh/sshconnect2.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect2.c,v 1.142 2005/08/30 22:08:05 djm Exp $"); +RCSID("$OpenBSD: sshconnect2.c,v 1.143 2005/10/14 02:17:59 stevesk Exp $"); #include "openbsd-compat/sys-queue.h" @@ -702,7 +702,7 @@ input_gssapi_error(int type, u_int32_t plen, void *ctxt) packet_check_eom(); - debug("Server GSSAPI Error:\n%s\n", msg); + debug("Server GSSAPI Error:\n%s", msg); xfree(msg); xfree(lang); } |