X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=f4224d6ad6d179fb261f9e4086944795dfe81920;hb=a520d904d0069654c57d2b69618bee1225ee3067;hp=5ddd1976e293f2550e2691d721bbd38a3cbb510a;hpb=797b2e5f51c83d2f25f1d29957a2ffd99710e90e;p=citadel.git

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 5ddd1976e..f4224d6ad 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -2,7 +2,7 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (c) 2000-2018 by the citadel.org team
+ * Copyright (c) 2000-2021 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, version 3.
@@ -146,24 +146,6 @@ int HaveSpoolConfig(OneRoomNetCfg* RNCfg)
 	return interested;
 }
 
-void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen)
-{
-	long node_len;
-	char buf[SIZ];
-
-	/* prepend our node to the path */
-	if (CM_IsEmpty(msg, eMessagePath)) {
-		CM_SetField(msg, eMessagePath, defl, defllen);
-	}
-	node_len = strlen(CtdlGetConfigStr("c_nodename"));
-	if (node_len >= SIZ) 
-		node_len = SIZ - 1;
-	memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len);
-	buf[node_len] = '!';
-	buf[node_len + 1] = '\0';
-	CM_PrependToField(msg, eMessagePath, buf, node_len + 1);
-}
-
 
 void InspectQueuedRoom(SpoolControl **pSC,
 		       RoomProcList *room_to_spool,     
@@ -235,7 +217,7 @@ void CalcListID(SpoolControl *sc)
 #define MAX_LISTIDLENGTH 150
 
 	// Load the room banner as the list description
-	struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1, 1);
+	struct CtdlMessage *msg = CtdlFetchMessage(sc->room.msgnum_info, 1);
         if (msg != NULL) {
 		CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
                 CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_NONE, 0, 0, 0);
@@ -375,7 +357,6 @@ void network_spoolout_room(SpoolControl *sc)
 		network_deliver_digest(sc);	/* deliver */
 		fclose(sc->digestfp);
 		sc->digestfp = NULL;
-		remove_digest_file(&sc->room);
 	}
 
 	/* Now rewrite the netconfig */
@@ -412,21 +393,6 @@ void free_spoolcontrol_struct_members(SpoolControl *sc)
 }
 
 
-/*
- * It's ok if these directories already exist.  Just fail silently.
- */
-void create_spool_dirs(void) {
-	if ((mkdir(ctdl_spool_dir, 0700) != 0) && (errno != EEXIST))
-		syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_spool_dir, strerror(errno));
-	if (chown(ctdl_spool_dir, CTDLUID, (-1)) != 0)
-		syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_spool_dir, strerror(errno));
-	if ((mkdir(ctdl_nettmp_dir, 0700) != 0) && (errno != EEXIST))
-		syslog(LOG_EMERG, "netspool: unable to create directory [%s]: %s", ctdl_nettmp_dir, strerror(errno));
-	if (chown(ctdl_nettmp_dir, CTDLUID, (-1)) != 0)
-		syslog(LOG_EMERG, "netspool: unable to set the access rights for [%s]: %s", ctdl_nettmp_dir, strerror(errno));
-}
-
-
 /*
  * Module entry point
  */
@@ -441,7 +407,6 @@ CTDL_MODULE_INIT(network_spool)
 		CtdlREGISTERRoomCfgType(digestrecp,       ParseGeneric,          0, 1, SerializeGeneric,  DeleteGenericCfgLine);
 		CtdlREGISTERRoomCfgType(participate,      ParseGeneric,          0, 1, SerializeGeneric,  DeleteGenericCfgLine);
 		CtdlREGISTERRoomCfgType(roommailalias,    ParseRoomAlias,        0, 1, SerializeGeneric,  DeleteGenericCfgLine);
-		create_spool_dirs();
 	}
 	return "network_spool";
 }