Reversed the meaning of -l - So now previous scripts that people are
using now it does the exact opposite.
Not a good compatibility. Recommend adding a new flag for disabling
syslog and keeping the -l there with the same meaning for compatibility.
-------- Original Message --------
Subject: [SCM] opendkim branch, develop, updated.
3fb02de7467854fc70e0a7ebf5fe66357efa260e
Date: Fri, 22 Feb 2013 17:37:18 +0000
From: Murray S. Kucherawy <cm-msk_at_users.sourceforge.net>
To: opendkim-cvs_at_lists.opendkim.org
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "opendkim".
The branch, develop has been updated
via 3fb02de7467854fc70e0a7ebf5fe66357efa260e (commit)
from 55c1daa7b8a5b15e7a11bffd9d2f2a9802254b74 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3fb02de7467854fc70e0a7ebf5fe66357efa260e
Author: Murray S. Kucherawy <msk_at_trusteddomain.org>
Date: Fri Feb 22 09:36:29 2013 -0800
Log by default
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 3a2c832..8a209f4 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
_at_@ -4,7 +4,7 @@
This listing shows the versions of the OpenDKIM package, the date of
release, and a summary of the changes in that release.
-2.8.0 2013/02/??
+2.8.0 2013/02/22
Feature request #SF2964383: Add DKIM_LIBFLAGS_STRICTRESIGN, which
inhibits signing of a handle tagged for resigning when the
attached verifying handle had no valid signatures in it.
_at_@ -40,6 +40,8 @@ release, and a summary of the changes in that release.
modified. Suggested by Scott Kitterman.
Fix bug #SF3604525: Don't divide by zero when the query cache hasn't
been used. Reported by Denis Klimov.
+ The default for "Syslog" is now "true", and the meaning of the
+ command line flag "-l" has been inverted.
Protect against handling of signatures with empty domains, which could
cause a NULL dereference and a crash. Problem noted by
Motohiro Ishiyama and John Wood.
diff --git a/opendkim/opendkim.8.in b/opendkim/opendkim.8.in
index fd58333..f1fd25f 100644
--- a/opendkim/opendkim.8.in
+++ b/opendkim/opendkim.8.in
_at_@ -287,9 +287,9 @@ all messages. Ignored if a configuration file is referenced that defines
a KeyTable.
.TP
.I \-l
-Log via calls to
-.I syslog(3)
-any interesting activity.
+By default, the filter will log any interesting activity via calls to
+.I syslog(3).
+This option suppresses logging.
.TP
.I \-L min[%+]
Instructs the verification code to fail messages for which a partial
_at_@ -389,7 +389,8 @@ Evaluates (verifies) one or more RFC5322-formatted message found in
and exits. The value of
.I testfiles
should be a comma-separated list of one or more filenames, one of which
-may be "-" if the message should be read from standard input.
+may be "-" if the message should be read from standard input. Suppresses
+logging (see "\-l" above).
.TP
.I \-T secs
Sets the DNS timeout in seconds. A value of 0 causes an infinite wait.
diff --git a/opendkim/opendkim.c b/opendkim/opendkim.c
index fbfb8c0..c882db2 100644
--- a/opendkim/opendkim.c
+++ b/opendkim/opendkim.c
_at_@ -6066,6 +6066,7 @@ dkimf_config_new(void)
new->conf_atpshash = dkimf_atpshash[0].str;
#endif /* _FFR_ATPS */
new->conf_selectcanonhdr = SELECTCANONHDR;
+ new->conf_dolog = TRUE;
memcpy(&new->conf_handling, &defaults, sizeof new->conf_handling);
_at_@ -6661,11 +6662,8 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf,
sizeof conf->conf_subdomains);
}
- if (!conf->conf_dolog)
- {
- (void) config_get(data, "Syslog", &conf->conf_dolog,
- sizeof conf->conf_dolog);
- }
+ (void) config_get(data, "Syslog", &conf->conf_dolog,
+ sizeof conf->conf_dolog);
if (!conf->conf_logwhy)
{
_at_@ -8674,8 +8672,8 @@ dkimf_config_load(struct config *data, struct dkimf_config *conf,
if (data != NULL)
{
- (void) config_get(data, "SyslogFacility", &log_facility,
- sizeof log_facility);
+ (void) config_get(data, "SyslogFacility",
+ &log_facility, sizeof log_facility);
}
dkimf_init_syslog(log_facility);
_at_@ -16837,7 +16835,7 @@ main(int argc, char **argv)
break;
case 'l':
- curconf->conf_dolog = TRUE;
+ curconf->conf_dolog = FALSE;
break;
case 'L':
diff --git a/opendkim/opendkim.conf.5.in b/opendkim/opendkim.conf.5.in
index 8b2c431..1cec0eb 100644
--- a/opendkim/opendkim.conf.5.in
+++ b/opendkim/opendkim.conf.5.in
_at_@ -1203,7 +1203,7 @@ parameter as well as the actual domains.
.I Syslog (Boolean)
Log via calls to
.I syslog(3)
-any interesting activity.
+any interesting activity. The default is "true".
.TP
.I SyslogFacility (string)
diff --git a/opendkim/opendkim.conf.sample b/opendkim/opendkim.conf.sample
index 2b967be..f177134 100644
--- a/opendkim/opendkim.conf.sample
+++ b/opendkim/opendkim.conf.sample
_at_@ -696,11 +696,11 @@ Socket inet:port_at_localhost
# SubDomains No
## Syslog { yes | no }
-## default "no"
+## default "yes"
##
## Log informational and error activity to syslog?
-# Syslog No
+# Syslog Yes
## SyslogFacility facility
## default "mail"
-----------------------------------------------------------------------
Summary of changes:
RELEASE_NOTES | 4 +++-
opendkim/opendkim.8.in | 9 +++++----
opendkim/opendkim.c | 14 ++++++--------
opendkim/opendkim.conf.5.in | 2 +-
opendkim/opendkim.conf.sample | 4 ++--
5 files changed, 17 insertions(+), 16 deletions(-)
hooks/post-receive
--
opendkim
Received on Sat Feb 23 2013 - 08:46:08 PST