merged OPENSSH_3_7_1P2_GSSAPI_20040123 to GPT-branch

diff --git a/openssh/CVSNOTES b/openssh/CVSNOTES
index f1e5144714a2e4f333cb3fc55b7331f25d3a4dd4..d99971c0a0e8d398dfa33ebaac3d07cd9d5d3377 100644 (file)
--- a/openssh/CVSNOTES
+++ b/openssh/CVSNOTES
@@ -53,6 +53,14 @@ contains the GSI-OpenSSH code.  Consider it a living document.
 
   [ History ]
 
+    2004/01/23
+    ----------
+      Action: Merge
+        - occurred on: GPT branch
+        - orig base: OPENSSH_3_7_1P2_GSSAPI_20040119
+        - new base: OPENSSH_3_7_1P2_GSSAPI_20040123
+      Conflicts: 0
+
     2004/01/19
     ----------
       Action: Merge

diff --git a/openssh/auth2.c b/openssh/auth2.c
index 7c0dc57ecbb1270583e7ea6c1919eec226283e09..d073ba2fd714bf37be2ff9f397428f4198d915b5 100644 (file)
--- a/openssh/auth2.c
+++ b/openssh/auth2.c
@@ -30,7 +30,6 @@ RCSID("$OpenBSD: auth2.c,v 1.102 2003/08/26 09:58:43 markus Exp $");
 #include "packet.h"
 #include "log.h"
 #include "servconf.h"
-#include "compat.h"
 #include "auth.h"
 #include "dispatch.h"
 #include "pathnames.h"

diff --git a/openssh/gss-genr.c b/openssh/gss-genr.c
index 1d08e5b1ba101431fb26755b01e5ed1eb8f6566b..a6b721a4e68af8559bee085c989f9628230b9692 100644 (file)
--- a/openssh/gss-genr.c
+++ b/openssh/gss-genr.c
@@ -384,7 +384,7 @@ ssh_gssapi_import_name(Gssctxt *ctx, const char *host)
        
        gssbuf.length = sizeof("host@") + strlen(xhost);
        gssbuf.value = xmalloc(gssbuf.length);
-       snprintf(gssbuf.value, gssbuf.length, "host@%s", host);
+       snprintf(gssbuf.value, gssbuf.length, "host@%s", xhost);
 
        if ((ctx->major = gss_import_name(&ctx->minor,
            &gssbuf, GSS_C_NT_HOSTBASED_SERVICE, &ctx->name)))

diff --git a/openssh/sshconnect2.c b/openssh/sshconnect2.c
index b7ea9e855100f8dd11c9dcd1a0dbc0a53f657251..e2acc7a173abf39e0264efea11e8608120418f05 100644 (file)
--- a/openssh/sshconnect2.c
+++ b/openssh/sshconnect2.c
@@ -93,15 +93,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
 
 #ifdef GSSAPI
        if (options.gss_keyex) {
-       char *canonhost;
        /* Add the GSSAPI mechanisms currently supported on this client to
         * the key exchange algorithm proposal */
        orig = myproposal[PROPOSAL_KEX_ALGS];
-       canonhost = xstrdup(get_canonical_hostname(1));
-       resolve_localhost(&canonhost);
-       gss = ssh_gssapi_client_mechanisms(canonhost);
-       xfree(canonhost);
-       canonhost=NULL;
+       gss = ssh_gssapi_client_mechanisms((char *)get_canonical_hostname(1));
        if (gss) {
           len = strlen(orig)+strlen(gss)+2;
           myproposal[PROPOSAL_KEX_ALGS]=xmalloc(len);