From e153e1205bc686fac815ce7bb534adcb36dfb722 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 13 Dec 2013 13:44:32 +0200 Subject: [PATCH] ldap: Added blocking=yes setting to use auth-workers. --- src/auth/db-ldap.c | 4 +++- src/auth/db-ldap.h | 1 + src/auth/passdb-ldap.c | 1 + src/auth/userdb-ldap.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c index 05e45f5da7..961a587743 100644 --- a/src/auth/db-ldap.c +++ b/src/auth/db-ldap.c @@ -120,6 +120,7 @@ static struct setting_def setting_defs[] = { DEF_STR(iterate_filter), DEF_STR(default_pass_scheme), DEF_BOOL(userdb_warning_disable), + DEF_BOOL(blocking), { 0, NULL, 0 } }; @@ -155,7 +156,8 @@ static struct ldap_settings default_ldap_settings = { .iterate_attrs = "uid=user", .iterate_filter = "(objectClass=posixAccount)", .default_pass_scheme = "crypt", - .userdb_warning_disable = FALSE + .userdb_warning_disable = FALSE, + .blocking = FALSE }; static struct ldap_connection *ldap_connections = NULL; diff --git a/src/auth/db-ldap.h b/src/auth/db-ldap.h index e1e09b317b..7f4afb69f6 100644 --- a/src/auth/db-ldap.h +++ b/src/auth/db-ldap.h @@ -64,6 +64,7 @@ struct ldap_settings { const char *default_pass_scheme; bool userdb_warning_disable; /* deprecated for now at least */ + bool blocking; /* ... */ int ldap_deref, ldap_scope; diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c index 7c4c191863..8a4140ce80 100644 --- a/src/auth/passdb-ldap.c +++ b/src/auth/passdb-ldap.c @@ -421,6 +421,7 @@ passdb_ldap_preinit(pool_t pool, const char *args) db_ldap_set_attrs(conn, conn->set.pass_attrs, &conn->pass_attr_names, &conn->pass_attr_map, conn->set.auth_bind ? "password" : NULL); + module->module.blocking = conn->set.blocking; module->module.cache_key = auth_cache_parse_key(pool, t_strconcat(conn->set.base, diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c index 9a640ed925..6497007fd6 100644 --- a/src/auth/userdb-ldap.c +++ b/src/auth/userdb-ldap.c @@ -272,6 +272,7 @@ userdb_ldap_preinit(pool_t pool, const char *args) db_ldap_set_attrs(conn, conn->set.iterate_attrs, &conn->iterate_attr_names, &conn->iterate_attr_map, NULL); + module->module.blocking = conn->set.blocking; module->module.cache_key = auth_cache_parse_key(pool, t_strconcat(conn->set.base, -- 2.47.3