[asterisk-commits] kharwell: branch certified-11.6 r412212 - in /certified/branches/11.6: ./ main/

[SVN commits to the Asterisk project]

Author: kharwell
Date: Fri Apr 11 12:27:19 2014
New Revision: 412212

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412212
Log:
asterisk.c: suppress live_dangerously warning on rasterisk

Even since the fixes of AST-2013-007, Asterisk prints the following
warning on startup if the user decided to live dangerously:

  Privilege escalation protection disabled!
  See https://wiki.asterisk.org/wiki/x/1gKfAQ for more details.

This message is intended for the logs and interactive startup. No need
for it to appear on a remote console. This commit removes it from there.

(closes issue ASTERISK-23084)
Review: https://reviewboard.asterisk.org/r/3101/
........

Merged revisions 404861 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 404888 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    certified/branches/11.6/   (props changed)
    certified/branches/11.6/main/asterisk.c

Propchange: certified/branches/11.6/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Fri Apr 11 12:27:19 2014
@@ -1,1 +1,1 @@
-/branches/11:396884,399513,400075-400093,401446,401960,402450,403863,403917,404344,405215,405380,405431,406341,406418,407727,408388,410311,410381
+/branches/11:396884,399513,400075-400093,401446,401960,402450,403863,403917,404344,404888,405215,405380,405431,406341,406418,407727,408388,410311,410381

Modified: certified/branches/11.6/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/certified/branches/11.6/main/asterisk.c?view=diff&rev=412212&r1=412211&r2=412212
==============================================================================
--- certified/branches/11.6/main/asterisk.c (original)
+++ certified/branches/11.6/main/asterisk.c Fri Apr 11 12:27:19 2014
@@ -3479,7 +3479,9 @@
 			live_dangerously = ast_true(v->value);
 		}
 	}
-	pbx_live_dangerously(live_dangerously);
+	if (!ast_opt_remote) {
+		pbx_live_dangerously(live_dangerously);
+	}
 	for (v = ast_variable_browse(cfg, "compat"); v; v = v->next) {
 		float version;
 		if (sscanf(v->value, "%30f", &version) != 1) {