[dovecot-cvs] dovecot/src/master login-process.c, 1.63, 1.64 mail-process.c, 1.73, 1.74 master-settings.c, 1.84, 1.85 master-settings.h, 1.56, 1.57

[cras at dovecot.org]

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

Modified Files:
	login-process.c mail-process.c master-settings.c 
	master-settings.h 
Log Message:
Added configurable logging for login process. Added configurable pop3 logout
string. Based on a patch by Andrey Panin.



Index: login-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/login-process.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- login-process.c	9 Jan 2005 20:12:35 -0000	1.63
+++ login-process.c	14 May 2005 20:32:06 -0000	1.64
@@ -439,6 +439,9 @@
 
 	env_put(t_strconcat("PROCESS_UID=", dec2str(pid), NULL));
 	env_put(t_strconcat("GREETING=", set->login_greeting, NULL));
+	env_put(t_strconcat("LOG_FORMAT_ELEMENTS=",
+			    set->login_log_format_elements, NULL));
+	env_put(t_strconcat("LOG_FORMAT=", set->login_log_format, NULL));
 	if (set->login_greeting_capability)
 		env_put("GREETING_CAPABILITY=1");
 }

Index: mail-process.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/mail-process.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- mail-process.c	12 Apr 2005 08:37:26 -0000	1.73
+++ mail-process.c	14 May 2005 20:32:06 -0000	1.74
@@ -205,6 +205,8 @@
 			    set->pop3_uidl_format, NULL));
 	env_put(t_strconcat("POP3_CLIENT_WORKAROUNDS=",
 			    set->pop3_client_workarounds, NULL));
+	env_put(t_strconcat("POP3_LOGOUT_FORMAT=",
+			    set->pop3_logout_format, NULL));
 
 	if (set->mail_save_crlf)
 		env_put("MAIL_SAVE_CRLF=1");

Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- master-settings.c	16 Apr 2005 19:44:12 -0000	1.84
+++ master-settings.c	14 May 2005 20:32:06 -0000	1.85
@@ -69,6 +69,8 @@
 	DEF(SET_STR, login_executable),
 	DEF(SET_STR, login_user),
 	DEF(SET_STR, login_greeting),
+	DEF(SET_STR, login_log_format_elements),
+	DEF(SET_STR, login_log_format),
 
 	DEF(SET_BOOL, login_process_per_connection),
 	DEF(SET_BOOL, login_chroot),
@@ -131,6 +133,7 @@
 	DEF(SET_BOOL, pop3_enable_last),
 	DEF(SET_STR, pop3_uidl_format),
 	DEF(SET_STR, pop3_client_workarounds),
+	DEF(SET_STR, pop3_logout_format),
 
 	{ 0, NULL, 0 }
 };
@@ -258,6 +261,8 @@
 	MEMBER(login_executable) NULL,
 	MEMBER(login_user) "dovecot",
 	MEMBER(login_greeting) "Dovecot ready.",
+	MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",
+	MEMBER(login_log_format) "%$: %s",
 
 	MEMBER(login_process_per_connection) TRUE,
 	MEMBER(login_chroot) TRUE,
@@ -324,6 +329,7 @@
 	MEMBER(pop3_enable_last) FALSE,
 	MEMBER(pop3_uidl_format) "%v.%u",
 	MEMBER(pop3_client_workarounds) NULL,
+	MEMBER(pop3_logout_format) "top=%t/%T, retr=%r/%R, del=%d/%m, size=%s",
 
 	/* .. */
 	MEMBER(login_uid) 0,

Index: master-settings.h
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- master-settings.h	7 Mar 2005 18:55:15 -0000	1.56
+++ master-settings.h	14 May 2005 20:32:06 -0000	1.57
@@ -40,6 +40,8 @@
 	const char *login_executable;
 	const char *login_user;
 	const char *login_greeting;
+	const char *login_log_format_elements;
+	const char *login_log_format;
 
 	int login_process_per_connection;
 	int login_chroot;
@@ -100,6 +102,7 @@
 	int pop3_enable_last;
 	const char *pop3_uidl_format;
 	const char *pop3_client_workarounds;
+	const char *pop3_logout_format;
 
 	/* .. */
 	uid_t login_uid;