merging OPENSSH_GSSAPI_Protocol1-branch to trunk from tag

OPENSSH_GSSAPI_Protocol1_Complete; official GSI OpenSSH now lives on the
trunk; Simon's patched version of OpenSSH can now be found on
OPENSSH_GSSAPI-branch

diff --cc openssh/auth1.c
index 1fbfad90ae8c0da76590e57724e58b5164898052,8dddfc92031deef0664a06b3d6f332173cb87d50..baf3e687dfa5610542984b9b7c508586fbe0ec61
--- 1/openssh/auth1.c
--- 2/openssh/auth1.c
+++ b/openssh/auth1.c
@@@ -373,7 -504,12 +504,12 @@@ do_authentication(void
  
        /* Get the user name. */
        user = packet_get_string(&ulen);
-       packet_integrity_check(plen, (4 + ulen), SSH_CMSG_USER);
+       packet_check_eom();
+ 
+ #ifdef GSSAPI
 -  /* Parse GSSAPI identity from userstring */
 -  user = ssh1_gssapi_parse_userstring(user);
++      /* Parse GSSAPI identity from userstring */
++      user = ssh1_gssapi_parse_userstring(user);
+ #endif /* GSSAPI */
  
        if ((style = strchr(user, ':')) != NULL)
                *style++ = '\0';

diff --cc openssh/gss-serv.c
index a433a719bff84f3cb4f194062af0cde767601c59,cce13155bbbcc3bead2799e82f3f16f11c8ce525..5409a1635784b0b0d911bb1c88c0e5b2a4560e67
--- 1/openssh/gss-serv.c
--- 2/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@@ -536,8 -555,8 +555,9 @@@ input_gssapi_token(int type, u_int32_t 
        
        if (GSS_ERROR(maj_status)) {
                /* Failure <sniff> */
 +              ssh_gssapi_send_error(maj_status,min_status);
                authctxt->postponed = 0;
+               dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, NULL);
                dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
                userauth_finish(authctxt, 0, "gssapi");
        }

diff --cc openssh/ssh-gss.h
Simple merge

diff --cc openssh/ssh.c
Simple merge