From: kouril <kouril>
Date: Wed, 21 Apr 2004 16:15:22 +0000 (+0000)
Subject: Added header includes and other minor fixes
X-Git-Tag: v5.0-rc5~5
X-Git-Url: http://www.project-moonshot.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=9da15ebed68b9b15fa7c3493bcfc6231d46a86ac;p=mod_auth_kerb.git

Added header includes and other minor fixes
---

diff --git a/src/mit-internals.h b/src/mit-internals.h
index fac2e4f..2c57aa6 100644
--- a/src/mit-internals.h
+++ b/src/mit-internals.h
@@ -1,3 +1,7 @@
+/*
+ * XXX License
+ */
+
 #ifndef _MIT_INTERNALS_H_
 #define _MIT_INTERNALS_H_
 
@@ -106,4 +110,4 @@ typedef struct _krb5_gss_cred_id_rec {
 	krb5_timestamp tgt_expire;
 } krb5_gss_cred_id_rec, *krb5_gss_cred_id_t;
 
-#endif _MIT_INTERNALS_H_
+#endif /* _MIT_INTERNALS_H_ */
diff --git a/src/mod_auth_kerb.c b/src/mod_auth_kerb.c
index e6c8bdb..809d9b0 100644
--- a/src/mod_auth_kerb.c
+++ b/src/mod_auth_kerb.c
@@ -58,9 +58,9 @@
 #ifdef STANDARD20_MODULE_STUFF
 #include <ap_compat.h>
 #include <apr_strings.h>
+#include <apr_base64.h>
 #endif
 
-
 #ifdef KRB5
 #include <krb5.h>
 #ifdef HEIMDAL
@@ -68,6 +68,7 @@
 #else
 #  include <gssapi/gssapi.h>
 #  include <gssapi/gssapi_generic.h>
+#  include <gssapi/gssapi_krb5.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)
@@ -85,6 +86,9 @@
 #include <netdb.h> /* gethostbyname() */
 #endif /* KRB4 */
 
+/* XXX remove dependency on unistd.h ??? */
+#include <unistd.h>
+
 #ifdef STANDARD20_MODULE_STUFF
 module AP_MODULE_DECLARE_DATA auth_kerb_module;
 #else
@@ -460,7 +464,7 @@ verify_krb5_init_creds(krb5_context context, krb5_creds *creds,
    krb5_auth_context auth_context = NULL;
    krb5_keytab keytab = NULL;
 
-   krb5_data_zero (&req);
+   memset(&req, 0, sizeof(req));
 
    if (ap_req_keytab == NULL) {
       ret = krb5_kt_default (context, &keytab);
@@ -501,6 +505,7 @@ verify_krb5_init_creds(krb5_context context, krb5_creds *creds,
       goto end;
 
    krb5_auth_con_free (context, auth_context);
+   auth_context = NULL;
    ret = krb5_auth_con_init(context, &auth_context);
    if (ret)
       goto end;