mainnika/nginx-auth-ldap
1
0
Fork 0
mirror of https://github.com/mainnika/nginx-auth-ldap.git synced 2026-07-03 20:22:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not crash on startup when no servers have been defined

Browse Source
This commit is contained in:
Jiri Hruska
2013-09-03 19:12:29 +02:00
parent 6eea22868d
commit 5cb46a08e7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ngx_http_auth_ldap_module.c
+5 -1
View File
@@ -1314,6 +1314,11 @@ ngx_http_auth_ldap_init_connections(ngx_cycle_t *cycle)
ngx_int_t rc; ngx_int_t rc;
int option; int option;
halmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_auth_ldap_module);
if (halmcf == NULL || halmcf->servers == NULL) {
return NGX_OK;
}
option = LDAP_VERSION3; option = LDAP_VERSION3;
rc = ldap_set_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &option); rc = ldap_set_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &option);
@@ -1324,7 +1329,6 @@ ngx_http_auth_ldap_init_connections(ngx_cycle_t *cycle)
rc, ldap_err2string(rc)); rc, ldap_err2string(rc));
} }
halmcf = ngx_http_cycle_get_module_main_conf(cycle, ngx_http_auth_ldap_module);
for (i = 0; i < halmcf->servers->nelts; i++) { for (i = 0; i < halmcf->servers->nelts; i++) {
server = &((ngx_http_auth_ldap_server_t *) halmcf->servers->elts)[i]; server = &((ngx_http_auth_ldap_server_t *) halmcf->servers->elts)[i];
ngx_queue_init(&server->free_connections); ngx_queue_init(&server->free_connections);