dovecot-2.2-pigeonhole: Merged changes from Pigeonhole v0.3 tree.

[pigeonhole at rename-it.nl]

details:   http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/09ce20eaa1c2
changeset: 1793:09ce20eaa1c2
user:      Stephan Bosch <stephan at rename-it.nl>
date:      Thu Aug 15 21:07:56 2013 +0200
description:
Merged changes from Pigeonhole v0.3 tree.

diffstat:

 src/lib-sieve/ext-envelope.c                |   3 ++-
 src/lib-sieve/sieve-address.c               |   3 ++-
 src/lib-sieve/sieve-validator.c             |  12 +++++++-----
 src/managesieve-login/client-authenticate.c |   5 ++---
 src/testsuite/testsuite-objects.c           |   4 ++--
 src/testsuite/testsuite.c                   |   1 +
 6 files changed, 16 insertions(+), 12 deletions(-)

diffs (116 lines):

diff -r bb5fa32f87bc -r 09ce20eaa1c2 src/lib-sieve/ext-envelope.c
--- a/src/lib-sieve/ext-envelope.c	Thu Aug 15 20:48:54 2013 +0200
+++ b/src/lib-sieve/ext-envelope.c	Thu Aug 15 21:07:56 2013 +0200
@@ -408,7 +408,8 @@
 
 	if ( addr.local_part != NULL ) {
 		const char *addr_str = sieve_address_to_string(&addr);
-		*str_r = t_str_new_const(addr_str, strlen(addr_str));
+		if (str_r != NULL)
+			*str_r = t_str_new_const(addr_str, strlen(addr_str));
 	}
 
 	return 1;
diff -r bb5fa32f87bc -r 09ce20eaa1c2 src/lib-sieve/sieve-address.c
--- a/src/lib-sieve/sieve-address.c	Thu Aug 15 20:48:54 2013 +0200
+++ b/src/lib-sieve/sieve-address.c	Thu Aug 15 21:07:56 2013 +0200
@@ -144,7 +144,8 @@
 
 	if ( addr.local_part != NULL ) {
 		const char *addr_str = sieve_address_to_string(&addr);
-		*str_r = t_str_new_const(addr_str, strlen(addr_str));
+		if ( str_r != NULL )
+			*str_r = t_str_new_const(addr_str, strlen(addr_str));
 	}
 
 	return 1;
diff -r bb5fa32f87bc -r 09ce20eaa1c2 src/lib-sieve/sieve-validator.c
--- a/src/lib-sieve/sieve-validator.c	Thu Aug 15 20:48:54 2013 +0200
+++ b/src/lib-sieve/sieve-validator.c	Thu Aug 15 21:07:56 2013 +0200
@@ -546,11 +546,13 @@
 	struct sieve_validator_extension_reg *reg;
 
 	if ( ext->global && (valdtr->flags & SIEVE_COMPILE_FLAG_NOGLOBAL) != 0 ) {
-		sieve_argument_validate_error(valdtr, ext_arg,
-			"%s %s: failed to load Sieve capability `%s': "
-			"its use is restricted to global scripts",
-			sieve_command_identifier(cmd), sieve_command_type_name(cmd),
-			sieve_extension_name(ext));
+		if ( cmd != NULL && ext_arg != NULL ) {
+			sieve_argument_validate_error(valdtr, ext_arg,
+				"%s %s: failed to load Sieve capability `%s': "
+				"its use is restricted to global scripts",
+				sieve_command_identifier(cmd), sieve_command_type_name(cmd),
+				sieve_extension_name(ext));
+		}
 		return FALSE;
 	}
 
diff -r bb5fa32f87bc -r 09ce20eaa1c2 src/managesieve-login/client-authenticate.c
--- a/src/managesieve-login/client-authenticate.c	Thu Aug 15 20:48:54 2013 +0200
+++ b/src/managesieve-login/client-authenticate.c	Thu Aug 15 21:07:56 2013 +0200
@@ -138,6 +138,8 @@
 	uoff_t resp_size;
 	int ret;
 
+	*error_r = NULL;
+
 	if ( i_stream_read(client->input) == -1 ) {
 		/* disconnected */
 		client_destroy(client, "Disconnected");
@@ -161,7 +163,6 @@
 				client_send_bye(client, error);
 				client_destroy(client, t_strconcat
 					("Disconnected: parse error during auth: ", error, NULL));
-				*error_r = NULL;
 			} else {
 				*error_r = error;
 			}
@@ -210,7 +211,6 @@
 
 		if (str_len(client->auth_response) + size > LOGIN_MAX_AUTH_BUF_SIZE) {
 			client_destroy(client, "Authentication response too large");
-			*error_r = NULL;
 			return -1;
 		}
 
@@ -228,7 +228,6 @@
 					client_send_bye(client, error);
 					client_destroy(client, t_strconcat
 						("Disconnected: parse error during auth: ", error, NULL));
-					*error_r = NULL;
 				} else {
 					msieve_client->skip_line = TRUE;
 					*error_r = t_strconcat
diff -r bb5fa32f87bc -r 09ce20eaa1c2 src/testsuite/testsuite-objects.c
--- a/src/testsuite/testsuite-objects.c	Thu Aug 15 20:48:54 2013 +0200
+++ b/src/testsuite/testsuite-objects.c	Thu Aug 15 21:07:56 2013 +0200
@@ -135,7 +135,7 @@
 		return FALSE;
 
 	tobj->def = (const struct testsuite_object_def *) tobj->object.def;
-
+	i_assert(tobj->def != NULL);
 	return TRUE;
 }
 
@@ -147,7 +147,7 @@
 		return FALSE;
 
 	*member_id_r = -1;
-	if ( tobj->def != NULL && tobj->def->get_member_id != NULL ) {
+	if ( tobj->def->get_member_id != NULL ) {
 		if ( !sieve_binary_read_code(sblock, address, member_id_r) )
 			return FALSE;
 	}
diff -r bb5fa32f87bc -r 09ce20eaa1c2 src/testsuite/testsuite.c
--- a/src/testsuite/testsuite.c	Thu Aug 15 20:48:54 2013 +0200
+++ b/src/testsuite/testsuite.c	Thu Aug 15 21:07:56 2013 +0200
@@ -215,6 +215,7 @@
 		if ( tracestream != NULL )
 			o_stream_unref(&tracestream);
 
+		testsuite_scriptenv = NULL;
 	} else {
 		testsuite_testcase_fail("failed to compile testcase script");
 	}