[dovecot-cvs] dovecot/src/master auth-process.c,1.40,1.41 master-settings.c,1.15,1.16 master-settings.h,1.9,1.10

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv15194/src/master

Modified Files:
	auth-process.c master-settings.c master-settings.h 
Log Message:
Moved auth_username_chars from db-pgsql to generic for all. Some other
auth code cleanups.



Index: auth-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/auth-process.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- auth-process.c	2 Apr 2003 01:00:03 -0000	1.40
+++ auth-process.c	2 Apr 2003 02:09:41 -0000	1.41
@@ -316,6 +316,7 @@
 	env_put(t_strconcat("DEFAULT_REALM=", group->set->default_realm, NULL));
 	env_put(t_strconcat("USERDB=", group->set->userdb, NULL));
 	env_put(t_strconcat("PASSDB=", group->set->passdb, NULL));
+	env_put(t_strconcat("USERNAME_CHARS=", group->set->username_chars, NULL));
 
 	if (group->set->use_cyrus_sasl)
 		env_put("USE_CYRUS_SASL=1");

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- master-settings.c	2 Apr 2003 01:00:03 -0000	1.15
+++ master-settings.c	2 Apr 2003 02:09:41 -0000	1.16
@@ -207,6 +207,27 @@
 	MEMBER(uid) 0 /* generated */
 };
 
+struct auth_settings default_auth_settings = {
+	MEMBER(next) NULL,
+
+	MEMBER(name) NULL,
+	MEMBER(mechanisms) "plain",
+	MEMBER(realms) NULL,
+	MEMBER(default_realm) NULL,
+	MEMBER(userdb) "passwd",
+	MEMBER(passdb) "pam",
+	MEMBER(executable) PKG_LIBEXECDIR"/dovecot-auth",
+	MEMBER(user) "root",
+	MEMBER(chroot) NULL,
+	MEMBER(username_chars) "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
+
+	MEMBER(use_cyrus_sasl) FALSE,
+	MEMBER(verbose) FALSE,
+
+	MEMBER(count) 1,
+	MEMBER(process_size) 256
+};
+
 static pool_t settings_pool;
 struct settings *set = NULL;
 
@@ -402,10 +423,10 @@
 	struct auth_settings *auth;
 
 	auth = p_new(settings_pool, struct auth_settings, 1);
+
+	/* copy defaults */
+	*auth = default_auth_settings;
 	auth->name = p_strdup(settings_pool, name);
-	auth->executable = p_strdup(settings_pool,
-				    PKG_LIBEXECDIR"/dovecot-auth");
-	auth->count = 1;
 
 	auth->next = set->auths;
         set->auths = auth;

Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- master-settings.h	2 Apr 2003 01:00:03 -0000	1.9
+++ master-settings.h	2 Apr 2003 02:09:41 -0000	1.10
@@ -98,6 +98,7 @@
 	const char *executable;
 	const char *user;
 	const char *chroot;
+	const char *username_chars;
 
 	int use_cyrus_sasl, verbose;