* Avoid re-creating the default-named baseroom (Lobby) upon subsequent

  startups after it's been renamed to something else.

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index c7e7c1643d2301422522a0a93df17ac682ced0b6..80324ddcc28ffc6095779a96b5b8e725fe3589ad 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 647.2  2005/05/16 18:25:56  ajc
+ * Avoid re-creating the default-named baseroom (Lobby) upon subsequent
+   startups after it's been renamed to something else.
+
  Revision 647.1  2005/05/16 16:59:39  ajc
  * Default expire policy is now 'manual' (no automatic expiry of messages
    under any circumstances).  Implemented as per David Given's suggestion
@@ -6684,4 +6688,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 1c944f172db5e901653d9d2469af2bf933ad99fa..473e256b30893675d882b05336a876c63e6e8d99 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -101,7 +101,7 @@ void master_startup(void) {
        check_ref_counts();
 
        lprintf(CTDL_INFO, "Creating base rooms (if necessary)\n");
-       create_room(BASEROOM,           0, "", 0, 1, 0, VIEW_BBS);
+       create_room(config.c_baseroom,  0, "", 0, 1, 0, VIEW_BBS);
        create_room(AIDEROOM,           3, "", 0, 1, 0, VIEW_BBS);
        create_room(SYSCONFIGROOM,      3, "", 0, 1, 0, VIEW_BBS);
        create_room(config.c_twitroom,  0, "", 0, 1, 0, VIEW_BBS);

diff --git a/citadel/setup.c b/citadel/setup.c
index 410c76ec81eca07b116da334a46bfe520b894fc3..1ff28e10f1718c90d7fd0253bcbd80db3a2aeea8 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1040,7 +1040,7 @@ int main(int argc, char *argv[])
        if (strlen(config.c_twitroom) == 0)
                strcpy(config.c_twitroom, "Trashcan");
        if (strlen(config.c_baseroom) == 0)
-               strcpy(config.c_baseroom, "Lobby");
+               strcpy(config.c_baseroom, BASEROOM);
        if (strlen(config.c_aideroom) == 0)
                strcpy(config.c_aideroom, "Aide");
        if (config.c_port_number == 0) {