X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Frssclient%2Fserv_rssclient.c;h=00c32971db81763ada94e14fdb363cac8b173a9a;hb=271924aeff4c786b31ec293ab48c861f7fe77bd0;hp=f6561e6b1fd1e1a13c0ab6130c76c41376031ebd;hpb=099ea32ab805ddc0191c4a8f0bc5ce4e2ad8254c;p=citadel.git

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index f6561e6b1..00c32971d 100644
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -186,6 +186,7 @@ void DeleteRssCfg(void *vptr)
 	}
 
 	FreeAsyncIOContents(&RSSAggr->IO);
+	memset(RSSAggr, 0, sizeof(rss_aggregator));
 	free(RSSAggr);
 }
 
@@ -195,7 +196,7 @@ eNextState RSSAggregator_Terminate(AsyncIO *IO)
 
 	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
-
+	StopCurlWatchers(IO);
 	UnlinkRSSAggregator(RSSAggr);
 	return eAbort;
 }
@@ -207,6 +208,7 @@ eNextState RSSAggregator_TerminateDB(AsyncIO *IO)
 	EVRSSCM_syslog(LOG_DEBUG, "RSS: Terminating.\n");
 
 
+	StopDBWatchers(&RSSAggr->IO);
 	UnlinkRSSAggregator(RSSAggr);
 	return eAbort;
 }
@@ -227,12 +229,6 @@ eNextState RSSAggregator_ShutdownAbort(AsyncIO *IO)
 	return eAbort;
 }
 
-
-eNextState AbortNetworkSaveMessage (AsyncIO *IO)
-{
-	return eAbort; ///TODO
-}
-
 eNextState RSSSaveMessage(AsyncIO *IO)
 {
 	long len;