From 403b09ab980c02ef36095973349a13e0181c794a Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 03 Nov 2016 06:01:28 +0000
Subject: [PATCH] import ipa-4.4.0-12.el7

---
 SOURCES/1003-Remove-pkinit-references-from-tool-man-pages.patch |   47 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/SOURCES/1003-Remove-pkinit-references-from-tool-man-pages.patch b/SOURCES/1003-Remove-pkinit-references-from-tool-man-pages.patch
index 32a27c7..453e1cf 100644
--- a/SOURCES/1003-Remove-pkinit-references-from-tool-man-pages.patch
+++ b/SOURCES/1003-Remove-pkinit-references-from-tool-man-pages.patch
@@ -1,24 +1,51 @@
-From b3173293d8b580beb4ffd8c3e05561f670387c04 Mon Sep 17 00:00:00 2001
+From c72d7d5cfbf22125defac401f7b70bd164ae0293 Mon Sep 17 00:00:00 2001
 From: Martin Kosek <mkosek@redhat.com>
 Date: Wed, 22 May 2013 09:59:12 +0200
 Subject: [PATCH] Remove pkinit references from tool man pages
 
 ---
- install/tools/man/ipa-replica-install.1 |  3 ---
+ install/tools/man/ipa-replica-install.1 | 12 ------------
  install/tools/man/ipa-replica-prepare.1 | 12 ------------
  install/tools/man/ipa-server-install.1  | 12 ------------
- 3 files changed, 27 deletions(-)
+ 3 files changed, 36 deletions(-)
 
 diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
-index 780febf9d597d7d36b6104c0fc1be8f3d1f8fdee..ab8a428da4047db4655dbe8b3c5488f1292f8982 100644
+index 55bae2cb77e1a1c520e0598983b8939a919a9ee9..1bc7ccd779baad3bc0bb269914fd136549c09c47 100644
 --- a/install/tools/man/ipa-replica-install.1
 +++ b/install/tools/man/ipa-replica-install.1
-@@ -77,9 +77,6 @@ An unattended installation that will never prompt for user input
- 
- .SS "CERTIFICATE SYSTEM OPTIONS"
+@@ -125,36 +125,24 @@ The path to LDIF file that will be used to modify configuration of dse.ldif duri
+ Install and configure a CA on this replica. If a CA is not configured then
+ certificate operations will be forwarded to a master with a CA installed.
  .TP
 -\fB\-\-no\-pkinit\fR
 -Disables pkinit setup steps
+-.TP
+ \fB\-\-dirsrv\-cert\-file\fR=FILE
+ File containing the Directory Server SSL certificate and private key
+ .TP
+ \fB\-\-http\-cert\-file\fR=FILE
+ File containing the Apache Server SSL certificate and private key
+ .TP
+-\fB\-\-pkinit\-cert\-file\fR=FILE
+-File containing the Kerberos KDC SSL certificate and private key
+-.TP
+ \fB\-\-dirsrv\-pin\fR=PIN
+ The password to unlock the Directory Server private key
+ .TP
+ \fB\-\-http\-pin\fR=PIN
+ The password to unlock the Apache Server private key
+ .TP
+-\fB\-\-pkinit\-pin\fR=PIN
+-The password to unlock the Kerberos KDC private key
+-.TP
+ \fB\-\-dirsrv\-cert\-name\fR=NAME
+ Name of the Directory Server SSL certificate to install
+ .TP
+ \fB\-\-http\-cert\-name\fR=NAME
+ Name of the Apache Server SSL certificate to install
+ .TP
+-\fB\-\-pkinit\-cert\-name\fR=NAME
+-Name of the Kerberos KDC SSL certificate to install
 -.TP
  \fB\-\-skip\-schema\-check\fR
  Skip check for updated CA DS schema on the remote master
@@ -66,10 +93,10 @@
  Prints info log messages to the output
  .SH "EXIT STATUS"
 diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
-index 1eaed72119a9cd2f9876d3dc3c4a662782c18a36..3cea9fd66c133a25a611fa72a00d60a279da1b2a 100644
+index 55b49449e3c44aebfeefe5cb71d73e9abf07c5b2..697ee92f5d0b5b9ff9306e659aabe19295fc9fb9 100644
 --- a/install/tools/man/ipa-server-install.1
 +++ b/install/tools/man/ipa-server-install.1
-@@ -91,36 +91,24 @@ Type of the external CA. Possible values are "generic", "ms-cs". Default value i
+@@ -96,36 +96,24 @@ Type of the external CA. Possible values are "generic", "ms-cs". Default value i
  \fB\-\-external\-cert\-file\fR=\fIFILE\fR
  File containing the IPA CA certificate and the external CA certificate chain. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times.
  .TP
@@ -107,5 +134,5 @@
  File containing the CA certificate of the CA which issued the Directory Server, Apache Server and Kerberos KDC certificates. The file is accepted in PEM and DER certificate and PKCS#7 certificate chain formats. This option may be used multiple times. Use this option if the CA certificate is not present in the certificate files.
  .TP
 -- 
-2.1.0
+2.7.4
 

--
Gitblit v1.8.0