diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-06 10:06:14 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-04-06 10:06:14 +0000 |
| commit | 31619da69c9e692f006db273d95d20ae279a7d39 (patch) | |
| tree | 67d73c254bb982193c99cea04915ce28eceb599a | |
| parent | c2c19e9d1770ce26d595d9300f1f2e8c68125ba4 (diff) | |
Show command line arguments in debugging output, even without
log_selector=+arguments.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 6 | ||||
| -rw-r--r-- | src/src/exim.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 22e76ad56..570e23a41 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.111 2005/04/05 15:47:50 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.112 2005/04/06 10:06:14 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -150,6 +150,10 @@ PH/24 The cyrus_sasl authenticator was advertising mechanisms for which it unavailable mechs specified in the exim configuration are still caught, and the auth.log warnings about OTP are gone." +PH/25 When debugging is enabled, the contents of the command line are added + to the debugging output, even when log_selector=+arguments is not + specified. + A note about Exim versions 4.44 and 4.50 ---------------------------------------- diff --git a/src/src/exim.c b/src/src/exim.c index ffe596d15..35151c28c 100644 --- a/src/src/exim.c +++ b/src/src/exim.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/exim.c,v 1.17 2005/03/22 14:11:54 ph10 Exp $ */ +/* $Cambridge: exim/src/src/exim.c,v 1.18 2005/04/06 10:06:14 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -3237,8 +3237,8 @@ a debugging feature for finding out what arguments certain MUAs actually use. Don't attempt it if logging is disabled, or if listing variables or if verifying/testing addresses or expansions. */ -if ((log_extra_selector & LX_arguments) != 0 && really_exim - && !list_options && !checking) +if (((debug_selector & D_any) != 0 || (log_extra_selector & LX_arguments) != 0) + && really_exim && !list_options && !checking) { int i; uschar *p = big_buffer; @@ -3270,7 +3270,11 @@ if ((log_extra_selector & LX_arguments) != 0 && really_exim (p - big_buffer) - 4), printing, quote); while (*p) p++; } - log_write(0, LOG_MAIN, "%s", big_buffer); + + if ((log_extra_selector & LX_arguments) != 0) + log_write(0, LOG_MAIN, "%s", big_buffer); + else + debug_printf("%s\n", big_buffer); } /* Set the working directory to be the top-level spool directory. We don't rely |