From 8059a36335f4bc4baedfd7a6e0b434779e89fe84 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Wed, 10 Aug 2011 13:11:25 -0500 Subject: Action: Fix whitelist mode (Resolves #1029) Don't run 'post' Action entries if they are unlisted in whitelist mode. Signed-off-by: Sol Jerome --- src/lib/Client/Tools/Action.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib/Client/Tools') diff --git a/src/lib/Client/Tools/Action.py b/src/lib/Client/Tools/Action.py index bc57a0e27..4e85e3a72 100644 --- a/src/lib/Client/Tools/Action.py +++ b/src/lib/Client/Tools/Action.py @@ -85,4 +85,8 @@ class Action(Bcfg2.Client.Tools.Tool): for action in bundle.findall("Action"): if action.get('timing') in ['post', 'both'] and \ action.get('when') != 'modified': - states[action] = self.RunAction(action) + if self.setup['decision'] == 'whitelist': + if action in self.setup['decision_list']: + states[action] = self.RunAction(action) + else: + states[action] = self.RunAction(action) -- cgit v1.2.3-1-g7c22