[gentoo-commits] gentoo-x86 commit in net-mail/dovecot/files: dovecot-2.1.8_managesieve_gold.patch

[gentoo-commits] gentoo-x86 commit in net-mail/dovecot/files: dovecot-2.1.8_managesieve_gold.patch

[Eray Aslan (eras)]

eras        12/07/13 14:02:22

  Added:                dovecot-2.1.8_managesieve_gold.patch
  Log:
  Include experimental patch from upstream for linking with gold - masked for now
  
  (Portage version: 2.1.11.5/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/dovecot/files/dovecot-2.1.8_managesieve_gold.patch?rev=1.1&content-type=text/plain

Index: dovecot-2.1.8_managesieve_gold.patch
===================================================================

# HG changeset patch
# User Stephan Bosch <stephan@rename-it.nl>
# Date 1342130270 -7200
# Node ID 6ceeb642123117ed8377f3b0d7d28171f790e911
# Parent  602d93069d3a1c93866178308bd4d03f20a15f73
ManageSieve: fixed segfault bug triggered by CHECKSCRIPT command.

diff -r 602d93069d3a -r 6ceeb6421231 src/lib-sievestorage/sieve-storage-save.c
--- a/src/lib-sievestorage/sieve-storage-save.c	Sat May 26 00:16:35 2012 +0200
+++ b/src/lib-sievestorage/sieve-storage-save.c	Thu Jul 12 23:57:50 2012 +0200
@@ -318,19 +318,20 @@
 bool sieve_storage_save_will_activate
 (struct sieve_save_context *ctx)
 {
-	const char *scriptname;
-	int ret = 0;
+	bool result = FALSE;
 
-	T_BEGIN {
+	if ( ctx->scriptname != NULL ) T_BEGIN {
+		const char *scriptname;
+		int ret;
+
 		ret = sieve_storage_get_active_scriptfile(ctx->storage, &scriptname);
-	
 		if ( ret > 0 ) {
 		 	/* Is the requested script active? */
-			ret = ( strcmp(ctx->scriptname, scriptname) == 0 ? 1 : 0 );
+			result = ( strcmp(ctx->scriptname, scriptname) == 0 );
 		}
 	} T_END;
 
-	return ret;
+	return result;
 }
 
 int sieve_storage_save_commit(struct sieve_save_context **ctx)