Merge pull request #18 from nyoxi/master

bugfix: User gets authenticated when satisfy is 'any' and no group matches.
11 years ago · 5909f47d89
parent ee45bc4898 59ef5fd1df
commit 5909f47d89
1 changed files with 6 additions and 1 deletions
--- a/ngx_http_auth_ldap_module.c
+++ b/ngx_http_auth_ldap_module.c
@ -1807,7 +1807,12 @@ ngx_http_auth_ldap_check_group(ngx_http_request_t *r, ngx_http_auth_ldap_ctx_t *

    /* Check next group */
    if (ctx->iteration >= ctx->server->require_group->nelts) {
-        return NGX_OK;
+        /* No more groups */
+        if (ctx->server->satisfy_all == 0) {
+            return NGX_DECLINED;
+        } else {
+            return NGX_OK;
+        }
    }

    if (!ngx_http_auth_ldap_get_connection(ctx)) {