* fix a leak in GREG

[citadel.git] / citadel / serv_extensions.c

diff --git a/citadel/serv_extensions.c b/citadel/serv_extensions.c
index 181467fef6ad7d5212a0c77cd4d3fd77caae7557..e6ae83f7067e10ffa59cb002e1fabe5cea541952 100644 (file)
--- a/citadel/serv_extensions.c
+++ b/citadel/serv_extensions.c
@@ -58,12 +58,13 @@ static size_t nSizErrmsg = 0;
 
 static long   DetailErrorFlags;
 
-
 char *ErrSubject = "Startup Problems";
 char *ErrGeneral = "Citadel had trouble on starting up. %s This means, citadel won't be the service provider for a specific service you configured it to.\n\n"
 "If you don't want citadel to provide these services, turn them off in WebCit via %s%s\n\n%s\n\n"
 "To make both ways actualy take place restart the citserver with \"sendcommand down\"\n\n"
-"The errors returned by the system were:\n%s\n";
+"The errors returned by the system were:\n%s\n"
+"You can recheck the above if you follow this faq item:\n"
+"http://www.citadel.org/doku.php/faq:mastering_your_os:net#netstat";
 
 
 char *ErrPortShort = "We couldn't bind all ports you configured to be provided by citadel server.";
@@ -102,6 +103,10 @@ void LogPrintMessages(long err)
        snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
 
        quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
+       if (errormessages!=NULL) free (errormessages);
+       errormessages = NULL;
+       if (portlist!=NULL) free (portlist);
+       portlist = NULL;
        free(Message);
 }
 
@@ -135,16 +140,30 @@ void AppendString(char **target, char *append, size_t *len, size_t rate)
                }
        }
        memcpy (*target + oLen, append, AddLen);
-       (*target)[AddLen + 1] = '\n';
-       (*target)[AddLen + 2] = '\0';
+       (*target)[oLen + AddLen + 1] = '\n';
+       (*target)[oLen + AddLen + 2] = '\0';
 }
 
 void AddPortError(char *Port, char *ErrorMessage)
 {
+       char *pos;
+       long len;
+
        DetailErrorFlags |= ERR_PORT;
 
        AppendString(&errormessages, ErrorMessage, &nSizErrmsg, 10);
        AppendString(&portlist, Port, &nSizPort, 2);
+
+       pos = strchr (portlist, ':');
+       if (pos != NULL) *pos = ';';
+       
+       len = strlen (errormessages);
+       if (nSizErrmsg * SIZ > len + 3)
+       {
+               errormessages[len] = ';';
+               errormessages[len+1] = ' ';
+               errormessages[len+2] = '\0';
+       }       
 }
 
 
@@ -232,6 +251,8 @@ void initialize_server_extensions(void)
 {
        long filter;
 
+       nSizErrmsg = 0;
+
        lprintf(CTDL_INFO, "%s\n", serv_bio_init());
        lprintf(CTDL_INFO, "%s\n", serv_calendar_init());
        lprintf(CTDL_INFO, "%s\n", serv_notes_init());
@@ -739,7 +760,8 @@ void CtdlRegisterServiceHook(int tcp_port,
                                              tcp_port,
                                              config.c_maxsessions, 
                                              &error);
-               snprintf(message, SIZ, "TCP port %d: ", tcp_port);
+               snprintf(message, SIZ, "TCP port %s:%d: ", 
+                        config.c_ip_addr, tcp_port);
        }
 
        if (newfcn->msock > 0) {