[dovecot-cvs] dovecot/src/master auth-process.c, 1.92, 1.93 master-settings.c, 1.115, 1.116 master-settings.h, 1.76, 1.77

[tss-movial at dovecot.org]

Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv13212/src/master

Modified Files:
	auth-process.c master-settings.c master-settings.h 
Log Message:
Added auth_master_user_separator setting which allows giving the master username inside the normal username.



Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- auth-process.c	25 Mar 2006 10:22:04 -0000	1.92
+++ auth-process.c	27 Mar 2006 12:54:27 -0000	1.93
@@ -418,8 +418,10 @@
 	env_put(t_strconcat("USERNAME_CHARS=", set->username_chars, NULL));
 	env_put(t_strconcat("USERNAME_TRANSLATION=",
 			    set->username_translation, NULL));
-	env_put(t_strconcat("ANONYMOUS_USERNAME=",
-			    set->anonymous_username, NULL));
+	env_put(t_strconcat("USERNAME_TRANSLATION=",
+			    set->username_translation, NULL));
+	env_put(t_strconcat("MASTER_USER_SEPARATOR=",
+			    set->master_user_separator, NULL));
 	env_put(t_strdup_printf("CACHE_SIZE=%u", set->cache_size));
 	env_put(t_strdup_printf("CACHE_TTL=%u", set->cache_ttl));
 

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- master-settings.c	25 Mar 2006 10:22:04 -0000	1.115
+++ master-settings.c	27 Mar 2006 12:54:27 -0000	1.116
@@ -167,6 +167,7 @@
 	DEF(SET_STR, chroot),
 	DEF(SET_STR, username_chars),
 	DEF(SET_STR, username_translation),
+	DEF(SET_STR, master_user_separator),
 	DEF(SET_STR, anonymous_username),
 	DEF(SET_STR, krb5_keytab),
 
@@ -375,6 +376,7 @@
 	MEMBER(chroot) NULL,
 	MEMBER(username_chars) "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
 	MEMBER(username_translation) "",
+	MEMBER(master_user_separator) NULL,
 	MEMBER(anonymous_username) "anonymous",
 	MEMBER(krb5_keytab) NULL,
 

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- master-settings.h	25 Mar 2006 10:22:04 -0000	1.76
+++ master-settings.h	27 Mar 2006 12:54:27 -0000	1.77
@@ -172,6 +172,7 @@
 	const char *chroot;
 	const char *username_chars;
 	const char *username_translation;
+	const char *master_user_separator;
 	const char *anonymous_username;
 	const char *krb5_keytab;