|
21 | 21 | #include"apr_lib.h" |
22 | 22 | #include"acmp.h" |
23 | 23 | #include"msc_crypt.h" |
| 24 | +#include"persist_dbm.h" |
24 | 25 |
|
25 | 26 | #if defined(WITH_LUA) |
26 | 27 | #include"msc_lua.h" |
@@ -1156,14 +1157,14 @@ static const char *cmd_test_rand_ip_range(cmd_parms *cmd, void *_dcfg, const cha |
1156 | 1157 |
|
1157 | 1158 | staticconstchar*cmd_db_option(cmd_parms*cmd,void*_dcfg,constchar*p1){ |
1158 | 1159 | directory_config*dcfg= (directory_config*)_dcfg; |
1159 | | -if((strcmp(p1,"origin")==0)) |
1160 | | -dcfg->db_option=0; |
1161 | | -elseif((strcmp(p1,"agmdb")==0)) { |
1162 | | -dcfg->db_option=2; |
| 1160 | +if((strcmp(p1,"origin")==0)) |
| 1161 | +dcfg->db_option=DB_OPT_ORIGIN; |
| 1162 | +elseif((strcmp(p1,"agmdb")==0)) { |
| 1163 | +dcfg->db_option=DB_OPT_AGMDB; |
1163 | 1164 | dcfg->agmdb_handles=NULL; |
1164 | 1165 | } |
1165 | 1166 | else |
1166 | | -dcfg->db_option=0; |
| 1167 | +dcfg->db_option=DB_OPT_ORIGIN; |
1167 | 1168 | returnNULL; |
1168 | 1169 | } |
1169 | 1170 |
|
@@ -3236,22 +3237,6 @@ const command_rec module_directives[] = { |
3236 | 3237 | ), |
3237 | 3238 | #endif |
3238 | 3239 |
|
3239 | | -AP_INIT_TAKE1 ( |
3240 | | -"SecTestRandIpRange", |
3241 | | -cmd_test_rand_ip_range, |
3242 | | -NULL, |
3243 | | -CMD_SCOPE_ANY, |
3244 | | -"IP address range. For test only" |
3245 | | - ), |
3246 | | - |
3247 | | -AP_INIT_TAKE1 ( |
3248 | | -"SecDBOption", |
3249 | | -cmd_db_option, |
3250 | | -NULL, |
3251 | | -CMD_SCOPE_ANY, |
3252 | | -"Choose database. (origin/redis/agdb)" |
3253 | | - ), |
3254 | | - |
3255 | 3240 | AP_INIT_TAKE1 ( |
3256 | 3241 | "SecArgumentSeparator", |
3257 | 3242 | cmd_argument_separator, |
@@ -3974,5 +3959,21 @@ const command_rec module_directives[] = { |
3974 | 3959 | "Set Hash parameter" |
3975 | 3960 | ), |
3976 | 3961 |
|
| 3962 | +AP_INIT_TAKE1 ( |
| 3963 | +"SecTestRandIpRange", |
| 3964 | +cmd_test_rand_ip_range, |
| 3965 | +NULL, |
| 3966 | +CMD_SCOPE_ANY, |
| 3967 | +"IP address range. For test only" |
| 3968 | + ), |
| 3969 | + |
| 3970 | +AP_INIT_TAKE1 ( |
| 3971 | +"SecDBOption", |
| 3972 | +cmd_db_option, |
| 3973 | +NULL, |
| 3974 | +CMD_SCOPE_ANY, |
| 3975 | +"Choose database. (origin/redis/agdb)" |
| 3976 | + ), |
| 3977 | + |
3977 | 3978 | {NULL } |
3978 | 3979 | }; |