From e1f261737125a8df751b29c5cccaec2832b440fa Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Tue, 11 Dec 2007 10:55:05 +0100
Subject: [PATCH] Re-established circular include detection for include
extension.
---
src/lib-sieve/plugins/include/ext-include-common.c | 5 ++++-
src/lib-sieve/plugins/include/included1.sieve | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index f2776959c..ca87b2e57 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -125,7 +125,10 @@ bool ext_include_generate_include
new_block_id = sieve_binary_block_create(sbin);
this_block_id = sieve_binary_block_set_active(sbin, new_block_id);
subgentr = sieve_generator_create(ast, ehandler);
-
+
+ sieve_generator_extension_set_context(subgentr, ext_include_my_id,
+ ext_include_create_generator_context(subgentr, parent, script));
+
if ( !sieve_generator_run(subgentr, &sbin) ) {
sieve_command_generate_error(gentr, cmd,
"failed to validate included script '%s'", script_name);
diff --git a/src/lib-sieve/plugins/include/included1.sieve b/src/lib-sieve/plugins/include/included1.sieve
index 41e84c2dd..176795355 100644
--- a/src/lib-sieve/plugins/include/included1.sieve
+++ b/src/lib-sieve/plugins/include/included1.sieve
@@ -1,3 +1,6 @@
require "fileinto";
+require "include";
+
+include "include";
fileinto "INBOX.frop";
--
GitLab