From 1d8fb7747a0ace44f24d403ffd416d648e8448c5 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Wed, 29 Jul 2009 01:04:09 +0200
Subject: [PATCH] Include: include error message for failed :global include.
---
.../plugins/include/ext-include-common.c | 21 ++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index 70d9bf755..d01e5ec88 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -80,19 +80,30 @@ const char *ext_include_get_script_directory
sieve_dir = home_expand_tilde("~/sieve", home);
}
+
+ if (sieve_dir == NULL) {
+ sieve_sys_error(
+ "include: sieve_dir and home not set for :personal script include "
+ "(wanted script %s)", str_sanitize(script_name, 80));
+ return NULL;
+ }
+
break;
case EXT_INCLUDE_LOCATION_GLOBAL:
sieve_dir = getenv("SIEVE_GLOBAL_DIR");
+
+ if (sieve_dir == NULL) {
+ sieve_sys_error(
+ "include: sieve_global_dir not set for :global script include "
+ "(wanted script %s)", str_sanitize(script_name, 80));
+ return NULL;
+ }
+
break;
default:
return NULL;
}
- if (sieve_dir == NULL) {
- sieve_sys_error("include: sieve_dir and home not set "
- "(wanted script %s)", str_sanitize(script_name, 80));
- return NULL;
- }
return sieve_dir;
}
--
GitLab