Handle KerberosV5/KerberosV4 values of AuthType properly

[mod_auth_kerb.git] / src / mod_auth_kerb.c

diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c
index 9a6f4db..0fa3474 100644 (file)
--- a/src/mod_auth_kerb.c
+++ b/src/mod_auth_kerb.c
@@ -1145,6 +1145,8 @@ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
                                  NULL,
                                  NULL,
                                  &delegated_cred);
+  log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+            "Verification returned code %d", major_status);
   if (output_token.length) {
      char *token = NULL;
      size_t len;
@@ -1162,8 +1164,8 @@ authenticate_user_gss(request_rec *r, kerb_auth_config *conf,
      token[len] = '\0';
      *negotiate_ret_value = token;
      log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
-               "Verification suceeded, GSS-API token of length %d bytes will be sent back",
-               output_token.length);
+               "GSS-API token of length %d bytes will be sent back",
+               major_status, output_token.length);
      gss_release_buffer(&minor_status2, &output_token);
   }
 
@@ -1296,9 +1298,9 @@ int kerb_authenticate_user(request_rec *r)
    if (type && strcasecmp(type, "Kerberos") == 0)
       use_krb5 = use_krb4 = 1;
    else if(type && strcasecmp(type, "KerberosV5") == 0)
-      use_krb4 = 0;
+      use_krb5 = 1;
    else if(type && strcasecmp(type, "KerberosV4") == 0)
-      use_krb5 = 0;
+      use_krb4 = 1;
    else
       return DECLINED;