You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rb...@locus.apache.org on 2000/10/30 21:13:07 UTC
cvs commit: apache-2.0/src/modules/standard mod_auth_db.c
rbb 00/10/30 12:13:06
Modified: src/include http_config.h
src/main http_config.c
src/modules/standard mod_auth_db.c
Log:
Make mod_auth_db compile cleanly in 2.0
Revision Changes Path
1.51 +2 -2 apache-2.0/src/include/http_config.h
Index: http_config.h
===================================================================
RCS file: /home/cvs/apache-2.0/src/include/http_config.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- http_config.h 2000/10/16 06:04:33 1.50
+++ http_config.h 2000/10/30 20:13:00 1.51
@@ -523,9 +523,9 @@
* @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. ...
1.82 +1 -1 apache-2.0/src/main/http_config.c
Index: http_config.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- http_config.c 2000/10/23 15:30:51 1.81
+++ http_config.c 2000/10/30 20:13:02 1.82
@@ -1165,7 +1165,7 @@
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.
1.17 +11 -11 apache-2.0/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- mod_auth_db.c 2000/08/02 05:27:14 1.16
+++ mod_auth_db.c 2000/10/30 20:13:04 1.17
@@ -139,22 +139,22 @@
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}
};