fix Issue 8

This commit is contained in:
Valery Komarov
2011-11-16 13:25:35 +03:00
parent 6d8f79e876
commit c2c3d5ea49
+6 -1
View File
@@ -359,7 +359,7 @@ static ngx_int_t ngx_http_auth_ldap_handler(ngx_http_request_t *r) {
ctx = ngx_http_get_module_ctx(r, ngx_http_auth_ldap_module);
if (ctx) {
return ngx_http_auth_ldap_authenticate(r, ctx, &ctx->passwd, alcf);
return ngx_http_auth_ldap_authenticate(r, ctx, &ctx->passwd, alcf);
}
rc = ngx_http_auth_basic_user(r);
@@ -437,6 +437,11 @@ static ngx_int_t ngx_http_auth_ldap_authenticate(ngx_http_request_t *r, ngx_http
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
if (uinfo->password.len == 0)
{
return ngx_http_auth_ldap_set_realm(r, &conf->realm);
}
/// Set LDAP version to 3 and set connection timeout.
ldap_set_option(NULL, LDAP_OPT_PROTOCOL_VERSION, &version);
ldap_set_option(NULL, LDAP_OPT_NETWORK_TIMEOUT, &timeOut);