From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 17 Feb 2013 22:32:56 +0000 (+0100)
Subject: RNCFG: implement missing handler for room aliases.
X-Git-Tag: v8.20~98
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5bd9e05d88e95684e380408e9f2f891c84d8e344

RNCFG: implement missing handler for room aliases.
---

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index b0928454c..dd049a878 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -106,12 +106,11 @@ void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos
 
 void ParseRoomAlias(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg)
 {
-/*
-	if (rncfg->RNCfg->sender != NULL)
-		continue; / * just one alowed... * /
-	extract_token(nptr->name, buf, 1, '|', sizeof nptr->name);
-	rncfg->RNCfg->sender = nptr;
-*/
+	if (rncfg->Sender != NULL)
+		return;
+
+	ParseGeneric(ThisOne, Line, LinePos, rncfg);
+	rncfg->Sender = NewStrBufDup(rncfg->NetConfigs[roommailalias]->Value[0]);
 }
 
 void ParseSubPendingLine(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index d4652e244..a086fea44 100644
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -387,6 +387,7 @@ void FreeRoomNetworkStructContent(OneRoomNetCfg *OneRNCfg)
 	FreeStrBuf(&OneRNCfg->Sender);
 	FreeStrBuf(&OneRNCfg->RoomInfo);
 	FreeStrBuf(&OneRNCfg->misc);
+	memset(OneRNCfg, 0, sizeof(OneRoomNetCfg));
 }
 void vFreeRoomNetworkStruct(void *vOneRoomNetCfg)
 {
@@ -718,7 +719,6 @@ void cmd_snet(char *argbuf)
 		RNCfg = CtdlGetNetCfgForRoom(CCC->room.QRnumber);
 		if (RNCfg != NULL)
 		{
-			FreeRoomNetworkStructContent(RNCfg);
 			ReadRoomNetConfigFile(&RNCfg, filename);
 		}
 		else