X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Froom_ops.c;h=6a57493763cb1581990ae6e69907a3a4e0c6e873;hb=dec3606868b9f659eef33f5e84e3ba1642cd9039;hp=a018662d99a9ce332540b4b2e1ff42e75dd27f3c;hpb=64f430bd72e548b3b57a8d801ec16e9f904281bd;p=citadel.git

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index a018662d9..6a5749376 100644
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -659,7 +659,7 @@ void CtdlForEachRoom(ForEachRoomCallBack CB, void *in_data)
 /* 
  * Iterate through the room table, performing a callback for each room that has a netconfig entry.
  */
-void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data, RoomNetCfg filter)
+void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data)
 {
 	struct ctdlroom qrbuf;
 	struct cdbdata *cdbqr;
@@ -668,21 +668,23 @@ void CtdlForEachNetCfgRoom(ForEachRoomNetCfgCallBack CB, void *in_data, RoomNetC
 
 	while (cdbqr = cdb_next_item(CDB_ROOMS), cdbqr != NULL) {
 		memset(&qrbuf, 0, sizeof(struct ctdlroom));
-		memcpy(&qrbuf, cdbqr->ptr,
-		       ((cdbqr->len > sizeof(struct ctdlroom)) ?
-			sizeof(struct ctdlroom) : cdbqr->len)
-		);
+		memcpy(&qrbuf, cdbqr->ptr, ((cdbqr->len > sizeof(struct ctdlroom)) ?  sizeof(struct ctdlroom) : cdbqr->len));
 		cdb_free(cdbqr);
 		room_sanity_check(&qrbuf);
 		if (qrbuf.QRflags & QR_INUSE)
 		{
 			OneRoomNetCfg *RNCfg;
 			RNCfg = CtdlGetNetCfgForRoom(qrbuf.QRnumber);
-			if ((RNCfg != NULL) && ((filter == maxRoomNetCfg) || (RNCfg->NetConfigs[filter] != NULL)))
+			if (RNCfg != NULL)
 			{
+				TRACE;
 				CB(&qrbuf, in_data, RNCfg);
 				FreeRoomNetworkStruct(&RNCfg);
 			}
+			else
+			{
+				TRACE;
+			}
 		}
 	}
 }