From 2873603ab5e7451ad8fd3ee75b859d709ae0378a Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Tue, 30 May 2006 17:41:54 +0000
Subject: [PATCH] If the user specifies --log-file-format without --log-file,
 ignore the useless value.

---
 options.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/options.c b/options.c
index 60a72fd3..1727d4bd 100644
--- a/options.c
+++ b/options.c
@@ -1321,7 +1321,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 				logfile_format_has_o_or_i = 1;
 		}
 		log_init();
-	}
+	} else if (!am_daemon)
+		logfile_format = NULL;
 
 	if (daemon_bwlimit && (!bwlimit || bwlimit > daemon_bwlimit))
 		bwlimit = daemon_bwlimit;
-- 
2.34.1