closer...

[citadel.git] / citadel / netconfig.c

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index 1f68fe3ba0af8faa04d51fde5303f11987bde1d8..239ab731d06842069149011b281cb4ed28690c92 100644 (file)
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -191,7 +191,6 @@ void write_netconfig_to_configdb(long roomnum, const char *raw_netconfig)
        int enc_len;
        int len;
 
-       syslog(LOG_DEBUG, "\033[32m--- START WRITE ---\033[0m\n\033[31m%s\033[0m\n\033[32m---- END WRITE ----\033[0m", raw_netconfig);
        len = strlen(raw_netconfig);
        netcfg_keyname(keyname, roomnum);
        enc = malloc(len * 2);
@@ -250,9 +249,7 @@ OneRoomNetCfg *ParseRoomNetConfigFile(char *serialized_data)
        InStr = NewStrBuf();
         Cfg = NewStrBufPlain(serialized_data, -1);
 
-       syslog(LOG_DEBUG, "\033[32m--- START READ ---\033[0m");
         while (StrBufSipLine(Line, Cfg, &CPos)) {
-               syslog(LOG_DEBUG, "READ NET CONFIG LINE: '\033[31m%s\033[0m'", ChrPtr(Line));
 
                if (StrLength(Line) > 0) {
                        Pos = NULL;
@@ -279,7 +276,6 @@ OneRoomNetCfg *ParseRoomNetConfigFile(char *serialized_data)
                        }
                }
        }
-       syslog(LOG_DEBUG, "\033[32m---- END READ ----\033[0m");
        FreeStrBuf(&InStr);
        FreeStrBuf(&Line);
        FreeStrBuf(&Cfg);
@@ -605,6 +601,7 @@ int CtdlNetconfigCheckRoomaccess(
                return (ERROR + NO_SUCH_USER);
        }
        found = is_recipient (RNCfg, RemoteIdentifier);
+       FreeRoomNetworkStruct(&RNCfg);
        end_critical_section(S_NETCONFIGS);
 
        if (found) {
@@ -930,14 +927,19 @@ void convert_legacy_netcfg_files(void)
                        if (fp) {
                                fseek(fp, 0L, SEEK_END);
                                len = ftell(fp);
-                               v = malloc(len);
-                               if (v) {
-                                       rewind(fp);
-                                       if (fread(v, len, 1, fp)) {
-                                               write_netconfig_to_configdb(roomnum, v);
-                                               unlink(filename);
+                               if (len > 0) {
+                                       v = malloc(len);
+                                       if (v) {
+                                               rewind(fp);
+                                               if (fread(v, len, 1, fp)) {
+                                                       write_netconfig_to_configdb(roomnum, v);
+                                                       unlink(filename);
+                                               }
+                                               free(v);
                                        }
-                                       free(v);
+                               }
+                               else {
+                                       unlink(filename);       // zero length netconfig, just delete it
                                }
                                fclose(fp);
                        }