Added auth_cmds.c processing for apache1 and 2. Still need to add custom

option processors.

diff --git a/apache1/auth_cmds.c b/apache1/auth_cmds.c
index 611dff6..f1d5014 100644 (file)
--- a/apache1/auth_cmds.c
+++ b/apache1/auth_cmds.c
@@ -10,21 +10,12 @@ command_rec kerb_auth_cmds[] = {
 
        {
                "KrbFailStatus",
-               kerb_set_fail_slot_string,
+               kerb_set_fail_slot,
                (void*)XtOffsetOf(kerb_auth_config, krb_fail_status),
                OR_AUTHCFG,
                TAKE1,
                "If auth fails, return status set here."
        },
 
-       {
-               "KrbAuthoritative",
-               kerb_set_fail_slot_flag,
-               (void*)XtOffsetOf(kerb_auth_config, krb_fail_status),
-               OR_AUTHCFG,
-               FLAG,
-               "If auth fails, decline and pass on to lower modules."
-       },
-
        { NULL }
 };

diff --git a/apache1/module.c b/apache1/module.c
index 327200e..d513b9d 100644 (file)
--- a/apache1/module.c
+++ b/apache1/module.c
@@ -5,7 +5,7 @@ module kerb_auth_module = {
        NULL,                           /* dir merger */
        NULL,                           /* server config */
        NULL,                           /* merge server config */
-       NULL,                           /* command table */
+       kerb_auth_cmds,                 /* command table */
        NULL,                           /* handlers */
        NULL,                           /* filename translation */
        kerb_authenticate_user,         /* check_user_id */

diff --git a/apache2/auth_cmds.c b/apache2/auth_cmds.c
new file mode 100644 (file)
index 0000000..7209294
--- /dev/null
+++ b/apache2/auth_cmds.c
@@ -0,0 +1,19 @@
+static const command_rec kerb_auth_cmds[] = {
+       AP_INIT_TAKE1(
+               "AuthKerberos",
+               kerb_set_type_slot,
+               (void*)APR_XtOffsetOf(kerb_auth_config, krb_auth_type),
+               OR_AUTHCFG,
+               "Permit Kerberos auth without AuthType requirement."
+       ),
+
+       AP_INIT_TAKE1(
+               "KrbFailStatus",
+               kerb_set_fail_slot,
+               (void*)APR_XtOffsetOf(kerb_auth_config, krb_fail_status),
+               OR_AUTHCFG,
+               "If auth fails, return status set here."
+       ),
+
+       { NULL }
+};

diff --git a/apache2/module.c b/apache2/module.c
index 367f1f7..a846a0c 100644 (file)
--- a/apache2/module.c
+++ b/apache2/module.c
@@ -5,6 +5,6 @@ module AP_MODULE_DECLARE_DATA kerb_auth_module =
        NULL,                           /* dir merger */
        NULL,                           /* server config */
        NULL,                           /* merge server config */
-       NULL,                           /* command apr_table_t */
+       kerb_auth_cmds,                 /* command apr_table_t */
        kerb_register_hooks             /* register hooks */
 };