[dovecot-cvs] dovecot/src/login-common common.h, 1.9, 1.10 main.c, 1.31, 1.32

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv5712/login-common

Modified Files:
	common.h main.c 
Log Message:
If we have plugins set and imap_capability unset, figure out the IMAP
capabilities automatically by running imap binary at startup. The generated
capability list isn't updated until Dovecot is restarted completely, so if
you add or remove IMAP plugins you should restart.



Index: common.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/common.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- common.h	13 Jan 2006 20:26:39 -0000	1.9
+++ common.h	14 Apr 2006 18:20:57 -0000	1.10
@@ -15,6 +15,7 @@
 extern bool verbose_proctitle, verbose_ssl, verbose_auth;
 extern const char *greeting, *log_format;
 extern const char *const *log_format_elements;
+extern const char *capability_string;
 extern unsigned int max_logging_users;
 extern unsigned int login_process_uid;
 extern struct auth_client *auth_client;

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- main.c	29 Jan 2006 12:14:49 -0000	1.31
+++ main.c	14 Apr 2006 18:20:57 -0000	1.32
@@ -207,6 +207,11 @@
 	if (login_process_uid == 0)
 		i_fatal("BUG: PROCESS_UID environment is 0");
 
+	/* capability default is set in imap/pop3-login */
+	value = getenv("CAPABILITY_STRING");
+	if (value != NULL && *value != '\0')
+		capability_string = value;
+
         closing_down = FALSE;
 	main_refcount = 0;