[dovecot-cvs] dovecot/src/master auth-process.c, 1.94, 1.95 master-settings.c, 1.121, 1.122 master-settings.h, 1.80, 1.81

[cras at dovecot.org]

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

Modified Files:
	auth-process.c master-settings.c master-settings.h 
Log Message:
Added auth_username_format setting.



Index: auth-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- auth-process.c	9 Apr 2006 14:36:03 -0000	1.94
+++ auth-process.c	12 Apr 2006 14:37:05 -0000	1.95
@@ -420,8 +420,7 @@
 	env_put(t_strconcat("USERNAME_CHARS=", set->username_chars, NULL));
 	env_put(t_strconcat("USERNAME_TRANSLATION=",
 			    set->username_translation, NULL));
-	env_put(t_strconcat("USERNAME_TRANSLATION=",
-			    set->username_translation, NULL));
+	env_put(t_strconcat("USERNAME_FORMAT=", set->username_format, NULL));
 	env_put(t_strconcat("MASTER_USER_SEPARATOR=",
 			    set->master_user_separator, NULL));
 	env_put(t_strdup_printf("CACHE_SIZE=%u", set->cache_size));

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- master-settings.c	12 Apr 2006 11:42:57 -0000	1.121
+++ master-settings.c	12 Apr 2006 14:37:05 -0000	1.122
@@ -169,6 +169,7 @@
 	DEF(SET_STR, chroot),
 	DEF(SET_STR, username_chars),
 	DEF(SET_STR, username_translation),
+	DEF(SET_STR, username_format),
 	DEF(SET_STR, master_user_separator),
 	DEF(SET_STR, anonymous_username),
 	DEF(SET_STR, krb5_keytab),
@@ -380,6 +381,7 @@
 	MEMBER(chroot) NULL,
 	MEMBER(username_chars) "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
 	MEMBER(username_translation) "",
+	MEMBER(username_format) "",
 	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.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- master-settings.h	12 Apr 2006 11:42:57 -0000	1.80
+++ master-settings.h	12 Apr 2006 14:37:05 -0000	1.81
@@ -174,6 +174,7 @@
 	const char *chroot;
 	const char *username_chars;
 	const char *username_translation;
+	const char *username_format;
 	const char *master_user_separator;
 	const char *anonymous_username;
 	const char *krb5_keytab;