X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmod_auth_gssapi.h;h=97ba2c86726982c60542f5a0c593f407a08532b4;hb=8cabd1e6ac6c300f7e603cd61f1a8a7a7da7fb8f;hp=4cf7d39d3fedc3b34f2d7a2fc57f17ee493d0573;hpb=3effbe272147674cf92c13b387373a60f2cbbacf;p=mod_auth_gssapi.git

diff --git a/src/mod_auth_gssapi.h b/src/mod_auth_gssapi.h
index 4cf7d39..97ba2c8 100644
--- a/src/mod_auth_gssapi.h
+++ b/src/mod_auth_gssapi.h
@@ -6,6 +6,7 @@
 #include <gssapi/gssapi.h>
 #include <gssapi/gssapi_ext.h>
 #include <gssapi/gssapi_krb5.h>
+#include <gssapi/gssapi_ntlmssp.h>
 
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
@@ -18,6 +19,7 @@
 #include <http_log.h>
 #include <http_request.h>
 #include <mod_session.h>
+#include <mod_ssl.h>
 
 /* apache's httpd.h drags in empty PACKAGE_* variables.
  * undefine them to avoid annoying compile warnings as they
@@ -34,17 +36,27 @@
 
 #define MIN_SESS_EXP_TIME 300 /* 5 minutes validity minimum */
 
+#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
+#  ifdef HAVE_GSS_STORE_CRED_INTO
+#define HAVE_CRED_STORE 1
+#  endif
+#endif
+
 struct mag_config {
     apr_pool_t *pool;
     bool ssl_only;
     bool map_to_local;
     bool gss_conn_ctx;
+    bool send_persist;
     bool use_sessions;
+#ifdef HAVE_CRED_STORE
     bool use_s4u2proxy;
     char *deleg_ccache_dir;
     gss_key_value_set_desc *cred_store;
+#endif
     struct seal_key *mag_skey;
     bool use_basic_auth;
+    gss_OID_set_desc *allowed_mechs;
 };
 
 struct mag_conn {
@@ -54,5 +66,8 @@ struct mag_conn {
     const char *user_name;
     const char *gss_name;
     time_t expiration;
-    const char *auth_type;
+    int auth_type;
+    bool delegated;
 };
+
+#define discard_const(ptr) ((void *)((uintptr_t)(ptr)))