[dovecot-cvs] dovecot/src/auth db-ldap.c,1.4,1.5 db-ldap.h,1.3,1.4 passdb-ldap.c,1.1,1.2 userdb-ldap.c,1.4,1.5

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/auth
In directory danu:/tmp/cvs-serv1071/src/auth

Modified Files:
	db-ldap.c db-ldap.h passdb-ldap.c userdb-ldap.c 
Log Message:
Separate user and pass attrs/filters in config file



Index: db-ldap.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/db-ldap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db-ldap.c	11 Feb 2003 09:55:58 -0000	1.4
+++ db-ldap.c	11 Feb 2003 10:11:31 -0000	1.5
@@ -29,8 +29,10 @@
 	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 @@
 	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);

Index: db-ldap.h
===================================================================
RCS file: /home/cvs/dovecot/src/auth/db-ldap.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- db-ldap.h	11 Feb 2003 09:55:58 -0000	1.3
+++ db-ldap.h	11 Feb 2003 10:11:31 -0000	1.4
@@ -17,8 +17,10 @@
 	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;
 };

Index: passdb-ldap.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/passdb-ldap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- passdb-ldap.c	11 Feb 2003 09:55:58 -0000	1.1
+++ passdb-ldap.c	11 Feb 2003 10:11:31 -0000	1.2
@@ -159,12 +159,12 @@
 				   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 @@
 	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);
 }

Index: userdb-ldap.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/userdb-ldap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- userdb-ldap.c	11 Feb 2003 09:55:58 -0000	1.4
+++ userdb-ldap.c	11 Feb 2003 10:11:31 -0000	1.5
@@ -144,12 +144,12 @@
 	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 @@
 	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);
 }