ldap: Added blocking=yes setting to use auth-workers.

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 05e45f5da795043e073b4ec60c6331821131d94b..961a5877437950736cda0f19e68e34e7fed5047d 100644 (file)
--- 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 e1e09b317badf53848d3692e4d4e56d3a6f7ae43..7f4afb69f62516c5674becfd32f7ad55e12fa10f 100644 (file)
--- 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 7c4c191863c28bbbd4e2bdbd52555db4e8c84082..8a4140ce808c9135a4e0b060ca8eb6e3c4dfc208 100644 (file)
--- 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 9a640ed9258dd6c3e874e8ad5be7987eedb7c9ba..6497007fd6c9726df99e440d96b5dc4fae696ca6 100644 (file)
--- 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,