Better handling of includes

[mod_auth_kerb.cvs/.git] / src / mod_auth_kerb.c

diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c
index 13419e2..91c35ac 100644 (file)
--- a/src/mod_auth_kerb.c
+++ b/src/mod_auth_kerb.c
@@ -82,11 +82,9 @@
 
 #ifdef KRB5
 #include <krb5.h>
-#ifdef HEIMDAL
-#  include <gssapi.h>
-#else
-#  include <gssapi/gssapi.h>
-#  include <gssapi/gssapi_generic.h>
+#include <gssapi.h>
+#ifndef HEIMDAL
+#  include <gssapi_generic.h>
 #  define GSS_C_NT_USER_NAME gss_nt_user_name
 #  define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name
 #  define krb5_get_err_text(context,code) error_message(code)
@@ -367,7 +365,8 @@ authenticate_user_krb4pwd(request_rec *r,
       if (realm == NULL || *realm == '\0')
         break;
 
-      ret = verify_krb4_user(r, (char *)sent_name, sent_instance,
+      ret = verify_krb4_user(r, (char *)sent_name, 
+                            (sent_instance) ? sent_instance : "",
                             (char *)realm, (char *)sent_pw, "khttp",
                             conf->krb_4_srvtab);
       if (ret == 0)
@@ -383,8 +382,8 @@ authenticate_user_krb4pwd(request_rec *r,
 
    user = ap_pstrdup(r->pool, sent_name);
    if (sent_instance)
-      user = ap_pstrcat(r->pool, ".", sent_instance);
-   user = ap_pstrcat(r->pool, "@", realm);
+      user = ap_pstrcat(r->pool, user, ".", sent_instance, NULL);
+   user = ap_pstrcat(r->pool, user, "@", realm, NULL);
 
    MK_USER = user;
    MK_AUTH_TYPE = "Basic";