projects
/
mod_auth_gssapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly check return error when filtering mechs
[mod_auth_gssapi.git]
/
src
/
mod_auth_gssapi.h
diff --git
a/src/mod_auth_gssapi.h
b/src/mod_auth_gssapi.h
index
b12b0e9
..
2e05bb0
100644
(file)
--- 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.h>
#include <gssapi/gssapi_ext.h>
#include <gssapi/gssapi_krb5.h>
+#include <gssapi/gssapi_ntlmssp.h>
#define APR_WANT_STRFUNC
#include "apr_want.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 <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
/* apache's httpd.h drags in empty PACKAGE_* variables.
* undefine them to avoid annoying compile warnings as they
@@
-34,6
+36,12
@@
#define MIN_SESS_EXP_TIME 300 /* 5 minutes validity minimum */
#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;
struct mag_config {
apr_pool_t *pool;
bool ssl_only;
@@
-41,19
+49,30
@@
struct mag_config {
bool gss_conn_ctx;
bool send_persist;
bool use_sessions;
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;
bool use_s4u2proxy;
char *deleg_ccache_dir;
gss_key_value_set_desc *cred_store;
+#endif
struct seal_key *mag_skey;
struct seal_key *mag_skey;
+
bool use_basic_auth;
bool use_basic_auth;
+ gss_OID_set_desc *allowed_mechs;
+ gss_OID_set_desc *basic_mechs;
};
struct mag_conn {
};
struct mag_conn {
- apr_pool_t *p
arent
;
+ apr_pool_t *p
ool
;
gss_ctx_id_t ctx;
bool established;
const char *user_name;
const char *gss_name;
time_t expiration;
gss_ctx_id_t ctx;
bool established;
const char *user_name;
const char *gss_name;
time_t expiration;
- const char *auth_type;
+ int auth_type;
+ bool delegated;
+ struct databuf basic_hash;
};
};
+
+#define discard_const(ptr) ((void *)((uintptr_t)(ptr)))
+
+struct mag_conn *mag_new_conn_ctx(apr_pool_t *pool);