dovecot-2.2: ldap: Removed warning about changed user_* settings.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/324df4134049
changeset: 14419:324df4134049
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Apr 04 06:16:18 2012 +0300
description:
ldap: Removed warning about changed user_* settings.
This warning can happen even with recommended settings when symlinking the
passdb's ldap config to userdb ldap config.

diffstat:

 src/auth/db-ldap.c     |  27 ---------------------------
 src/auth/db-ldap.h     |   3 +--
 src/auth/passdb-ldap.c |   1 -
 3 files changed, 1 insertions(+), 30 deletions(-)

diffs (68 lines):

diff -r 2250f11695bc -r 324df4134049 src/auth/db-ldap.c
--- a/src/auth/db-ldap.c	Wed Apr 04 06:12:24 2012 +0300
+++ b/src/auth/db-ldap.c	Wed Apr 04 06:16:18 2012 +0300
@@ -1464,33 +1464,6 @@
 	pool_unref(&conn->pool);
 }
 
-void db_ldap_check_userdb_warning(struct ldap_connection *conn)
-{
-	const struct ldap_settings *def = &default_ldap_settings;
-	const char *set_name;
-
-	if (worker || conn->userdb_used || conn->set.userdb_warning_disable)
-		return;
-
-	if (strcmp(conn->set.user_attrs, def->user_attrs) != 0)
-		set_name = "user_attrs";
-	else if (strcmp(conn->set.user_filter, def->user_filter) != 0)
-		set_name = "user_filter";
-	else if (strcmp(conn->set.iterate_attrs, def->iterate_attrs) != 0)
-		set_name = "iterate_attrs";
-	else if (strcmp(conn->set.iterate_filter, def->iterate_filter) != 0)
-		set_name = "iterate_filter";
-	else
-		set_name = NULL;
-
-	if (set_name != NULL) {
-		i_warning("ldap: Ignoring changed %s in %s, "
-			  "because userdb ldap not used. "
-			  "(If this is intentional, set userdb_warning_disable=yes)",
-			  set_name, conn->config_path);
-	}
-}
-
 #ifndef BUILTIN_LDAP
 /* Building a plugin */
 extern struct passdb_module_interface passdb_ldap_plugin;
diff -r 2250f11695bc -r 324df4134049 src/auth/db-ldap.h
--- a/src/auth/db-ldap.h	Wed Apr 04 06:12:24 2012 +0300
+++ b/src/auth/db-ldap.h	Wed Apr 04 06:16:18 2012 +0300
@@ -63,7 +63,7 @@
 	const char *iterate_filter;
 
 	const char *default_pass_scheme;
-	bool userdb_warning_disable;
+	bool userdb_warning_disable; /* deprecated for now at least */
 
 	/* ... */
 	int ldap_deref, ldap_scope;
@@ -172,7 +172,6 @@
 struct ldap_connection *db_ldap_init(const char *config_path, bool userdb);
 void db_ldap_unref(struct ldap_connection **conn);
 
-void db_ldap_check_userdb_warning(struct ldap_connection *conn);
 int db_ldap_connect(struct ldap_connection *conn);
 
 void db_ldap_enable_input(struct ldap_connection *conn, bool enable);
diff -r 2250f11695bc -r 324df4134049 src/auth/passdb-ldap.c
--- a/src/auth/passdb-ldap.c	Wed Apr 04 06:12:24 2012 +0300
+++ b/src/auth/passdb-ldap.c	Wed Apr 04 06:16:18 2012 +0300
@@ -432,7 +432,6 @@
 		/* Credential lookups can't be done with authentication binds */
 		_module->iface.lookup_credentials = NULL;
 	}
-	db_ldap_check_userdb_warning(module->conn);
 }
 
 static void passdb_ldap_deinit(struct passdb_module *_module)