diff -r 4d39adda7a38 -r b28cf69f42e8 src/server/daemon/config.h --- a/src/server/daemon/config.h Sat Jan 19 21:52:21 2013 +0100 +++ b/src/server/daemon/config.h Thu Feb 28 20:00:05 2013 +0100 @@ -37,6 +37,9 @@ #include "../config/initconf.h" #include "../config/serverconf.h" #include "../config/mimeconf.h" +#include "../config/acl.h" + +#include "acldata.h" #include "../ucx/list.h" #include "../ucx/dlist.h" @@ -56,6 +59,7 @@ UcxList *logfiles; UcxMap *authdbs; UcxMap *mimetypes; + ACLData *acls; sstr_t tmp; sstr_t user; uint32_t ref; // reference counter @@ -98,11 +102,12 @@ void cfg_ref(ServerConfiguration *cfg); void cfg_unref(ServerConfiguration *cfg); + int object_conf_reload(ConfigFile *file, ServerConfiguration *cfg); - HTTPObjectConfig* load_obj_conf(char *file); - int mime_conf_reload(ConfigFile *file, ServerConfiguration *cfg); +int acl_conf_reload(ConfigFile *file, ServerConfiguration *cfg); +ACLList* acl_config_convert(ServerConfiguration *cfg, ACLConfig *acl);