X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fexpire%2Fserv_expire.c;h=ab82d2828cfa9708d35276f7fcec957d8f1e269f;hb=7592eea02f195c2cdb2cc3a9c18d43a4b9f552e8;hp=6bdbbb3a48eb4b1ccd979289c3f6c5026b984817;hpb=04c34fd0dbec4fecf53de78e7be4b5662af71eae;p=citadel.git

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index 6bdbbb3a4..ab82d2828 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -152,6 +152,10 @@ void GatherPurgeMessages(struct ctdlroom *qrbuf, void *data) {
 	if (epbuf.expire_mode == EXPIRE_NEXTLEVEL) return;
 	if (epbuf.expire_mode == EXPIRE_MANUAL) return;
 
+	/* Don't purge messages containing system configuration, dumbass. */
+	if (!strcasecmp(qrbuf->QRname, SYSCONFIGROOM)) return;
+
+	/* Ok, we got this far ... now let's see what's in the room */
         cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long));
 
         if (cdbfr != NULL) {
@@ -290,6 +294,7 @@ void DoPurgeRooms(struct ctdlroom *qrbuf, void *data) {
 		if (qrbuf->QRflags & QR_PERMANENT) return;
 		if (qrbuf->QRflags & QR_DIRECTORY) return;
 		if (qrbuf->QRflags & QR_NETWORK) return;
+		if (qrbuf->QRflags2 & QR2_SYSTEM) return;
 		if (!strcasecmp(qrbuf->QRname, SYSCONFIGROOM)) return;
 		if (is_noneditable(qrbuf)) return;