[dovecot-cvs] dovecot/src/auth db-ldap.c,1.5,1.6 db-ldap.h,1.4,1.5 userdb-ldap.c,1.5,1.6

[cras at procontrol.fi]

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

Modified Files:
	db-ldap.c db-ldap.h userdb-ldap.c 
Log Message:
Added user_global_uid and user_global_gid LDAP settings.



Index: db-ldap.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/db-ldap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- db-ldap.c	11 Feb 2003 10:11:31 -0000	1.5
+++ db-ldap.c	11 Feb 2003 12:53:56 -0000	1.6
@@ -32,7 +32,9 @@
 	DEF(SET_STR, user_attrs),
 	DEF(SET_STR, user_filter),
 	DEF(SET_STR, pass_attrs),
-	DEF(SET_STR, pass_filter)
+	DEF(SET_STR, pass_filter),
+	DEF(SET_STR, user_global_uid),
+	DEF(SET_STR, user_global_gid)
 };
 
 struct ldap_settings default_ldap_settings = {
@@ -45,7 +47,9 @@
 	MEMBER(user_attrs) NULL,
 	MEMBER(user_filter) NULL,
 	MEMBER(pass_attrs) NULL,
-	MEMBER(pass_filter) NULL
+	MEMBER(pass_filter) NULL,
+	MEMBER(user_global_uid) 0,
+	MEMBER(user_global_gid) 0
 };
 
 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.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- db-ldap.h	11 Feb 2003 10:11:31 -0000	1.4
+++ db-ldap.h	11 Feb 2003 12:53:56 -0000	1.5
@@ -22,6 +22,9 @@
 	const char *pass_attrs;
 	const char *pass_filter;
 
+	unsigned int user_global_uid;
+	unsigned int user_global_gid;
+
 	int ldap_deref, ldap_scope;
 };
 

Index: userdb-ldap.c
===================================================================
RCS file: /home/cvs/dovecot/src/auth/userdb-ldap.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- userdb-ldap.c	11 Feb 2003 10:11:31 -0000	1.5
+++ userdb-ldap.c	11 Feb 2003 12:53:56 -0000	1.6
@@ -107,6 +107,9 @@
 	t_push();
 	memset(&user, 0, sizeof(user));
 
+	user.uid = conn->set.user_global_uid;
+	user.gid = conn->set.user_global_gid;
+
 	attr = ldap_first_attribute(conn->ld, entry, &ber);
 	while (attr != NULL) {
 		vals = ldap_get_values(conn->ld, entry, attr);