Fix cib.xml parsing for acl_version (bsc#1158681)

ClusterLabs · Dec 17, 2019 · 20cbdcc · 20cbdcc
1 parent ad46139
commit 20cbdcc
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/hawk/lib/util.rb b/hawk/lib/util.rb
@@ -342,12 +342,7 @@ def acl_enabled?
 
   def acl_version
     Rails.cache.fetch(:get_acl_version) do
-      m = safe_x(
-        '/usr/sbin/cibadmin',
-        '-t', '5',
-        '-Ql',
-        '--xpath',
-        '/cib[@validate-with]').lines.first.to_s.match(/validate-with=\"pacemaker-([0-9.]+)\"/)
+      m = `/usr/sbin/cibadmin -t 5 -Ql --xpath /cib[@validate-with]`.shellescape.lines.first.to_s.match(/validate-with=\"pacemaker-([0-9.]+)\"/)
       return m.captures[0].to_f if m
       2.0
     end