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/1004-Change-branding-to-IPA-and-Identity-Management.patch |  330 +++++++++++++++++++++++++++---------------------------
 1 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/SOURCES/1004-Change-branding-to-IPA-and-Identity-Management.patch b/SOURCES/1004-Change-branding-to-IPA-and-Identity-Management.patch
index 681bfbe..e06d7ff 100644
--- a/SOURCES/1004-Change-branding-to-IPA-and-Identity-Management.patch
+++ b/SOURCES/1004-Change-branding-to-IPA-and-Identity-Management.patch
@@ -1,9 +1,16 @@
-From 5e341cea66938c8dfd99d83c869a1f2ba71479be Mon Sep 17 00:00:00 2001
+From d9499d8d1a40b96e40c956dca25464fc129a9dec Mon Sep 17 00:00:00 2001
 From: Martin Kosek <mkosek@redhat.com>
 Date: Fri, 5 Sep 2014 11:46:59 +0200
 Subject: [PATCH] Change branding to IPA and Identity Management
 
 ---
+ client/man/default.conf.5                  | 2 +-
+ client/man/ipa-certupdate.1                | 2 +-
+ client/man/ipa-client-automount.1          | 2 +-
+ client/man/ipa-client-install.1            | 2 +-
+ client/man/ipa-getkeytab.1                 | 4 ++--
+ client/man/ipa-join.1                      | 2 +-
+ client/man/ipa-rmkeytab.1                  | 2 +-
  install/html/browserconfig.html            | 4 ++--
  install/html/ssbrowser.html                | 4 ++--
  install/html/unauthorized.html             | 4 ++--
@@ -38,13 +45,6 @@
  install/ui/reset_password.html             | 2 +-
  install/ui/src/freeipa/widgets/App.js      | 2 +-
  install/ui/sync_otp.html                   | 2 +-
- ipa-client/man/default.conf.5              | 2 +-
- ipa-client/man/ipa-certupdate.1            | 2 +-
- ipa-client/man/ipa-client-automount.1      | 2 +-
- ipa-client/man/ipa-client-install.1        | 2 +-
- ipa-client/man/ipa-getkeytab.1             | 4 ++--
- ipa-client/man/ipa-join.1                  | 2 +-
- ipa-client/man/ipa-rmkeytab.1              | 2 +-
  ipa.1                                      | 2 +-
  ipaserver/advise/plugins/legacy_clients.py | 8 ++++----
  ipaserver/install/dns.py                   | 2 +-
@@ -53,6 +53,106 @@
  ipaserver/install/server/replicainstall.py | 2 +-
  47 files changed, 57 insertions(+), 57 deletions(-)
 
