From: Corey Farrell <git@cfware.com>
Date: Wed, 18 Oct 2017 17:04:29 +0000 (-0400)
Subject: chan_sip: Fix output of 'sip set debug off'.
X-Git-Tag: 13.19.0-rc1~199^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7dd7ca285879d4783e0ea208d5688359145f49c9;p=thirdparty%2Fasterisk.git

chan_sip: Fix output of 'sip set debug off'.

When sip.conf contains 'sipdebug=yes' it is impossible to disable it
using CLI 'sip set debug off'.  This corrects the output of that CLI
command to instruct the user to turn sipdebug off in the configuration
file.

ASTERISK-23462 #close

Change-Id: I1cceade9caa9578e1b060feb832e3495ef5ad318
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 724021eeab..120bdd10b9 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -22574,7 +22574,12 @@ static char *sip_do_debug(struct ast_cli_entry *e, int cmd, struct ast_cli_args
 		} else if (!strcasecmp(what, "off")) {
 			sipdebug &= ~sip_debug_console;
 			sipdebug_text = 0;
-			ast_cli(a->fd, "SIP Debugging Disabled\n");
+			if (sipdebug == sip_debug_none) {
+				ast_cli(a->fd, "SIP Debugging Disabled\n");
+			} else {
+				ast_cli(a->fd, "SIP Debugging still enabled due to configuration.\n");
+				ast_cli(a->fd, "Set sipdebug=no in sip.conf and reload to actually disable.\n");
+			}
 			return CLI_SUCCESS;
 		}
 	} else if (a->argc == e->args + 1) { /* ip/peer */