Separate user and pass attrs/filters in config file

--HG--
branch : HEAD

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index c99ddc2b3f20fbd8754d6de7c69b21695c63c50c..d3c5a04eaa6581c4dcba6e41d0a88e5ad1876622 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -29,8 +29,10 @@ static struct setting_def setting_defs[] = {
        DEF(SET_STR, deref),
        DEF(SET_STR, scope),
        DEF(SET_STR, base),
-       DEF(SET_STR, attrs),
-       DEF(SET_STR, filter)
+       DEF(SET_STR, user_attrs),
+       DEF(SET_STR, user_filter),
+       DEF(SET_STR, pass_attrs),
+       DEF(SET_STR, pass_filter)
 };
 
 struct ldap_settings default_ldap_settings = {
@@ -40,8 +42,10 @@ struct ldap_settings default_ldap_settings = {
        MEMBER(deref) "never",
        MEMBER(scope) "subtree",
        MEMBER(base) NULL,
-       MEMBER(attrs) NULL,
-       MEMBER(filter) NULL
+       MEMBER(user_attrs) NULL,
+       MEMBER(user_filter) NULL,
+       MEMBER(pass_attrs) NULL,
+       MEMBER(pass_filter) NULL
 };
 
 static int ldap_conn_open(struct ldap_connection *conn);

diff --git a/src/auth/db-ldap.h b/src/auth/db-ldap.h
index 8f6470907f4867da81d2ca04a5199bc0288b3109..c39c7b74a3fd2f3fd1d74f18cef342a76b4d926b 100644 (file)
--- a/src/auth/db-ldap.h
+++ b/src/auth/db-ldap.h
@@ -17,8 +17,10 @@ struct ldap_settings {
        const char *deref;
        const char *scope;
        const char *base;
-       const char *attrs;
-       const char *filter;
+       const char *user_attrs;
+       const char *user_filter;
+       const char *pass_attrs;
+       const char *pass_filter;
 
        int ldap_deref, ldap_scope;
 };

diff --git a/src/auth/passdb-ldap.c b/src/auth/passdb-ldap.c
index 58d92307f4f847c22346bc721ece64a4c750798c..8011400f8e3f13cf23e4ed6da7d2d5e810546427 100644 (file)
--- a/src/auth/passdb-ldap.c
+++ b/src/auth/passdb-ldap.c
@@ -159,12 +159,12 @@ static void ldap_lookup_pass(struct auth_request *auth_request,
                                   auth_request->realm, NULL);
        }
 
-       if (conn->set.filter == NULL) {
+       if (conn->set.pass_filter == NULL) {
                filter = t_strdup_printf("(&(objectClass=posixAccount)(%s=%s))",
                        passdb_ldap_conn->attr_names[ATTR_VIRTUAL_USER], user);
        } else {
                str = t_str_new(512);
-               var_expand(str, conn->set.filter, user, NULL);
+               var_expand(str, conn->set.pass_filter, user, NULL);
                filter = str_c(str);
        }
 
@@ -211,8 +211,8 @@ static void passdb_ldap_init(const char *args)
        passdb_ldap_conn = i_new(struct passdb_ldap_connection, 1);
        passdb_ldap_conn->conn = conn = db_ldap_init(args);
 
-       db_ldap_set_attrs(conn, conn->set.attrs ?
-                         conn->set.attrs : DEFAULT_ATTRIBUTES,
+       db_ldap_set_attrs(conn, conn->set.pass_attrs ?
+                         conn->set.pass_attrs : DEFAULT_ATTRIBUTES,
                          &passdb_ldap_conn->attrs,
                          &passdb_ldap_conn->attr_names);
 }

diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index d733a04f4f49f3f9fd2cb2d94b09470ad2b1b7e5..1854473badd6bd635b275ad18632bdc6e8d88e5c 100644 (file)
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -144,12 +144,12 @@ static void userdb_ldap_lookup(const char *user, const char *realm,
        if (realm != NULL)
                user = t_strconcat(user, "@", realm, NULL);
 
-       if (conn->set.filter == NULL) {
+       if (conn->set.user_filter == NULL) {
                filter = t_strdup_printf("(&(objectClass=posixAccount)(%s=%s))",
                        userdb_ldap_conn->attr_names[ATTR_VIRTUAL_USER], user);
        } else {
                str = t_str_new(512);
-               var_expand(str, conn->set.filter, user, NULL);
+               var_expand(str, conn->set.user_filter, user, NULL);
                filter = str_c(str);
        }
 
@@ -170,8 +170,8 @@ static void userdb_ldap_init(const char *args)
        userdb_ldap_conn = i_new(struct userdb_ldap_connection, 1);
        userdb_ldap_conn->conn = conn = db_ldap_init(args);
 
-       db_ldap_set_attrs(conn, conn->set.attrs ?
-                         conn->set.attrs : DEFAULT_ATTRIBUTES,
+       db_ldap_set_attrs(conn, conn->set.user_attrs ?
+                         conn->set.user_attrs : DEFAULT_ATTRIBUTES,
                          &userdb_ldap_conn->attrs,
                          &userdb_ldap_conn->attr_names);
 }