[svn-commits] russell: trunk r47353 - in /trunk: ./ main/asterisk.c

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Nov  9 00:35:05 2006
New Revision: 47353

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47353
Log:
Merged revisions 47352 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47352 | russell | 2006-11-09 01:31:37 -0500 (Thu, 09 Nov 2006) | 3 lines

fix "core show version" to reflect the new number of arguments for this
CLI command (issue #8316, kshumard)

........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=47353&r1=47352&r2=47353
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Thu Nov  9 00:35:05 2006
@@ -1323,7 +1323,7 @@
 
 static int handle_version(int fd, int argc, char *argv[])
 {
-	if (argc != 2)
+	if (argc != 3)
 		return RESULT_SHOWUSAGE;
 	ast_cli(fd, "Asterisk %s built by %s @ %s on a %s running %s on %s\n",
 		ASTERISK_VERSION, ast_build_user, ast_build_hostname,