From: Art Cancro <ajc@uncensored.citadel.org>
Date: Tue, 28 Feb 2012 16:16:38 +0000 (-0500)
Subject: Small API change to previous commit
X-Git-Tag: v8.11~155^2~1
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=001aa70bbf21dde85bcb205d63fe95288bd9afd7

Small API change to previous commit
---

diff --git a/citadel/modules/sieve/serv_sieve.c b/citadel/modules/sieve/serv_sieve.c
index 8827be416..b52bb3bdb 100644
--- a/citadel/modules/sieve/serv_sieve.c
+++ b/citadel/modules/sieve/serv_sieve.c
@@ -450,12 +450,13 @@ int ctdl_getsize(sieve2_context_t *s, void *my)
 
 
 /*
- * Return a pointer to the active Sieve script
+ * Return a pointer to the active Sieve script.
+ * (Caller does NOT own the memory and should not free the returned pointer.)
  */
-char *get_active_script(struct ctdl_sieve *cs) {
+char *get_active_script(struct sdm_userdata *u) {
 	struct sdm_script *sptr;
 
-	for (sptr=cs->u->first_script; sptr!=NULL; sptr=sptr->next) {
+	for (sptr=u->first_script; sptr!=NULL; sptr=sptr->next) {
 		if (sptr->script_active > 0) {
 			syslog(LOG_DEBUG, "get_active_script() is using script '%s'", sptr->script_name);
 			return(sptr->script_content);
@@ -473,7 +474,7 @@ char *get_active_script(struct ctdl_sieve *cs) {
 int ctdl_getscript(sieve2_context_t *s, void *my) {
 	struct ctdl_sieve *cs = (struct ctdl_sieve *)my;
 
-	char *active_script = get_active_script(cs);
+	char *active_script = get_active_script(cs->u);
 	if (active_script != NULL) {
 		sieve2_setvalue_string(s, "script", active_script);
 		return SIEVE2_OK;