auth: ldap - Remove unused ldap_connection.userdb_used

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 5059978661ec7b3586ad2deda8cfec7487bcef9b..ed916b88f4c5420271b6fddefe2e270ee98fec70 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -2011,7 +2011,7 @@ static struct ldap_connection *ldap_conn_find(const char *config_path)
        return NULL;
 }
 
-struct ldap_connection *db_ldap_init(const char *config_path, bool userdb)
+struct ldap_connection *db_ldap_init(const char *config_path)
 {
        struct ldap_connection *conn;
        const char *str, *error;
@@ -2020,8 +2020,6 @@ struct ldap_connection *db_ldap_init(const char *config_path, bool userdb)
        /* see if it already exists */
        conn = ldap_conn_find(config_path);
        if (conn != NULL) {
-               if (userdb)
-                       conn->userdb_used = TRUE;
                conn->refcount++;
                return conn;
        }
@@ -2034,7 +2032,6 @@ struct ldap_connection *db_ldap_init(const char *config_path, bool userdb)
        conn->pool = pool;
        conn->refcount = 1;
 
-       conn->userdb_used = userdb;
        conn->conn_state = LDAP_CONN_STATE_DISCONNECTED;
        conn->default_bind_msgid = -1;
        conn->fd = -1;

diff --git a/src/auth/db-ldap.h b/src/auth/db-ldap.h
index 23e17323d506e0ee5f2e13a60f44e8cb6674d995..71198bafb2bf594b3843d42908546236e12cbd11 100644 (file)
--- a/src/auth/db-ldap.h
+++ b/src/auth/db-ldap.h
@@ -185,7 +185,6 @@ struct ldap_connection {
 
        char **pass_attr_names, **user_attr_names, **iterate_attr_names;
        ARRAY_TYPE(ldap_field) pass_attr_map, user_attr_map, iterate_attr_map;
-       bool userdb_used;
        bool delayed_connect;
 };
 
@@ -197,7 +196,7 @@ void db_ldap_set_attrs(struct ldap_connection *conn, const char *attrlist,
                       char ***attr_names_r, ARRAY_TYPE(ldap_field) *attr_map,
                       const char *skip_attr) ATTR_NULL(5);
 
-struct ldap_connection *db_ldap_init(const char *config_path, bool userdb);
+struct ldap_connection *db_ldap_init(const char *config_path);
 void db_ldap_unref(struct ldap_connection **conn);
 
 int db_ldap_connect(struct ldap_connection *conn);

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index c6e5cd1b774d39af662a38d57141c151752addde..90bc4cbc2e72bf17fc901a31577efa58a906efe9 100644 (file)
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -459,7 +459,7 @@ passdb_ldap_preinit(pool_t pool, const char *args)
        struct ldap_connection *conn;
 
        module = p_new(pool, struct ldap_passdb_module, 1);
-       module->conn = conn = db_ldap_init(args, FALSE);
+       module->conn = conn = db_ldap_init(args);
        p_array_init(&conn->pass_attr_map, pool, 16);
        db_ldap_set_attrs(conn, conn->set.pass_attrs, &conn->pass_attr_names,
                          &conn->pass_attr_map,

diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index 385a43ba2b696cf9e5ad87d8b1cdba6ad24a765a..d6186afc00159f64e640f9906b186c3abe394458 100644 (file)
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -283,7 +283,7 @@ userdb_ldap_preinit(pool_t pool, const char *args)
        struct ldap_connection *conn;
 
        module = p_new(pool, struct ldap_userdb_module, 1);
-       module->conn = conn = db_ldap_init(args, TRUE);
+       module->conn = conn = db_ldap_init(args);
        p_array_init(&conn->user_attr_map, pool, 16);
        p_array_init(&conn->iterate_attr_map, pool, 16);