minor updates from Simon's openssh-3.6.1p2-gssapi-20030430.diff patch

diff --git a/openssh/auth2-gss.c b/openssh/auth2-gss.c
index 4204528cc64682966f8e063688a296c28de298fb..abbb3822a95285918ea59cdff5a5a5a2d6c0b2ae 100644 (file)
--- a/openssh/auth2-gss.c
+++ b/openssh/auth2-gss.c
@@ -157,14 +157,14 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
         Gssctxt *gssctxt;
         gss_buffer_desc send_tok,recv_tok;
         OM_uint32 maj_status, min_status;
-       int len;
+        u_int len;
         
         if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
                 fatal("No authentication or GSSAPI context");
                 
         gssctxt=authctxt->methoddata;
         recv_tok.value=packet_get_string(&len);
-        recv_tok.length=len; /* int vs. size_t */
+        recv_tok.length=len; /* u_int vs. size_t */
         
         maj_status=PRIVSEP(ssh_gssapi_accept_ctx(gssctxt, &recv_tok, 
                                                 &send_tok, NULL));

diff --git a/openssh/kex.h b/openssh/kex.h
index d907e5ab10f86535dcacb1df7403a3e0de27f34f..50b8659e9bb4f50a20f2ff85101f5bae27b612f7 100644 (file)
--- a/openssh/kex.h
+++ b/openssh/kex.h
@@ -114,7 +114,6 @@ struct Kex {
        Buffer  peer;
        int     done;
        int     flags;
-       char    *host;
        char    *client_version_string;
        char    *server_version_string;
        struct  KexOptions options;

diff --git a/openssh/kexgssc.c b/openssh/kexgssc.c
index b5afa52a76d07ca39570f8daa22938aa12aae674..52b569f62febe5cb19ddb33ce8c95998c8e0df45 100644 (file)
--- a/openssh/kexgssc.c
+++ b/openssh/kexgssc.c
@@ -36,9 +36,9 @@
 #include "log.h"
 #include "packet.h"
 #include "dh.h"
+#include "canohost.h"
 #include "ssh2.h"
 #include "ssh-gss.h"
-#include "canohost.h"
 
 void
 kexgss_client(Kex *kex)
@@ -57,13 +57,15 @@ kexgss_client(Kex *kex)
        char *lang;
        int type = 0;
        int first = 1;
-       int slen = 0, strlen;
+       int slen = 0;
+       u_int strlen;
        
        /* Initialise our GSSAPI world */
        ssh_gssapi_build_ctx(&ctxt);
        if (ssh_gssapi_client_id_kex(ctxt,kex->name)==NULL) {
                fatal("Couldn't identify host exchange");
        }
+
        if (ssh_gssapi_import_name(ctxt,get_canonical_hostname(1))) {
                fatal("Couldn't import hostname ");
        }
@@ -92,7 +94,6 @@ kexgss_client(Kex *kex)
 
                if (GSS_ERROR(maj_status)) {
                        if (send_tok.length!=0) {
-                               /* Hmmm - not sure about this */
                                packet_start(SSH2_MSG_KEXGSS_CONTINUE);
                                packet_put_string(send_tok.value,
                                                  send_tok.length);
@@ -148,19 +149,19 @@ kexgss_client(Kex *kex)
                                if (maj_status == GSS_S_COMPLETE) 
                                        fatal("GSSAPI Continue received from server when complete");
                                recv_tok.value=packet_get_string(&strlen);
-                               recv_tok.length=strlen; /* int vs. size_t */
+                               recv_tok.length=strlen; /* u_int vs. size_t */
                                break;
                        case SSH2_MSG_KEXGSS_COMPLETE:
                                debug("Received GSSAPI_COMPLETE");
                                packet_get_bignum2(dh_server_pub);
                                msg_tok.value=packet_get_string(&strlen);
-                               msg_tok.length=strlen; /* int vs. size_t */
+                               msg_tok.length=strlen; /* u_int vs. size_t */
 
                                /* Is there a token included? */
                                if (packet_get_char()) {
                                        recv_tok.value=
                                            packet_get_string(&strlen);
-                                       recv_tok.length=strlen; /*int/size_t*/
+                                       recv_tok.length=strlen; /*u_int/size_t*/
                                        /* If we're already complete - protocol error */
                                        if (maj_status == GSS_S_COMPLETE)
                                                packet_disconnect("Protocol error: received token when complete");

diff --git a/openssh/monitor.c b/openssh/monitor.c
index 643487167801294b1be4f52aabb5c6ce18cc3ac9..25fbd748629a35a6214bd90f4ab16c0ea895a933 100644 (file)
--- a/openssh/monitor.c
+++ b/openssh/monitor.c
@@ -1730,7 +1730,7 @@ int
 mm_answer_gss_setup_ctx(int socket, Buffer *m) {
         gss_OID_desc oid;
         OM_uint32 major;
-       int len;
+        u_int len;
 
         oid.elements=buffer_get_string(m,&len);
        oid.length=len;

diff --git a/openssh/monitor_wrap.c b/openssh/monitor_wrap.c
index b68003287135e495c0ee2f501e18f3de11611f59..6c16863f606e6627747abb8c57d00a9d52f344cd 100644 (file)
--- a/openssh/monitor_wrap.c
+++ b/openssh/monitor_wrap.c
@@ -1072,8 +1072,8 @@ mm_ssh_gssapi_userok(char *user) {
         int authenticated = 0;
 
         buffer_init(&m);
+        
         mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, &m);
-
         mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUSEROK,
                                   &m);
 
@@ -1134,6 +1134,8 @@ mm_gss_indicate_mechs(OM_uint32 *minor_status, gss_OID_set *mech_set)
        OM_uint32 major,minor;
        int count;
        gss_OID_desc oid;
+        u_int length;
+
        buffer_init(&m);
 
        mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSMECHS, &m);
@@ -1144,7 +1146,6 @@ mm_gss_indicate_mechs(OM_uint32 *minor_status, gss_OID_set *mech_set)
        
         gss_create_empty_oid_set(&minor,mech_set);
        while(count-->0) {
-           u_int length;
            oid.elements=buffer_get_string(&m,&length);
            oid.length=length;
            gss_add_oid_set_member(&minor,&oid,mech_set);

diff --git a/openssh/ssh-gss.h b/openssh/ssh-gss.h
index 5dbf7f1eba68ac163627d4c658a6cb1a383d3b5a..87f6c491614999d24e19f0c1780575bfc0d26735 100644 (file)
--- a/openssh/ssh-gss.h
+++ b/openssh/ssh-gss.h
@@ -38,7 +38,6 @@
 #include <gssapi_generic.h>
 
 /* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */
-
 #ifndef GSS_C_NT_HOSTBASED_SERVICE
 #define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
 #endif /* GSS_C_NT_... */

diff --git a/openssh/sshconnect2.c b/openssh/sshconnect2.c
index b5d1ba1010425a62bbe9054558ae7335a322d5ad..cc6563f68a8e0f34bf1efb1a36918d773f251116 100644 (file)
--- a/openssh/sshconnect2.c
+++ b/openssh/sshconnect2.c
@@ -155,7 +155,6 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
        kex->client_version_string=client_version_string;
        kex->server_version_string=server_version_string;
        kex->verify_host_key=&verify_host_key_callback;
-       kex->host=host;
 #ifdef GSSAPI
        kex->options.gss_deleg_creds=options.gss_deleg_creds;
 #endif