34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
From 3bce02b17edfbdf90ecdac2f9643e28eb20a170a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
Date: Tue, 13 Mar 2012 21:53:06 -0400
|
||
|
|
Subject: [PATCH] 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
|
||
|
|
---
|
||
|
|
ipaserver/install/cainstance.py | 3 ---
|
||
|
|
1 files changed, 0 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
|
||
|
|
index 6012ae1c7a00a87522fc0778f2cb355a3924d805..894e1951fa0c6f1a0f235cce0520c275724f227d 100644
|
||
|
|
--- a/ipaserver/install/cainstance.py
|
||
|
|
+++ b/ipaserver/install/cainstance.py
|
||
|
|
@@ -659,9 +659,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,)
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.6
|
||
|
|
|