Update include files to match code refactoring for two modules.

[mod_auth_kerb.git] / mod_auth_gssweb.c

diff --git a/mod_auth_gssweb.c b/mod_auth_gssweb.c
index ff5dccc..8b93d12 100644 (file)
--- a/mod_auth_gssweb.c
+++ b/mod_auth_gssweb.c
@@ -29,103 +29,28 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "mod_auth_gssapi.h"
+#include "mod_auth_gssweb.h"
 
-module AP_MODULE_DECLARE_DATA auth_gssapi_module;
+module AP_MODULE_DECLARE_DATA auth_gssweb_module;
 
 #define command(name, func, var, type, usage)           \
   AP_INIT_ ## type (name, (void*) func,                 \
         (void*)APR_OFFSETOF(gss_auth_config, var),      \
         OR_AUTHCFG | RSRC_CONF, usage)
 
-static const command_rec gss_config_cmds[] = {
+static const command_rec gssweb_config_cmds[] = {
     command("GSSServiceName", ap_set_string_slot, service_name,
             TAKE1, "Service name used for Apache authentication."),
 
-    command("GSSKrb5Keytab", ap_set_string_slot, krb5_keytab,
-            TAKE1, "Location of Kerberos V5 keytab file."),
-
     { NULL }
 };
 
-static void *
-gss_config_dir_create(apr_pool_t *p, char *d)
-{
-    gss_auth_config *conf;
-
-    conf = (gss_auth_config *) apr_pcalloc(p, sizeof(*conf));
-    return conf;
-}
-
-void
-gss_log(const char *file, int line, int level, int status,
-        const request_rec *r, const char *fmt, ...)
-{
-    char errstr[1024];
-    va_list ap;
-
-    va_start(ap, fmt);
-    vsnprintf(errstr, sizeof(errstr), fmt, ap);
-    va_end(ap);
-   
-    ap_log_rerror(file, line, level | APLOG_NOERRNO, status, r, "%s", errstr);
-}
-
-static void
-set_http_headers(request_rec *r, const gss_auth_config *conf,
-                char *negotiate_ret_value)
-{
-    char *negoauth_param;
-    const char *header_name = (r->proxyreq == PROXYREQ_PROXY) ?
-        "Proxy-Authenticate" : "WWW-Authenticate";
-
-    if (negotiate_ret_value == NULL)
-       return;
-
-    negoauth_param = (*negotiate_ret_value == '\0') ? "Negotiate" :
-        apr_pstrcat(r->pool, "Negotiate ", negotiate_ret_value, NULL);
-    apr_table_add(r->err_headers_out, header_name, negoauth_param);
-}
-
-static apr_status_t
-cleanup_conn_ctx(void *data)
-{
-    gss_conn_ctx ctx = (gss_conn_ctx) data;
-    OM_uint32 minor_status;
-
-    if (ctx && ctx->context != GSS_C_NO_CONTEXT)
-       gss_delete_sec_context(&minor_status, &ctx->context, GSS_C_NO_BUFFER);
-
-    return APR_SUCCESS;
-}
-
-static gss_conn_ctx
-gss_get_conn_ctx(request_rec *r)
-{
-    char key[1024];
-    gss_conn_ctx ctx = NULL;
-
-    snprintf(key, sizeof(key), "mod_auth_gssapi:conn_ctx");
-    apr_pool_userdata_get((void **)&ctx, key, r->connection->pool);
-    /* XXX LOG */
-    if (ctx == NULL) {
-       ctx = (gss_conn_ctx) apr_palloc(r->connection->pool, sizeof(*ctx));
-       if (ctx == NULL)
-           return NULL;
-       ctx->context = GSS_C_NO_CONTEXT;
-       ctx->state = GSS_CTX_EMPTY;
-       ctx->user = NULL;
-       apr_pool_userdata_set(ctx, key, cleanup_conn_ctx, r->connection->pool);
-    }
-    return ctx;
-}
-
 static int
 gssweb_authenticate_user(request_rec *r)
 {
     gss_auth_config *conf = 
         (gss_auth_config *) ap_get_module_config(r->per_dir_config,
-                                               &auth_gssapi_module);
+                                               &auth_gssweb_module);
     const char *auth_line = NULL;
     const char *type = NULL;
     char *auth_type = NULL;
@@ -157,7 +82,7 @@ gssweb_authenticate_user(request_rec *r)
     }
 
     auth_type = ap_getword_white(r->pool, &auth_line);
-    if (strcasecmp(auth_type, "Negotiate") != 0) {
+    if (strcasecmp(auth_type, "gssweb") != 0) {
         gss_log(APLOG_MARK, APLOG_DEBUG, 0, r,
                "Unsupported authentication type (%s) requested by client",
                (auth_type) ? auth_type : "(NULL)");
@@ -211,7 +136,7 @@ gssweb_register_hooks(apr_pool_t *p)
 
 module AP_MODULE_DECLARE_DATA auth_gssweb_module = {
     STANDARD20_MODULE_STUFF,
-    gssweb_config_dir_create,
+    gss_config_dir_create,
     NULL,
     NULL,
     NULL,