Merge pull request #156 from basho/adt-security-holes

Don't start riak_search is security is enabled
basho · Dec 17, 2013 · 756a105 · 756a105
2 parents 502adec + 9a31815
commit 756a105
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/riak_search_app.erl b/src/riak_search_app.erl
@@ -18,7 +18,8 @@
 %% ===================================================================
 
 start(_StartType, _StartArgs) ->
-    case app_helper:get_env(riak_search, enabled, false) of
+    case app_helper:get_env(riak_search, enabled, false) and not
+         riak_core_security:is_enabled() of
         true ->
             %% Ensure that the KV service has fully loaded.
             riak_core:wait_for_service(riak_kv),