mainnika
/
nginx-auth-ldap
mirror of https://github.com/mainnika/nginx-auth-ldap
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Initialize ngx_http_auth_ldap_server_t structure fields properly

Browse Source
main
Jiri Hruska 11 years ago
parent 8d03e56550
commit 6eea22868d
1 changed files with 5 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      ngx_http_auth_ldap_module.c

11
ngx_http_auth_ldap_module.c
Unescape View File

@ -260,7 +260,7 @@ ngx_http_auth_ldap_ldap_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *c
char *rv; char *rv;
ngx_str_t *value, name; ngx_str_t *value, name;
ngx_conf_t save; ngx_conf_t save;
ngx_http_auth_ldap_server_t server, *s; ngx_http_auth_ldap_server_t *server;
ngx_http_auth_ldap_main_conf_t *cnf = conf; ngx_http_auth_ldap_main_conf_t *cnf = conf;
value = cf->args->elts; value = cf->args->elts;
@ -272,8 +272,6 @@ ngx_http_auth_ldap_ldap_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *c
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
server.alias = name;
if (cnf->servers == NULL) { if (cnf->servers == NULL) {
cnf->servers = ngx_array_create(cf->pool, 7, sizeof(ngx_http_auth_ldap_server_t)); cnf->servers = ngx_array_create(cf->pool, 7, sizeof(ngx_http_auth_ldap_server_t));
if (cnf->servers == NULL) { if (cnf->servers == NULL) {
@ -281,12 +279,13 @@ ngx_http_auth_ldap_ldap_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *c
} }
} }
s = ngx_array_push(cnf->servers); server = ngx_array_push(cnf->servers);
if (s == NULL) { if (server == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
*s = server; ngx_memzero(server, sizeof(*server));
server->alias = name;
save = *cf; save = *cf;
cf->handler = ngx_http_auth_ldap_ldap_server; cf->handler = ngx_http_auth_ldap_ldap_server;

Write Preview
Loading…
Cancel
Save