comparison: src/server/daemon/webserver.c
src/server/daemon/webserver.c
- changeset 461
- 9b20b8f3582b
- parent 444
- 96d2ba2f28db
equal
deleted
inserted
replaced
| 460:b9a447b02046 | 461:9b20b8f3582b |
|---|---|
| 60 #include "httplistener.h" | 60 #include "httplistener.h" |
| 61 #include "webserver.h" | 61 #include "webserver.h" |
| 62 #include "auth.h" | 62 #include "auth.h" |
| 63 #include "srvctrl.h" | 63 #include "srvctrl.h" |
| 64 #include "resourcepool.h" | 64 #include "resourcepool.h" |
| 65 #include "ldap_resource.h" | |
| 65 | 66 |
| 66 extern struct FuncStruct webserver_funcs[]; | 67 extern struct FuncStruct webserver_funcs[]; |
| 67 | 68 |
| 68 static RestartCallback *atrestart; | 69 static RestartCallback *atrestart; |
| 69 | 70 |
| 92 add_functions(webserver_funcs); | 93 add_functions(webserver_funcs); |
| 93 | 94 |
| 94 // init resource pools | 95 // init resource pools |
| 95 if(init_resource_pools()) { | 96 if(init_resource_pools()) { |
| 96 log_ereport(LOG_FAILURE, "resource pool init failed"); | 97 log_ereport(LOG_FAILURE, "resource pool init failed"); |
| 98 return -1; | |
| 99 } | |
| 100 if(resourcepool_register_type("ldap", ldap_get_resource_type())) { | |
| 101 log_ereport(LOG_FAILURE, "webserver-init: Cannot register ldap resourcepool type"); | |
| 97 return -1; | 102 return -1; |
| 98 } | 103 } |
| 99 | 104 |
| 100 // load init.conf | 105 // load init.conf |
| 101 InitConfig *init_config = load_init_conf("config/init.conf"); | 106 InitConfig *init_config = load_init_conf("config/init.conf"); |
