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 initialize logging
[mod_auth_gssapi.git]
/
src
/
mod_auth_gssapi.c
diff --git
a/src/mod_auth_gssapi.c
b/src/mod_auth_gssapi.c
index
220ccab
..
f2fab57
100644
(file)
--- a/
src/mod_auth_gssapi.c
+++ b/
src/mod_auth_gssapi.c
@@
-28,6
+28,8
@@
module AP_MODULE_DECLARE_DATA auth_gssapi_module;
module AP_MODULE_DECLARE_DATA auth_gssapi_module;
+APLOG_USE_MODULE(auth_gssapi);
+
APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
static char *mag_status(request_rec *req, int type, uint32_t err)
APR_DECLARE_OPTIONAL_FN(int, ssl_is_https, (conn_rec *));
static char *mag_status(request_rec *req, int type, uint32_t err)
@@
-166,6
+168,7
@@
static int mag_auth(request_rec *req)
gss_name_t client = GSS_C_NO_NAME;
gss_cred_id_t acquired_cred = GSS_C_NO_CREDENTIAL;
gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL;
gss_name_t client = GSS_C_NO_NAME;
gss_cred_id_t acquired_cred = GSS_C_NO_CREDENTIAL;
gss_cred_id_t delegated_cred = GSS_C_NO_CREDENTIAL;
+ gss_cred_usage_t cred_usage = GSS_C_ACCEPT;
uint32_t flags;
uint32_t vtime;
uint32_t maj, min;
uint32_t flags;
uint32_t vtime;
uint32_t maj, min;
@@
-208,7
+211,9
@@
static int mag_auth(request_rec *req)
}
/* if available, session always supersedes connection bound data */
}
/* if available, session always supersedes connection bound data */
- mag_check_session(req, cfg, &mc);
+ if (cfg->use_sessions) {
+ mag_check_session(req, cfg, &mc);
+ }
if (mc) {
/* register the context in the memory pool, so it can be freed
if (mc) {
/* register the context in the memory pool, so it can be freed
@@
-247,8
+252,11
@@
static int mag_auth(request_rec *req)
#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
if (cfg->use_s4u2proxy) {
#ifdef HAVE_GSS_ACQUIRE_CRED_FROM
if (cfg->use_s4u2proxy) {
+ cred_usage = GSS_C_BOTH;
+ }
+ if (cfg->cred_store) {
maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME, 0,
maj = gss_acquire_cred_from(&min, GSS_C_NO_NAME, 0,
- GSS_C_NO_OID_SET,
GSS_C_BOTH
,
+ GSS_C_NO_OID_SET,
cred_usage
,
cfg->cred_store, &acquired_cred,
NULL, NULL);
if (GSS_ERROR(maj)) {
cfg->cred_store, &acquired_cred,
NULL, NULL);
if (GSS_ERROR(maj)) {
@@
-331,7
+339,9
@@
static int mag_auth(request_rec *req)
vtime = MIN_SESS_EXP_TIME;
}
mc->expiration = time(NULL) + vtime;
vtime = MIN_SESS_EXP_TIME;
}
mc->expiration = time(NULL) + vtime;
- mag_attempt_session(req, cfg, mc);
+ if (cfg->use_sessions) {
+ mag_attempt_session(req, cfg, mc);
+ }
}
ret = OK;
}
ret = OK;