From 8f71f42ef7c7c67c0d0ee47814715e2c023d95ce Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Tue, 13 Mar 2012 21:53:06 -0400
Subject: No longer shell escape the DM password when calling pkisilent.

pkisilent was modified to handle escaping characters itself in
BZ https://bugzilla.redhat.com/show_bug.cgi?id=769388

This removes the workaround from ticket 1636.

https://fedorahosted.org/freeipa/ticket/2529
---
 freeipa.spec.in                 | 18 +++++-------------
 ipaserver/install/cainstance.py |  3 ---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index 773afbb0e..08ad79d87 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -129,23 +129,15 @@ Requires: selinux-policy >= 3.9.7-27
 %endif
 Requires(post): selinux-policy-base
 Requires: slapi-nis >= 0.21
+Requires: pki-ca >= 9.0.18
+Requires: pki-silent >= 9.0.18
+Requires: pki-setup  >= 9.0.18
+Requires: dogtag-pki-common-theme
+Requires: dogtag-pki-ca-theme
 %if 0%{?fedora} >= 16
-Requires: pki-ca >= 9.0.15
-Requires: pki-silent >= 9.0.15
 # Only tomcat6 greater than this version provides proper systemd support
 Requires: tomcat6 >= 6.0.32-17
-%else
-%if 0%{?fedora} >= 15
-Requires: pki-ca >= 9.0.15
-Requires: pki-silent >= 9.0.15
-Requires: pki-setup  >= 9.0.15
-%else
-Requires: pki-ca >= 9.0.5
-Requires: pki-silent >= 9.0.5
-%endif
 %endif
-Requires: dogtag-pki-common-theme
-Requires: dogtag-pki-ca-theme
 %if 0%{?rhel}
 Requires: subscription-manager
 %endif
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
index 948bc2d02..f953100be 100644
--- a/ipaserver/install/cainstance.py
+++ b/ipaserver/install/cainstance.py
@@ -660,9 +660,6 @@ class CAInstance(service.Service):
                 args.append("-clone")
                 args.append("false")
 
-            # pkisilent does not escape the arguments before passing them to shell
-            args[2:] = [ipautil.shell_quote(i) for i in args[2:]]
-
             # Define the things we don't want logged
             nolog = (self.admin_password, self.dm_password,)
 
-- 
cgit