* Fix bug 112: .Goto allowed partial room match on forgotten rooms

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 6de35d1a0529724d461d1ee14d347ba0a0af850f..99dc42a14bebba1000c3484c31957fee39ca0bd1 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 614.45  2004/02/20 19:29:05  error
+ * Fix bug 112: .Goto allowed partial room match on forgotten rooms
+
  Revision 614.44  2004/02/20 02:55:18  ajc
  * Fixed one of the prompts (bugzilla #118)
 
@@ -5382,4 +5385,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/citadel.c b/citadel/citadel.c
index 07a9eb6152d134d1d2fdaba7412c7b031e90458a..471a19c2892beeff51306edd9b0ebc7391a31b99 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -379,7 +379,8 @@ void dotgoto(CtdlIPC *ipc, char *towhere, int display_name, int fromungoto)
         * If a match is not found, try a partial match.
         * Partial matches anywhere in the string carry a weight of 1,
         * left-aligned matches carry a weight of 2.  Pick the room that
-        * has the highest-weighted match.
+        * has the highest-weighted match.  Do not match on forgotten
+        * rooms.
         */
        if (r / 100 != 2) {
                struct march *march = NULL;
@@ -387,7 +388,7 @@ void dotgoto(CtdlIPC *ipc, char *towhere, int display_name, int fromungoto)
                best_match = 0;
                strcpy(bbb, "");
 
-               r = CtdlIPCKnownRooms(ipc, AllAccessibleRooms, AllFloors, &march, aaa);
+               r = CtdlIPCKnownRooms(ipc, SubscribedRooms, AllFloors, &march, aaa);
                if (r / 100 == 1) {
                        /* Run the roomlist; free the data as we go */
                        struct march *mp = march;       /* Current */