From: Luigi Rizzo <rizzo@icir.org>
Date: Wed, 15 Nov 2006 17:46:45 +0000 (+0000)
Subject: fix longest match search in find_cli.
X-Git-Tag: 1.4.0-beta4~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9057b2c6564f965e87d2fa8fe9eb1e2810b5e23;p=thirdparty%2Fasterisk.git

fix longest match search in find_cli.
Trunk already fixed.

1.2 not affected (well, i have no idea, the code is totally
different there).



git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@47672 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/cli.c b/main/cli.c
index b9afbd89be..3d529cb86f 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -1378,8 +1378,10 @@ static struct ast_cli_entry *find_cli(char *const cmds[], int match_type)
 				continue;
 			/* we are in case match_type == -1 and mismatch on last word */
 		}
-		if (cand == NULL || y > matchlen)	/* remember the candidate */
+		if (y > matchlen) {	/* remember the candidate */
+			matchlen = y;
 			cand = e;
+		}
 	}
 	return e ? e : cand;
 }