From: Michael Hampton Date: Fri, 20 Feb 2004 19:29:05 +0000 (+0000) Subject: * Fix bug 112: .Goto allowed partial room match on forgotten rooms X-Git-Tag: v7.86~5592 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=52cbc24cb6b988e503b2b9851007d9e55d1ec5b6;p=citadel.git * Fix bug 112: .Goto allowed partial room match on forgotten rooms --- diff --git a/citadel/ChangeLog b/citadel/ChangeLog index 6de35d1a0..99dc42a14 100644 --- 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 Fri Jul 10 1998 Art Cancro * Initial CVS import - diff --git a/citadel/citadel.c b/citadel/citadel.c index 07a9eb615..471a19c28 100644 --- 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 */