revision: solve the compilation problem when both GSI and Kerberos are supported...

[gssapi-openssh.git] / openssh / gss-serv.c

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index cce13155bbbcc3bead2799e82f3f16f11c8ce525..ceef7dc7054cdff1c958b1bf9d93db444441c07c 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -249,7 +249,7 @@ ssh_gssapi_krb5_storecreds() {
 #endif /* KRB5 */
 
 #ifdef GSI
-#include <globus_gss_assist.h>
+#include "globus_gss_assist_gsi.h"
 
 /*
  * Check if this user is OK to login under GSI. User has been authenticated
@@ -363,16 +363,16 @@ void
 ssh_gssapi_storecreds()
 {
        switch (gssapi_client_type) {
-#ifdef KRB5
-       case GSS_KERBEROS:
-               ssh_gssapi_krb5_storecreds();
-               break;
-#endif
 #ifdef GSI
        case GSS_GSI:
                ssh_gssapi_gsi_storecreds();
                break;
 #endif /* GSI */
+#ifdef KRB5
+       case GSS_KERBEROS:
+               ssh_gssapi_krb5_storecreds();
+               break;
+#endif
        case GSS_LAST_ENTRY:
                /* GSSAPI not used in this authentication */
                debug("No GSSAPI credentials stored");
@@ -555,6 +555,7 @@ input_gssapi_token(int type, u_int32_t plen, void *ctxt)
        
        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);