[dovecot-cvs] dovecot/src/deliver deliver.c,1.20.2.23,1.20.2.24

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/deliver
In directory talvi:/tmp/cvs-serv8760

Modified Files:
      Tag: branch_1_0
	deliver.c 
Log Message:
If log_timestamp isn't uncommented in dovecot.conf, use the default.



Index: deliver.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/deliver/deliver.c,v
retrieving revision 1.20.2.23
retrieving revision 1.20.2.24
diff -u -d -r1.20.2.23 -r1.20.2.24
--- deliver.c	19 Jan 2007 20:26:43 -0000	1.20.2.23
+++ deliver.c	21 Jan 2007 15:49:52 -0000	1.20.2.24
@@ -369,7 +369,7 @@
 
 static void open_logfile(const char *username)
 {
-	const char *prefix, *log_path;
+	const char *prefix, *log_path, *stamp;
 
 	prefix = t_strdup_printf("deliver(%s)", username);
 	log_path = getenv("LOG_PATH");
@@ -386,7 +386,10 @@
 	if (log_path != NULL && *log_path != '\0')
 		i_set_info_file(log_path);
 
-	i_set_failure_timestamp_format(getenv("LOG_TIMESTAMP"));
+	stamp = getenv("LOG_TIMESTAMP");
+	if (stamp == NULL)
+		stamp = DEFAULT_FAILURE_STAMP_FORMAT;
+	i_set_failure_timestamp_format(stamp);
 }
 
 static void print_help(void)