+diff --git a/client/man/default.conf.5 b/client/man/default.conf.5
+index 35ce6bb9f871365ffbc74b66be46d49fdcb3f7ad..b519d15bca9b7ddf8d22a776fa4f4a8c7fac0ca8 100644
+--- a/client/man/default.conf.5
++++ b/client/man/default.conf.5
+@@ -16,7 +16,7 @@
+ .\"
+ .\" Author: Rob Crittenden <rcritten@@redhat.com>
+ .\"
+-.TH "default.conf" "5" "Feb 21 2011" "FreeIPA" "FreeIPA Manual Pages"
++.TH "default.conf" "5" "Feb 21 2011" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ default.conf \- IPA configuration file
+ .SH "SYNOPSIS"
+diff --git a/client/man/ipa-certupdate.1 b/client/man/ipa-certupdate.1
+index d95790a366aac4635e32bbc6bc81773bb9a52e68..431b395a907b6978d9e0dba9870ed0bd0c54f07b 100644
+--- a/client/man/ipa-certupdate.1
++++ b/client/man/ipa-certupdate.1
+@@ -16,7 +16,7 @@
+ .\"
+ .\" Author: Jan Cholasta <jcholast@redhat.com>
+ .\"
+-.TH "ipa-certupdate" "1" "Jul 2 2014" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-certupdate" "1" "Jul 2 2014" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-certupdate \- Update local IPA certificate databases with certificates from the server
+ .SH "SYNOPSIS"
+diff --git a/client/man/ipa-client-automount.1 b/client/man/ipa-client-automount.1
+index 5b60503f1304d0a0b03a8862708ba126c50c7eff..2e6f78aa659e90f879f66431c4e52e303a4c9b15 100644
+--- a/client/man/ipa-client-automount.1
++++ b/client/man/ipa-client-automount.1
+@@ -16,7 +16,7 @@
+ .\"
+ .\" Author: Rob Crittenden <rcritten@redhat.com>
+ .\"
+-.TH "ipa-client-automount" "1" "May 25 2012" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-client-automount" "1" "May 25 2012" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-client\-automount \- Configure automount and NFS for IPA
+ .SH "SYNOPSIS"
+diff --git a/client/man/ipa-client-install.1 b/client/man/ipa-client-install.1
+index 7f490d153b12d714e7bda7a6abe72fb0756d520c..438dbe440626763ce1dd9c1a3d36d8d67599e6ff 100644
+--- a/client/man/ipa-client-install.1
++++ b/client/man/ipa-client-install.1
+@@ -16,7 +16,7 @@
+ .\"
+ .\" Author: Rob Crittenden <rcritten@redhat.com>
+ .\"
+-.TH "ipa-client-install" "1" "Jan 31 2013" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-client-install" "1" "Jan 31 2013" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-client\-install \- Configure an IPA client
+ .SH "SYNOPSIS"
+diff --git a/client/man/ipa-getkeytab.1 b/client/man/ipa-getkeytab.1
+index 1c270729e1ea224fb74271ad03dfb51c62d70465..11bc5154b2990aac8a4bf2c81fe2b70897b0d839 100644
+--- a/client/man/ipa-getkeytab.1
++++ b/client/man/ipa-getkeytab.1
+@@ -17,7 +17,7 @@
+ .\" Author: Karl MacMillan <kmacmill@redhat.com>
+ .\" Author: Simo Sorce <ssorce@redhat.com>
+ .\"
+-.TH "ipa-getkeytab" "1" "Oct 10 2007" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-getkeytab" "1" "Oct 10 2007" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-getkeytab \- Get a keytab for a Kerberos principal
+ .SH "SYNOPSIS"
+@@ -101,7 +101,7 @@ The LDAP password to use when not binding with Kerberos.
+ \fB\-r\fR
+ Retrieve mode. Retrieve an existing key from the server instead of generating a
+ new one. This is incompatibile with the \-\-password option, and will work only
+-against a FreeIPA server more recent than version 3.3. The user requesting the
++against a IPA server more recent than version 3.3. The user requesting the
+ keytab must have access to the keys for this operation to succeed.
+ .SH "EXAMPLES"
+ Add and retrieve a keytab for the NFS service principal on
+diff --git a/client/man/ipa-join.1 b/client/man/ipa-join.1
+index d881607842bb0227c2da863bd1674db01530e910..30b667558ba3105cf320896ef40b0661a18066f5 100644
+--- a/client/man/ipa-join.1
++++ b/client/man/ipa-join.1
+@@ -16,7 +16,7 @@
+ .\"
+ .\" Author: Rob Crittenden <rcritten@redhat.com>
+ .\"
+-.TH "ipa-join" "1" "Oct 8 2009" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-join" "1" "Oct 8 2009" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-join \- Join a machine to an IPA realm and get a keytab for the host service principal
+ .SH "SYNOPSIS"
+diff --git a/client/man/ipa-rmkeytab.1 b/client/man/ipa-rmkeytab.1
+index 53f775439dbdb5a4b9dfee7fe6c7277fce10893c..2c8218c94996b1411637a7c53f2f5bc5612f3ea3 100644
+--- a/client/man/ipa-rmkeytab.1
++++ b/client/man/ipa-rmkeytab.1
+@@ -17,7 +17,7 @@
+ .\" Author: Rob Crittenden <rcritten@redhat.com>
+ .\"
+ .\"
+-.TH "ipa-rmkeytab" "1" "Oct 30 2009" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-rmkeytab" "1" "Oct 30 2009" "IPA" "IPA Manual Pages"
+ .SH "NAME"
+ ipa\-rmkeytab \- Remove a kerberos principal from a keytab
+ .SH "SYNOPSIS"
 diff --git a/install/html/browserconfig.html b/install/html/browserconfig.html
 index 9c5cf68211281723e12b518f346aac43c1541cdc..14c4ca1f98a60cd8dfe486f8b942fcf9ae9de4c0 100644
 --- a/install/html/browserconfig.html
