dovecot-1.2-sieve: Fixed memset argument mixup in enotify extens...

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-1.2-sieve/rev/bc2d2ace4cef
changeset: 1238:bc2d2ace4cef
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Mon Mar 08 18:30:48 2010 +0100
description:
Fixed memset argument mixup in enotify extension.

diffstat:

 doc/man/sieve-test.1                               |  6 +++---
 src/lib-sieve/plugins/enotify/cmd-notify.c         |  2 +-
 src/lib-sieve/plugins/enotify/ext-enotify-common.c |  2 +-
 src/sieve-tools/sieve-test.c                       |  6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 9fe2a25cbf6e -r bc2d2ace4cef doc/man/sieve-test.1
--- a/doc/man/sieve-test.1	Sun Jan 31 16:12:46 2010 +0100
+++ b/doc/man/sieve-test.1	Mon Mar 08 18:30:48 2010 +0100
@@ -10,7 +10,7 @@
 [\fB\-l\fR \fImail\-location\fR]
 [\fB\-m\fR \fIdefault\-mailbox\fR]
 [\fB\-r\fR \fIrecipient\-address\fR]
-[\fB\-s\fR \fIscript\-file\fR]
+[\fB\-S\fR \fIscript\-file\fR]
 [\fB\-t\fR]
 [\fB\-x\fR "\fIextension extension ...\fR"]
 \fIscript\-file\fR \fImail\-file\fR
@@ -78,8 +78,8 @@
 The envelope recipient address. This is what Sieve's envelope test will compare to when the "to"
 envelope part is requested. Some tests and actions will also use this as the owner's e\-mail address.
 .TP
-\fB\-s\fP \fIscript\-file\fP
-Specify additional scripts to be executed before the main script. Multiple \fB\-s\fP arguments are
+\fB\-S\fP \fIscript\-file\fP
+Specify additional scripts to be executed before the main script. Multiple \fB\-S\fP arguments are
 allowed and the specified scripts are executed sequentially in the order specified at the command
 line.
 .TP
diff -r 9fe2a25cbf6e -r bc2d2ace4cef src/lib-sieve/plugins/enotify/cmd-notify.c
--- a/src/lib-sieve/plugins/enotify/cmd-notify.c	Sun Jan 31 16:12:46 2010 +0100
+++ b/src/lib-sieve/plugins/enotify/cmd-notify.c	Mon Mar 08 18:30:48 2010 +0100
@@ -541,7 +541,7 @@
 	if ( nmth_def->action_check_duplicates == NULL )
 		return 0;
 
-	memset(&nenv, sizeof(nenv), 0);
+	memset(&nenv, 0, sizeof(nenv));
 	nenv.method = nact->method;	
 	nenv.ehandler = sieve_prefix_ehandler_create
 		(sieve_result_get_error_handler(renv->result), act->location, "notify");
diff -r 9fe2a25cbf6e -r bc2d2ace4cef src/lib-sieve/plugins/enotify/ext-enotify-common.c
--- a/src/lib-sieve/plugins/enotify/ext-enotify-common.c	Sun Jan 31 16:12:46 2010 +0100
+++ b/src/lib-sieve/plugins/enotify/ext-enotify-common.c	Mon Mar 08 18:30:48 2010 +0100
@@ -321,7 +321,7 @@
 	bool result = TRUE, check = TRUE;
 	
 	/* Compose log structure */
-	memset(&nenv, sizeof(nenv), 0);
+	memset(&nenv, 0, sizeof(nenv));
 	nenv.method = method;	
 	nenv.ehandler = sieve_prefix_ehandler_create
 		(sieve_validator_error_handler(valdtr), 
diff -r 9fe2a25cbf6e -r bc2d2ace4cef src/sieve-tools/sieve-test.c
--- a/src/sieve-tools/sieve-test.c	Sun Jan 31 16:12:46 2010 +0100
+++ b/src/sieve-tools/sieve-test.c	Mon Mar 08 18:30:48 2010 +0100
@@ -39,7 +39,7 @@
 	printf(
 "Usage: sieve-test [-c] [-d <dump-filename>] [-e] [-f <envelope-sender>]\n"
 "                  [-l <mail-location>] [-m <default-mailbox>]\n" 
-"                  [-r <recipient-address>] [-s <script-file>]\n"
+"                  [-r <recipient-address>] [-S <script-file>]\n"
 "                  [-t] [-P <plugin>] [-x <extensions>]\n"
 "                  <script-file> <mail-file>\n"
 	);
@@ -167,14 +167,14 @@
 				i_fatal("Missing -x argument");
 			}
 			extensions = argv[i];
-		} else if (strcmp(argv[i], "-s") == 0) {
+		} else if (strcmp(argv[i], "-S") == 0) {
 			const char *file;
 			
 			/* scriptfile executed before main script */
 			i++;
 			if (i == argc) {
 				print_help();
-				i_fatal("Missing -s argument");
+				i_fatal("Missing -S argument");
 			}
 				
 			file = t_strdup(argv[i]);