NETCFG: first free the configs, then the infrastructure needed to free them.

[citadel.git] / citadel / netconfig.c

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index 1b2e974aa6b42ad137397438dec0c7f620fbf27d..f09c852fd32a3786ac5cc1f15c35c4e6fcbde087 100644 (file)
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -839,6 +839,7 @@ int is_recipient(OneRoomNetCfg *RNCfg, const char *Name)
                        }
                        nptr = nptr->next;
                }
+               i++;
        }
        return 0;
 }
@@ -926,7 +927,9 @@ void cmd_netp(char *cmdbuf)
                CtdlAideFPMessage(
                        err_buf,
                        "IGNet Networking.",
-                       2, strs, (long*) &lens);
+                       2, strs, (long*) &lens,
+                       CCC->cs_pid, 0,
+                       time(NULL));
 
                DeleteHash(&working_ignetcfg);
                FreeStrBuf(&NodeStr);
@@ -951,7 +954,10 @@ void cmd_netp(char *cmdbuf)
                CtdlAideFPMessage(
                        err_buf,
                        "IGNet Networking.",
-                       2, strs, (long*) &lens);
+                       2, strs,
+                       (long*) &lens,
+                       CCC->cs_pid, 0,
+                       time(NULL));
 
                DeleteHash(&working_ignetcfg);
                FreeStrBuf(&NodeStr);
@@ -1168,11 +1174,11 @@ void destroy_network_cfgs(void)
        HashList *pCfgTypeHash = CfgTypeHash;
        HashList *pRoomConfigs = RoomConfigs;
 
-       CfgTypeHash = NULL;
        RoomConfigs = NULL;
-       
-       DeleteHash(&pCfgTypeHash);
        DeleteHash(&pRoomConfigs);
+
+       CfgTypeHash = NULL;
+       DeleteHash(&pCfgTypeHash);
 }
 
 /*