X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsieve%2Fserv_sieve.c;h=8827be41644a35baac7c95139014af014a43cac0;hb=4ba46337de0fd6171f7c08ea404276c1da7e7abb;hp=557efa4aae950432b874d928878f0eb6c6807cf3;hpb=c35b8bc091ae31ad1c8a08c9ee94cdb8de78efdc;p=citadel.git

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index 557efa4aa..8827be416 100644
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -450,21 +450,35 @@ int ctdl_getsize(sieve2_context_t *s, void *my)
 
 
 /*
- * Callback function to retrieve the sieve script
+ * Return a pointer to the active Sieve script
  */
-int ctdl_getscript(sieve2_context_t *s, void *my) {
+char *get_active_script(struct ctdl_sieve *cs) {
 	struct sdm_script *sptr;
-	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 
 	for (sptr=cs->u->first_script; sptr!=NULL; sptr=sptr->next) {
 		if (sptr->script_active > 0) {
-			syslog(LOG_DEBUG, "ctdl_getscript() is using script '%s'", sptr->script_name);
-			sieve2_setvalue_string(s, "script", sptr->script_content);
-			return SIEVE2_OK;
+			syslog(LOG_DEBUG, "get_active_script() is using script '%s'", sptr->script_name);
+			return(sptr->script_content);
 		}
 	}
-		
-	syslog(LOG_DEBUG, "ctdl_getscript() found no active script");
+
+	syslog(LOG_DEBUG, "get_active_script() found no active script");
+	return(NULL);
+}
+
+
+/*
+ * Callback function to retrieve the sieve script
+ */
+int ctdl_getscript(sieve2_context_t *s, void *my) {
+	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
+
+	char *active_script = get_active_script(cs);
+	if (active_script != NULL) {
+		sieve2_setvalue_string(s, "script", active_script);
+		return SIEVE2_OK;
+	}
+
 	return SIEVE2_ERROR_GETSCRIPT;
 }