summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Dennis <jdennis@redhat.com>2012-04-19 08:56:07 -0400
committerMartin Kosek <mkosek@redhat.com>2012-04-19 15:22:59 +0200
commit1df88f06f926ae1907b4bfc2633bee747d146c89 (patch)
tree53c6dd84efea4e02f0843d560db38ca009fdb5df
parentd27b55c0c721516ceda26aedabe14f8ea0a3dadd (diff)
downloadfreeipa.git-1df88f06f926ae1907b4bfc2633bee747d146c89.tar.gz
freeipa.git-1df88f06f926ae1907b4bfc2633bee747d146c89.tar.xz
freeipa.git-1df88f06f926ae1907b4bfc2633bee747d146c89.zip
Fix name error in hbactest
Ticket #2512 In hbactest.py there is a name error wrapped inside a try/except block that ignores all errors so the code block exits prematurely leaving a critical variable uninitialized. The name error is the result of a cut-n-paste error that references a variable that had never been initialized in the scope of the code block. Python generates an exception when this variable is referenced but because it's wrapped in a try/except block that catches all errors and ignores all errors there is no evidence that something went wrong. The fix is to use the correct variables. At some point we may want to revist if ignoring all errors and proceding as if nothing happened is actually correct. Alexander tells me this mimics what SSSD does in the hbac rule processing, thus the ignoring of errors is intentional. But in a plugin whose purpose is to test and exercise hbac rules I'm not sure ignoring all errors is really the right behavior.
-rw-r--r--ipalib/plugins/hbactest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipalib/plugins/hbactest.py b/ipalib/plugins/hbactest.py
index b81dca3d..78fac024 100644
--- a/ipalib/plugins/hbactest.py
+++ b/ipalib/plugins/hbactest.py
@@ -325,7 +325,7 @@ class hbactest(Command):
srchost_result = self.api.Command.host_show(request.srchost.name)['result']
groups = srchost_result['memberof_hostgroup']
if 'memberofindirect_hostgroup' in srchost_result:
- groups += search_result['memberofindirect_hostgroup']
+ groups += srchost_result['memberofindirect_hostgroup']
request.srchost.groups = sorted(set(groups))
except:
pass
@@ -338,7 +338,7 @@ class hbactest(Command):
tgthost_result = self.api.Command.host_show(request.targethost.name)['result']
groups = tgthost_result['memberof_hostgroup']
if 'memberofindirect_hostgroup' in tgthost_result:
- groups += search_result['memberofindirect_hostgroup']
+ groups += tgthost_result['memberofindirect_hostgroup']
request.targethost.groups = sorted(set(groups))
except:
pass