Make mod_auth_db compile cleanly in 2.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86768 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/include/http_config.h b/include/http_config.h
index 8237f4f1d4076b5618152acd597d1616ace51e21..de322b4573fa61bc4b53804e7c456b6b85439e4d 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -523,9 +523,9 @@ AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *, void *, int);
  * @param struct_ptr pointer into a given type
  * @param arg The argument to the directive
  * @return An error string or NULL on success
- * @deffunc const char *ap_set_file_slot(cmd_parms *cmd, char *struct_ptr, const char *arg)
+ * @deffunc const char *ap_set_file_slot(cmd_parms *cmd, void *struct_ptr, const char *arg)
  */
-AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *, char *, const char *);
+AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *, void *, const char *);
 
 /**
  * For modules which need to read config files, open logs, etc. ...

diff --git a/modules/aaa/mod_auth_db.c b/modules/aaa/mod_auth_db.c
index 1b2f71cb88e7fe2715790ac1d74806ef4eae56c9..01becdd64cb6a5b48971de446ce259d113901724 100644 (file)
--- a/modules/aaa/mod_auth_db.c
+++ b/modules/aaa/mod_auth_db.c
@@ -139,22 +139,22 @@ static const char *set_db_slot(cmd_parms *cmd, void *offset, char *f, char *t)
 
 static const command_rec db_auth_cmds[] =
 {
-    {"AuthDBUserFile", ap_set_file_slot,
+    AP_INIT_TAKE1("AuthDBUserFile", ap_set_file_slot,
      (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
-     OR_AUTHCFG, TAKE1, NULL},
-    {"AuthDBGroupFile", ap_set_file_slot,
+     OR_AUTHCFG, NULL),
+    AP_INIT_TAKE1("AuthDBGroupFile", ap_set_file_slot,
      (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
-     OR_AUTHCFG, TAKE1, NULL},
-    {"AuthUserFile", set_db_slot,
+     OR_AUTHCFG, NULL),
+    AP_INIT_TAKE12("AuthUserFile", set_db_slot,
      (void *) XtOffsetOf(db_auth_config_rec, auth_dbpwfile),
-     OR_AUTHCFG, TAKE12, NULL},
-    {"AuthGroupFile", set_db_slot,
+     OR_AUTHCFG, NULL),
+    AP_INIT_TAKE12("AuthGroupFile", set_db_slot,
      (void *) XtOffsetOf(db_auth_config_rec, auth_dbgrpfile),
-     OR_AUTHCFG, TAKE12, NULL},
-    {"AuthDBAuthoritative", ap_set_flag_slot,
+     OR_AUTHCFG, NULL),
+    AP_INIT_FLAG("AuthDBAuthoritative", ap_set_flag_slot,
      (void *) XtOffsetOf(db_auth_config_rec, auth_dbauthoritative),
-     OR_AUTHCFG, FLAG,
-     "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"},
+     OR_AUTHCFG,
+     "Set to 'no' to allow access control to be passed along to lower modules if the userID is not known to this module"),
     {NULL}
 };
 

diff --git a/server/config.c b/server/config.c
index 8f148cc49b4f7a2b2255f4965e108cf2503938a5..b4f6a7bedd8d24f87a215794c335a47c5111752c 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1165,7 +1165,7 @@ AP_DECLARE_NONSTD(const char *) ap_set_flag_slot(cmd_parms *cmd,
     return NULL;
 }
 
-AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, char *struct_ptr, 
+AP_DECLARE_NONSTD(const char *) ap_set_file_slot(cmd_parms *cmd, void *struct_ptr, 
                                                  const char *arg)
 {
     /* Prepend server_root to relative arg.