[svn-commits] branch 1.2 - r7831 /branches/1.2/pbx/pbx_config.c

[svn-commits at lists.digium.com]

Author: tilghman
Date: Thu Jan  5 18:34:40 2006
New Revision: 7831

URL: http://svn.digium.com/view/asterisk?rev=7831&view=rev
Log:
Dumb error messages - "Context 'context' already included in 'in' context"

Modified:
    branches/1.2/pbx/pbx_config.c

Modified: branches/1.2/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/pbx/pbx_config.c?rev=7831&r1=7830&r2=7831&view=diff
==============================================================================
--- branches/1.2/pbx/pbx_config.c (original)
+++ branches/1.2/pbx/pbx_config.c Thu Jan  5 18:34:40 2006
@@ -712,7 +712,7 @@
 	if (argc != 5) return RESULT_SHOWUSAGE;
 
 	/* third arg must be 'in' ... */
-	if (strcmp(argv[3], "in")) return RESULT_SHOWUSAGE;
+	if (strcmp(argv[3], "in") && strcmp(argv[3], "into")) return RESULT_SHOWUSAGE;
 
 	if (ast_context_add_include(argv[4], argv[2], registrar)) {
 		switch (errno) {
@@ -724,7 +724,7 @@
 
 			case EEXIST:
 				ast_cli(fd, "Context '%s' already included in '%s' context\n",
-					argv[1], argv[3]); break;
+					argv[2], argv[4]); break;
 
 			case ENOENT:
 			case EINVAL:
@@ -733,14 +733,14 @@
 
 			default:
 				ast_cli(fd, "Failed to include '%s' in '%s' context\n",
-					argv[1], argv[3]); break;
+					argv[2], argv[4]); break;
 		}
 		return RESULT_FAILURE;
 	}
 
 	/* show some info ... */
 	ast_cli(fd, "Context '%s' included in '%s' context\n",
-		argv[2], argv[3]);
+		argv[2], argv[4]);
 
 	return RESULT_SUCCESS;
 }