@@ -76,7 +176,7 @@
      </nav>
  
 diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html
-index 685800e16e6e77c70adf905acfca2996513d1e1d..8595f82ead70c8e6b2fcd38e2e290bd126d32e70 100644
+index 49d8c5be1a5c07fca0593b6c7d0252a2faf15abf..3c67c484162ad9f1897fc1707a89869ff2dbfa2b 100644
 --- a/install/html/ssbrowser.html
 +++ b/install/html/ssbrowser.html
 @@ -2,7 +2,7 @@
@@ -88,7 +188,7 @@
      <script type="text/javascript" src="../ui/js/libs/loader.js"></script>
      <script type="text/javascript">
          (function() {
-@@ -45,7 +45,7 @@
+@@ -33,7 +33,7 @@
  
      <nav class="navbar navbar-default navbar-pf" role="navigation">
      <div class="navbar-header">
@@ -168,28 +268,28 @@
      <link rel="stylesheet" type="text/css" href="../ui/css/patternfly.css" />
      <link rel="stylesheet" type="text/css" href="../ui/css/ipa.css" />
 diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install
-index 21e58dd9f25e82429ce8d0c776d1b512c2661809..45b75a36d855ad11a5ac8c0358127a6726ff6ef2 100755
+index 5ba72a65d00ca683239a4ff3c5e7cfdc62c0bb6c..8ae68f7baa0e1489604bf2bf66354858642cf838 100755
 --- a/install/tools/ipa-adtrust-install
 +++ b/install/tools/ipa-adtrust-install
-@@ -228,11 +228,11 @@ def main():
+@@ -246,11 +246,11 @@ def main():
  
-     print "=============================================================================="
-     print "This program will setup components needed to establish trust to AD domains for"
--    print "the FreeIPA Server."
-+    print "the IPA Server."
-     print ""
-     print "This includes:"
-     print "  * Configure Samba"
--    print "  * Add trust related objects to FreeIPA LDAP server"
-+    print "  * Add trust related objects to IPA LDAP server"
+     print("==============================================================================")
+     print("This program will setup components needed to establish trust to AD domains for")
+-    print("the FreeIPA Server.")
++    print("the IPA Server.")
+     print("")
+     print("This includes:")
+     print("  * Configure Samba")
+-    print("  * Add trust related objects to FreeIPA LDAP server")
++    print("  * Add trust related objects to IPA LDAP server")
      #TODO:
      #print "  * Add a SID to all users and Posix groups"
-     print ""
+     print("")
 diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck
-index 22348fc2158e59afc2e1aa51e3d3f51e90b99e39..e26e878c5b82b4e1e8a172a217b3225dcea642c4 100755
+index 6f69cc81517299f8cf8decef7c79f7de682d0c80..24ccccea4d3cc6655a273e631d7753da7ac3d534 100755
 --- a/install/tools/ipa-replica-conncheck
 +++ b/install/tools/ipa-replica-conncheck
-@@ -252,7 +252,7 @@ class PortResponder(threading.Thread):
+@@ -298,7 +298,7 @@ class PortResponder(threading.Thread):
                  ipautil.bind_port_responder(self.port,
                          self.port_type,
                          socket_timeout=self.socket_timeout,
@@ -197,9 +297,9 @@
 +                        responder_data="IPA")
              except socket.timeout:
                  pass
-             except socket.error, e:
+             except socket.error as e:
 diff --git a/install/tools/man/ipa-adtrust-install.1 b/install/tools/man/ipa-adtrust-install.1
-index 2658f1957d1161963bf6af75e5a086a01b95c52f..7639a0b8e94c64180a05777c1cb117c74c49806b 100644
+index 36c468336909c705c68a2794dec699f3f05579d9..8ffb3bfca768e47f2e275153be39257b6baae86b 100644
 --- a/install/tools/man/ipa-adtrust-install.1
 +++ b/install/tools/man/ipa-adtrust-install.1
 @@ -16,7 +16,7 @@
@@ -258,7 +358,7 @@
  ipa\-ca\-install \- Install a CA on a server
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-cacert-manage.1 b/install/tools/man/ipa-cacert-manage.1
-index 1f37788336048e412eee71757f236c9944860514..0b927716797068ab4f5632292615a43748eee35c 100644
+index f0a1033ab372c2f923a883b385c0e3304b98f56f..57abf437ab4b80d220640ab338f81e8cfbe90f50 100644
 --- a/install/tools/man/ipa-cacert-manage.1
 +++ b/install/tools/man/ipa-cacert-manage.1
 @@ -16,7 +16,7 @@
@@ -284,7 +384,7 @@
  ipa\-compat\-manage \- Enables or disables the schema compatibility plugin
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-csreplica-manage.1 b/install/tools/man/ipa-csreplica-manage.1
-index 3164ea60d67db99445dac168fad967cb48be428e..bdf70302e1743d0d94c0acad7e83b5a16026c643 100644
+index ab5bfddd884f65b6806c4e69f212324dc5b67c5f..6d039751ea4925b67240cb06fea1e678900b075e 100644
 --- a/install/tools/man/ipa-csreplica-manage.1
 +++ b/install/tools/man/ipa-csreplica-manage.1
 @@ -16,7 +16,7 @@
@@ -297,7 +397,7 @@
  ipa\-csreplica\-manage \- Manage an IPA CS replica
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-dns-install.1 b/install/tools/man/ipa-dns-install.1
-index 23427b1b15ddf21ff1aba5617adab395d2f25112..b05c328e31b8672a22d060bd23d8e8d2a79353ba 100644
+index ad937cc59bc0b1cff2dd73faa494a8121b6eb45d..971053b0f69487e8a29687984b5ad551efa8858c 100644
 --- a/install/tools/man/ipa-dns-install.1
 +++ b/install/tools/man/ipa-dns-install.1
 @@ -16,7 +16,7 @@
@@ -349,15 +449,15 @@
  ipa\-managed\-entries \- Enables or disables the schema Managed Entry plugins
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-nis-manage.1 b/install/tools/man/ipa-nis-manage.1
-index fa02cfc76fa6bd076ebddde702036fa0b36f1413..e25f53eddca6cf1da1b631c1bf4ae275efb5a2b1 100644
+index 93278487c1adb50f4ae49804d0214841e2bef30c..1107b7790531aa695defd660040734143c02474d 100644
 --- a/install/tools/man/ipa-nis-manage.1
 +++ b/install/tools/man/ipa-nis-manage.1
 @@ -16,7 +16,7 @@
  .\"
  .\" Author: Rob Crittenden <rcritten@redhat.com>
  .\"
--.TH "ipa-nis-manage" "1" "May 6 2009" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-nis-manage" "1" "May 6 2009" "IPA" "IPA Manual Pages"
+-.TH "ipa-nis-manage" "1" "April 25 2016" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-nis-manage" "1" "April 25 2016" "IPA" "IPA Manual Pages"
  .SH "NAME"
  ipa\-nis\-manage \- Enables or disables the NIS listener plugin
  .SH "SYNOPSIS"
@@ -375,7 +475,7 @@
  ipa\-otptoken\-import \- Imports OTP tokens from RFC 6030 XML file
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-replica-conncheck.1 b/install/tools/man/ipa-replica-conncheck.1
-index 566322cf035bbb51d1ba8b14166a1b61375015da..7f220de96cc03a1f883f585740a82bff062f0ce9 100644
+index e948d7919c772305ef2f0b5b7b50de2b908ff9e0..2840d7c7014991364911f657e19cd46b77f2b595 100644
 --- a/install/tools/man/ipa-replica-conncheck.1
 +++ b/install/tools/man/ipa-replica-conncheck.1
 @@ -16,7 +16,7 @@
@@ -388,7 +488,7 @@
  ipa\-replica\-conncheck \- Check a replica\-master network connection before installation
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1
-index ab8a428da4047db4655dbe8b3c5488f1292f8982..e00aae357ad3dc7a97a0b516bf5e005953824d1b 100644
+index c1a9db0994a457cc8121cb0c46a8edc592430adb..cbc8fbbe652e4d07bb304d087c2d9faadf1e4b13 100644
 --- a/install/tools/man/ipa-replica-install.1
 +++ b/install/tools/man/ipa-replica-install.1
 @@ -16,7 +16,7 @@
@@ -401,15 +501,15 @@
  ipa\-replica\-install \- Create an IPA replica
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-replica-manage.1 b/install/tools/man/ipa-replica-manage.1
-index c09ed362f3143e6e38716e1b3a96e90001a64674..2cdaf59984868c98e02321cf73eed016b4e478a6 100644
+index ed975c92c4453798e6536a75318d5e5065c876a4..f75fcceb8949c050a11cb9c1d28a70d06aaec832 100644
 --- a/install/tools/man/ipa-replica-manage.1
 +++ b/install/tools/man/ipa-replica-manage.1
 @@ -16,7 +16,7 @@
  .\"
  .\" Author: Rob Crittenden <rcritten@redhat.com>
  .\"
--.TH "ipa-replica-manage" "1" "Mar 1 2013" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-replica-manage" "1" "Mar 1 2013" "IPA" "IPA Manual Pages"
+-.TH "ipa-replica-manage" "1" "Jul 12 2016" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa-replica-manage" "1" "Jul 12 2016" "IPA" "IPA Manual Pages"
  .SH "NAME"
  ipa\-replica\-manage \- Manage an IPA replica
  .SH "SYNOPSIS"
@@ -453,7 +553,7 @@
  ipa\-server\-certinstall \- Install new SSL server certificates
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1
-index 3cea9fd66c133a25a611fa72a00d60a279da1b2a..a1fd6ea76926cae8db9ebeb6c92b03b8087eb3a2 100644
+index 697ee92f5d0b5b9ff9306e659aabe19295fc9fb9..2d9a57ad2a3fc1426c562f881b2504e3d5414035 100644
 --- a/install/tools/man/ipa-server-install.1
 +++ b/install/tools/man/ipa-server-install.1
 @@ -16,7 +16,7 @@
@@ -479,7 +579,7 @@
  ipa\-server\-upgrade \- upgrade IPA server
  .SH "SYNOPSIS"
 diff --git a/install/tools/man/ipactl.8 b/install/tools/man/ipactl.8
-index 136fe9ac6fe7dbff5618543c1958565bab87502a..88dad986330c327a3f1c1f8be114f7d3e158ea9c 100644
+index fb533aae2009628473654a85e3a9b006e4f17b1f..d7aaaf8edab49b3e763fb3d73f69b97bc75a2202 100644
 --- a/install/tools/man/ipactl.8
 +++ b/install/tools/man/ipactl.8
 @@ -16,7 +16,7 @@
@@ -492,7 +592,7 @@
  ipactl \- IPA Server Control Interface
  .SH "SYNOPSIS"
 diff --git a/install/ui/index.html b/install/ui/index.html
-index f4fe06d0bf25cad1f68e8450d4cc2787eaf0de4e..cbdf97aa59f7b9ed01ff11de17e1f9f2a868b65b 100644
+index bc0f0cd1e8ab2f426ded17938aaca58bcaf5af64..d1eacaf5340336ff968c30978d3cd70b559ac9ef 100644
 --- a/install/ui/index.html
 +++ b/install/ui/index.html
 @@ -2,7 +2,7 @@
@@ -518,10 +618,10 @@
      <script type="text/javascript">
          (function() {
 diff --git a/install/ui/src/freeipa/widgets/App.js b/install/ui/src/freeipa/widgets/App.js
-index b70b14a94eadc3788ed6c31132476e53986b3e77..164b499e7ef43508af7a1c423ed9ab9f30217c16 100644
+index 21e51a70512bd6d8bbf6074cedc3e9d55cda1131..c1b456880c096afe2ce707223ab377b976e9e241 100644
 --- a/install/ui/src/freeipa/widgets/App.js
 +++ b/install/ui/src/freeipa/widgets/App.js
-@@ -188,7 +188,7 @@ define(['dojo/_base/declare',
+@@ -187,7 +187,7 @@ define(['dojo/_base/declare',
  
              construct.create('img', {
                  src: 'images/header-logo.png',
@@ -543,121 +643,21 @@
  
      <!--[if IE]>
      <meta id="ie-detector">
-diff --git a/ipa-client/man/default.conf.5 b/ipa-client/man/default.conf.5
-index 75b9f86bcf4fe065c65f0a1b115976fc1cec13bd..6c13b9d1f288f337924f8e2251c4efbe513bdaf6 100644
---- a/ipa-client/man/default.conf.5
-+++ b/ipa-client/man/default.conf.5
-@@ -16,7 +16,7 @@
- .\"
- .\" Author: Rob Crittenden <rcritten@@redhat.com>
- .\"
--.TH "default.conf" "5" "Feb 21 2011" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "default.conf" "5" "Feb 21 2011" "IPA" "IPA Manual Pages"
- .SH "NAME"
- default.conf \- IPA configuration file
- .SH "SYNOPSIS"
-diff --git a/ipa-client/man/ipa-certupdate.1 b/ipa-client/man/ipa-certupdate.1
-index d95790a366aac4635e32bbc6bc81773bb9a52e68..431b395a907b6978d9e0dba9870ed0bd0c54f07b 100644
---- a/ipa-client/man/ipa-certupdate.1
-+++ b/ipa-client/man/ipa-certupdate.1
-@@ -16,7 +16,7 @@
- .\"
- .\" Author: Jan Cholasta <jcholast@redhat.com>
- .\"
--.TH "ipa-certupdate" "1" "Jul 2 2014" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-certupdate" "1" "Jul 2 2014" "IPA" "IPA Manual Pages"
- .SH "NAME"
- ipa\-certupdate \- Update local IPA certificate databases with certificates from the server
- .SH "SYNOPSIS"
-diff --git a/ipa-client/man/ipa-client-automount.1 b/ipa-client/man/ipa-client-automount.1
-index 5b60503f1304d0a0b03a8862708ba126c50c7eff..2e6f78aa659e90f879f66431c4e52e303a4c9b15 100644
---- a/ipa-client/man/ipa-client-automount.1
-+++ b/ipa-client/man/ipa-client-automount.1
-@@ -16,7 +16,7 @@
- .\"
- .\" Author: Rob Crittenden <rcritten@redhat.com>
- .\"
--.TH "ipa-client-automount" "1" "May 25 2012" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-client-automount" "1" "May 25 2012" "IPA" "IPA Manual Pages"
- .SH "NAME"
- ipa\-client\-automount \- Configure automount and NFS for IPA
- .SH "SYNOPSIS"
-diff --git a/ipa-client/man/ipa-client-install.1 b/ipa-client/man/ipa-client-install.1
-index 0fafd8a3f2ee24b400b1cbeada4ddf7cea9493b0..46362345de78c5f107a806be0ee3a1176df790f5 100644
---- a/ipa-client/man/ipa-client-install.1
-+++ b/ipa-client/man/ipa-client-install.1
-@@ -16,7 +16,7 @@
- .\"
- .\" Author: Rob Crittenden <rcritten@redhat.com>
- .\"
--.TH "ipa-client-install" "1" "Jan 31 2013" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-client-install" "1" "Jan 31 2013" "IPA" "IPA Manual Pages"
- .SH "NAME"
- ipa\-client\-install \- Configure an IPA client
- .SH "SYNOPSIS"
-diff --git a/ipa-client/man/ipa-getkeytab.1 b/ipa-client/man/ipa-getkeytab.1
-index bb84ad8f2b29f0753d48f480fc571ed6122ba539..349da64c82cfc53549ef666074e89d83a24d74e0 100644
---- a/ipa-client/man/ipa-getkeytab.1
-+++ b/ipa-client/man/ipa-getkeytab.1
-@@ -17,7 +17,7 @@
- .\" Author: Karl MacMillan <kmacmill@redhat.com>
- .\" Author: Simo Sorce <ssorce@redhat.com>
- .\"
--.TH "ipa-getkeytab" "1" "Oct 10 2007" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-getkeytab" "1" "Oct 10 2007" "IPA" "IPA Manual Pages"
- .SH "NAME"
- ipa\-getkeytab \- Get a keytab for a Kerberos principal
- .SH "SYNOPSIS"
-@@ -99,7 +99,7 @@ The LDAP password to use when not binding with Kerberos.
- \fB\-r\fR
- Retrieve mode. Retrieve an existing key from the server instead of generating a
- new one. This is incompatibile with the \-\-password option, and will work only
--against a FreeIPA server more recent than version 3.3. The user requesting the
-+against a IPA server more recent than version 3.3. The user requesting the
- keytab must have access to the keys for this operation to succeed.
- .SH "EXAMPLES"
- Add and retrieve a keytab for the NFS service principal on
-diff --git a/ipa-client/man/ipa-join.1 b/ipa-client/man/ipa-join.1
-index d881607842bb0227c2da863bd1674db01530e910..30b667558ba3105cf320896ef40b0661a18066f5 100644
---- a/ipa-client/man/ipa-join.1
-+++ b/ipa-client/man/ipa-join.1
-@@ -16,7 +16,7 @@
- .\"
- .\" Author: Rob Crittenden <rcritten@redhat.com>
- .\"
--.TH "ipa-join" "1" "Oct 8 2009" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-join" "1" "Oct 8 2009" "IPA" "IPA Manual Pages"
- .SH "NAME"
- ipa\-join \- Join a machine to an IPA realm and get a keytab for the host service principal
- .SH "SYNOPSIS"
-diff --git a/ipa-client/man/ipa-rmkeytab.1 b/ipa-client/man/ipa-rmkeytab.1
-index 53f775439dbdb5a4b9dfee7fe6c7277fce10893c..2c8218c94996b1411637a7c53f2f5bc5612f3ea3 100644
---- a/ipa-client/man/ipa-rmkeytab.1
-+++ b/ipa-client/man/ipa-rmkeytab.1
-@@ -17,7 +17,7 @@
- .\" Author: Rob Crittenden <rcritten@redhat.com>
- .\"
- .\"
--.TH "ipa-rmkeytab" "1" "Oct 30 2009" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa-rmkeytab" "1" "Oct 30 2009" "IPA" "IPA Manual Pages"
- .SH "NAME"
- ipa\-rmkeytab \- Remove a kerberos principal from a keytab
- .SH "SYNOPSIS"
 diff --git a/ipa.1 b/ipa.1
-index ec7e5da7077a41095fdaa75babb1b680f3522f7f..f53e815d26e5a3f4843a220012240a775387195e 100644
+index 9194ca0717cb4895b825fdc2783834a9749624a9..5dbef251453ea7a3809421486e811e8722955813 100644
 --- a/ipa.1
 +++ b/ipa.1
 @@ -16,7 +16,7 @@
  .\"
  .\" Author: Pavel Zuna <pzuna@redhat.com>
  .\"
--.TH "ipa" "1" "Jan 24 2012" "FreeIPA" "FreeIPA Manual Pages"
-+.TH "ipa" "1" "Jan 24 2012" "IPA" "IPA Manual Pages"
+-.TH "ipa" "1" "Apr 29 2016" "FreeIPA" "FreeIPA Manual Pages"
++.TH "ipa" "1" "Apr 29 2016" "IPA" "IPA Manual Pages"
  .SH "NAME"
  ipa \- IPA command\-line interface
  .SH "SYNOPSIS"
 diff --git a/ipaserver/advise/plugins/legacy_clients.py b/ipaserver/advise/plugins/legacy_clients.py
-index e673cb45f58901ddee70a0ec6cea62531bba965b..d026fb0a356d7ac49d26ef96fe602f2b8cb82230 100644
+index 9e381f12a4f60e970a08de34b79a6ad5028de449..193791028b08d69aa2cc0d2deaeaa4500121b60c 100644
 --- a/ipaserver/advise/plugins/legacy_clients.py
 +++ b/ipaserver/advise/plugins/legacy_clients.py
 @@ -89,7 +89,7 @@ class config_redhat_sssd_before_1_9(config_base_legacy_client):
@@ -697,23 +697,23 @@
                     'are all Red Hat based platforms.')
  
 diff --git a/ipaserver/install/dns.py b/ipaserver/install/dns.py
-index 099e35dc331722607c8ca02cdbc7a0e66f8c4754..d2d611e4d0662c6475bcacfcbbd768ee07e25bba 100644
+index 44ebd39dfa7f1d947061c3b4c0347242f8502be0..f3582cf37b2b7800db5fc666d9539adb44651bd6 100644
 --- a/ipaserver/install/dns.py
 +++ b/ipaserver/install/dns.py
-@@ -104,7 +104,7 @@ def install_check(standalone, replica, options, hostname):
+@@ -138,7 +138,7 @@ def install_check(standalone, api, replica, options, hostname):
  
      if standalone:
-         print "=============================================================================="
--        print "This program will setup DNS for the FreeIPA Server."
-+        print "This program will setup DNS for the IPA Server."
-         print ""
-         print "This includes:"
-         print "  * Configure DNS (bind)"
+         print("==============================================================================")
+-        print("This program will setup DNS for the FreeIPA Server.")
++        print("This program will setup DNS for the IPA Server.")
+         print("")
+         print("This includes:")
+         print("  * Configure DNS (bind)")
 diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py
-index d75a2427352851fecc045707a8cf73f99d05843b..2a42272ef433a1ddb7a040143ff63a31c12f03d0 100644
+index 9cb5f0fcc45d0c6ddb68456ee0b6d9a1fb2a2de1..19982c5a8421b4819d44a3ef0eb9f6a44bbeb4ea 100644
 --- a/ipaserver/install/ipa_kra_install.py
 +++ b/ipaserver/install/ipa_kra_install.py
-@@ -108,7 +108,7 @@ class KRAInstaller(KRAInstall):
+@@ -114,7 +114,7 @@ class KRAInstaller(KRAInstall):
  
      INSTALLER_START_MESSAGE = '''
          ===================================================================
@@ -723,23 +723,23 @@
      '''
  
 diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
-index a2a22c6334edf442e07ff3a1b4b9b309de2bc8a5..0534be818ecf950d9a9dab8f8a1797209d2dfc7d 100644
+index c292c4d24bfde1484769698ee2a7ef59a6fcc52c..101af640d2a990d4f4f99ad2c0bb08264d921ea0 100644
 --- a/ipaserver/install/server/install.py
 +++ b/ipaserver/install/server/install.py
-@@ -366,7 +366,7 @@ def install_check(installer):
+@@ -386,7 +386,7 @@ def install_check(installer):
  
      print("======================================="
            "=======================================")
--    print "This program will set up the FreeIPA Server."
-+    print "This program will set up the IPA Server."
-     print ""
-     print "This includes:"
+-    print("This program will set up the FreeIPA Server.")
++    print("This program will set up the IPA Server.")
+     print("")
+     print("This includes:")
      if setup_ca:
 diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
-index b000e8ce84df3cb2a6bc90520cb4713ab416f4da..3c13a3e743074e01ca952e114c2374205bdd68f8 100644
+index 7695adf0d537237b24660e8871011f04f242e744..582df08094335554edffaed21bcaf4ab5a74e899 100644
 --- a/ipaserver/install/server/replicainstall.py
 +++ b/ipaserver/install/server/replicainstall.py
-@@ -467,7 +467,7 @@ def install_check(installer):
+@@ -673,7 +673,7 @@ def install_check(installer):
          above_upper_bound = current > constants.MAX_DOMAIN_LEVEL
  
          if under_lower_bound or above_upper_bound:
@@ -749,5 +749,5 @@
                         "this domain. The Domain Level needs to be "
                         "raised before installing a replica with "
 -- 
-2.5.0
+2.9.3
 

--
Gitblit v1.8.0