Look for citadel.rc in current directory if not found elsewhere

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 379328dd484917bfc1cb611f4cf7901b3f3beeef..5a52e4b157e05fd204d1aca3d249d441ac2d15f1 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,3 +1,6 @@
+Sat Jan 30 18:39:53 EST 1999 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
+       * Look for citadel.rc in current directory if not found elsewhere
+
 1999-01-29 Nathan Bryant <bryant@cs.usm.maine.edu>
        * fixes for IRIX (thanks to wr and family for use of the Indy):
          - use memset()/memcpy() instead of bzero()/bcopy() in all cases

diff --git a/citadel/citadel.rc b/citadel/citadel.rc
index 0d8b30c7c0a1f1c916fd81a18187b2a2fa6804dc..551b31d2ba58f1e0666872a0c690fea9bbff8064 100644 (file)
--- a/citadel/citadel.rc
+++ b/citadel/citadel.rc
@@ -7,6 +7,7 @@
 # 1. $HOME/.citadelrc
 # 2. /usr/local/lib/citadel.rc
 # 3. <compiled BBSDIR>/citadel.rc
+# 4. <current directory>/citadel.rc
 
 # Set EDITOR to the name of an external editor to be used for entering
 # messages.  If you want the external editor to be used by default, be sure

diff --git a/citadel/room_ops.c b/citadel/room_ops.c
index b48f8244e2a18728589ccd653f56bc4ffb2c7e40..137e60db3fe353066f988fd757e2ecf9007b68c0 100644 (file)
--- a/citadel/room_ops.c
+++ b/citadel/room_ops.c
@@ -971,7 +971,7 @@ void cmd_setr(char *args) {
        struct floor flbuf;
        char old_name[ROOMNAMELEN];
        int old_floor;
-       int new_order;
+       int new_order = 0;
 
        if (!(CC->logged_in)) {
                cprintf("%d Not logged in.\n",ERROR+NOT_LOGGED_IN);