wrap implicit username code in #ifdef GSI for now, since Kerberos

doesn't support it yet

diff --git a/openssh/sshconnect2.c b/openssh/sshconnect2.c
index fc30f4d479706f0603a8403d4447d9757997e793..5c4943f87f50ff2c0428e6d1315507636c072e0d 100644 (file)
--- a/openssh/sshconnect2.c
+++ b/openssh/sshconnect2.c
@@ -519,11 +519,15 @@ userauth_gssapi(Authctxt *authctxt)
        authctxt->methoddata=(void *)gssctxt;
                
        packet_start(SSH2_MSG_USERAUTH_REQUEST);
+#ifdef GSI
         if(options.implicit && !(datafellows & SSH_BUG_GSS_EMPTYUSER)) {
            packet_put_cstring("");
        } else {
+#endif
            packet_put_cstring(authctxt->server_user);
+#ifdef GSI
        }
+#endif
        packet_put_cstring(authctxt->service);
         packet_put_cstring(authctxt->method->name);
 
@@ -634,11 +638,15 @@ userauth_external(Authctxt *authctxt)
                                 
         debug2("userauth_external");
         packet_start(SSH2_MSG_USERAUTH_REQUEST);
+#ifdef GSI
         if(options.implicit && !(datafellows & SSH_BUG_GSS_EMPTYUSER)) {
            packet_put_cstring("");
        } else {
+#endif
            packet_put_cstring(authctxt->server_user);
+#ifdef GSI
        }
+#endif
         packet_put_cstring(authctxt->service);
         packet_put_cstring(authctxt->method->name);
         packet_send();