mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
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
This commit is contained in:
parent
4a2f812eb4
commit
8f71f42ef7
@ -129,23 +129,15 @@ Requires: selinux-policy >= 3.9.7-27
|
|||||||
%endif
|
%endif
|
||||||
Requires(post): selinux-policy-base
|
Requires(post): selinux-policy-base
|
||||||
Requires: slapi-nis >= 0.21
|
Requires: slapi-nis >= 0.21
|
||||||
%if 0%{?fedora} >= 16
|
Requires: pki-ca >= 9.0.18
|
||||||
Requires: pki-ca >= 9.0.15
|
Requires: pki-silent >= 9.0.18
|
||||||
Requires: pki-silent >= 9.0.15
|
Requires: pki-setup >= 9.0.18
|
||||||
# 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-common-theme
|
||||||
Requires: dogtag-pki-ca-theme
|
Requires: dogtag-pki-ca-theme
|
||||||
|
%if 0%{?fedora} >= 16
|
||||||
|
# Only tomcat6 greater than this version provides proper systemd support
|
||||||
|
Requires: tomcat6 >= 6.0.32-17
|
||||||
|
%endif
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
Requires: subscription-manager
|
Requires: subscription-manager
|
||||||
%endif
|
%endif
|
||||||
|
@ -660,9 +660,6 @@ class CAInstance(service.Service):
|
|||||||
args.append("-clone")
|
args.append("-clone")
|
||||||
args.append("false")
|
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
|
# Define the things we don't want logged
|
||||||
nolog = (self.admin_password, self.dm_password,)
|
nolog = (self.admin_password, self.dm_password,)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user