[svn-commits] kmoore: trunk r1187 - /trunk/menuselect.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Fri Sep  5 08:25:56 2014
New Revision: 1187

URL: http://svnview.digium.com/svn/menuselect?view=rev&rev=1187
Log:
Menuselect: Fix incorrect enabling on failed deps

This corrects a situation where menuselect can incorrectly enable a
module by default that has defaultenabled set to "no" and has
failed/non-selected dependencies. The bug is due to an inverted test
when checking for whether the given module should be set to enabled by
default on load.

Review: https://reviewboard.asterisk.org/r/3975/
Reported by: John Bigelow

Modified:
    trunk/menuselect.c

Modified: trunk/menuselect.c
URL: http://svnview.digium.com/svn/menuselect/trunk/menuselect.c?view=diff&rev=1187&r1=1186&r2=1187
==============================================================================
--- trunk/menuselect.c (original)
+++ trunk/menuselect.c Fri Sep  5 08:25:56 2014
@@ -457,7 +457,7 @@
 
 			if (!cat->positive_output) {
 				mem->enabled = 1;
-				if (!(mem->defaultenabled && strcasecmp(mem->defaultenabled, "no"))) {
+				if (!mem->defaultenabled || strcasecmp(mem->defaultenabled, "no")) {
 					mem->was_enabled = 1;
 					print_debug("Enabled %s because the category does not have positive output\n", mem->name);
 				}