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 710edf5228a03c7c62b3176d604f30ab38636dc2..ceef7dc7054cdff1c958b1bf9d93db444441c07c 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -74,18 +74,6 @@ static char *delegation_env[] = {
   NULL
 };
 
-Authmethod method_external = {
-       "external-keyx",
-       userauth_external,
-       &options.gss_authentication
-};
-
-Authmethod method_gssapi = {
-       "gssapi",
-       userauth_gssapi,
-       &options.gss_authentication
-};
-
 #ifdef KRB5
 
 #ifdef HEIMDAL
@@ -261,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
@@ -375,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");