From: Corey Farrell <git@cfware.com>
Date: Thu, 14 Dec 2017 21:27:45 +0000 (-0500)
Subject: res_clialiases: Fix completion pass-through.
X-Git-Tag: 13.19.0-rc1~30^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85dec2ae4fa79abe95dc71aa75a3bce50e6c5c36;p=thirdparty%2Fasterisk.git

res_clialiases: Fix completion pass-through.

Never ignore contents of line when generating completion options.

Change-Id: I74389efdfea154019d3b56a9f381610614c044c8
---

diff --git a/res/res_clialiases.c b/res/res_clialiases.c
index 633ed89f47..4d932aecce 100644
--- a/res/res_clialiases.c
+++ b/res/res_clialiases.c
@@ -105,7 +105,7 @@ static char *cli_alias_passthrough(struct ast_cli_entry *e, int cmd, struct ast_
 	struct cli_alias tmp = {
 		.cli_entry.command = e->command,
 	};
-	char *generator;
+	char *generator = NULL;
 	const char *line;
 
 	/* Try to find the alias based on the CLI entry */
@@ -120,14 +120,10 @@ static char *cli_alias_passthrough(struct ast_cli_entry *e, int cmd, struct ast_
 	case CLI_GENERATE:
 		line = a->line;
 		line += (strlen(alias->alias));
-		if (!strncasecmp(alias->alias, alias->real_cmd, strlen(alias->alias))) {
-			generator = NULL;
-		} else if (!ast_strlen_zero(a->word)) {
+		if (strncasecmp(alias->alias, alias->real_cmd, strlen(alias->alias))) {
 			struct ast_str *real_cmd = ast_str_alloca(strlen(alias->real_cmd) + strlen(line) + 1);
 			ast_str_append(&real_cmd, 0, "%s%s", alias->real_cmd, line);
 			generator = ast_cli_generator(ast_str_buffer(real_cmd), a->word, a->n);
-		} else {
-			generator = ast_cli_generator(alias->real_cmd, a->word, a->n);
 		}
 		ao2_ref(alias, -1);
 		return generator;