[svn-commits] tzafrir: branch 11 r404888 - in /branches/11: ./ main/asterisk.c

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Fri Jan  3 16:24:18 2014
New Revision: 404888

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=404888
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

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

Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/11/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/asterisk.c?view=diff&rev=404888&r1=404887&r2=404888
==============================================================================
--- branches/11/main/asterisk.c (original)
+++ branches/11/main/asterisk.c Fri Jan  3 16:24:18 2014
@@ -3421,7 +3421,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) {