23306240 Need additional links from /usr/bin/ldap* to /usr/bin/openldap* for OpenLDAP
--- a/components/openldap/openldap-client.p5m Wed May 18 13:41:53 2016 -0700
+++ b/components/openldap/openldap-client.p5m Wed May 18 14:54:17 2016 -0700
@@ -47,10 +47,15 @@
overlay=allow preserve=true
file path=etc/openldap/ldap.conf.default
link path=usr/bin/ldapadd target=openldapmodify
+link path=usr/bin/ldapcompare target=openldapcompare
link path=usr/bin/ldapdelete target=openldapdelete
+link path=usr/bin/ldapexop target=openldapexop
link path=usr/bin/ldapmodify target=openldapmodify
link path=usr/bin/ldapmodrdn target=openldapmodrdn
+link path=usr/bin/ldappasswd target=openldappasswd
link path=usr/bin/ldapsearch target=openldapsearch
+link path=usr/bin/ldapurl target=openldapurl
+link path=usr/bin/ldapwhoami target=openldapwhoami
link path=usr/bin/openldapadd target=openldapmodify
# The bypasses (and manual dependency on libsasl at the end of the file)
# are required for building with the cyrus-sasl proto area because of
@@ -126,10 +131,16 @@
link path=usr/lib/openldap/bin/ldapurl target=../../../bin/openldapurl
link path=usr/lib/openldap/bin/ldapwhoami target=../../../bin/openldapwhoami
link path=usr/share/man/man1/ldapadd.1 target=../man1oldap/ldapadd.1oldap
+link path=usr/share/man/man1/ldapcompare.1 \
+ target=../man1oldap/ldapcompare.1oldap
link path=usr/share/man/man1/ldapdelete.1 target=../man1oldap/ldapdelete.1oldap
+link path=usr/share/man/man1/ldapexop.1 target=../man1oldap/ldapexop.1oldap
link path=usr/share/man/man1/ldapmodify.1 target=../man1oldap/ldapmodify.1oldap
link path=usr/share/man/man1/ldapmodrdn.1 target=../man1oldap/ldapmodrdn.1oldap
+link path=usr/share/man/man1/ldappasswd.1 target=../man1oldap/ldappasswd.1oldap
link path=usr/share/man/man1/ldapsearch.1 target=../man1oldap/ldapsearch.1oldap
+link path=usr/share/man/man1/ldapurl.1 target=../man1oldap/ldapurl.1oldap
+link path=usr/share/man/man1/ldapwhoami.1 target=../man1oldap/ldapwhoami.1oldap
link path=usr/share/man/man1/openldapadd.1 target=../man1oldap/ldapadd.1oldap
link path=usr/share/man/man1/openldapcompare.1 \
target=../man1oldap/ldapcompare.1oldap
--- a/components/openldap/patches/05-man-page.patch Wed May 18 13:41:53 2016 -0700
+++ b/components/openldap/patches/05-man-page.patch Wed May 18 14:54:17 2016 -0700
@@ -5,11 +5,13 @@
--- openldap-2.4.44/doc/man/man1/ldapcompare.1.old Mon Nov 30 09:02:00 2015
+++ openldap-2.4.44/doc/man/man1/ldapcompare.1 Tue Dec 1 15:28:25 2015
-@@ -3,7 +3,9 @@
+@@ -3,7 +3,11 @@
.\" Copyright 1998-2016 The OpenLDAP Foundation All Rights Reserved.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.SH NAME
-ldapcompare \- LDAP compare tool
++/usr/bin/ldapcompare \- LDAP compare tool
++.br
+/usr/bin/openldapcompare \- LDAP compare tool
+.br
+/usr/lib/openldap/bin/ldapcompare \- LDAP compare tool
@@ -35,11 +37,13 @@
--- openldap-2.4.44/doc/man/man1/ldapexop.1.old Mon Nov 30 09:02:00 2015
+++ openldap-2.4.44/doc/man/man1/ldapexop.1 Tue Dec 1 15:28:25 2015
-@@ -15,7 +15,9 @@
+@@ -15,7 +15,11 @@
.TH LDAPEXOP 1
.SH NAME
-ldapexop \- issue LDAP extended operations
++/usr/bin/ldapexop \- issue LDAP extended operations
++.br
+/usr/bin/openldapexop \- issue LDAP extended operations
+.br
+/usr/lib/openldap/bin/ldapexop \- issue LDAP extended operations
@@ -81,11 +85,13 @@
--- openldap-2.4.44/doc/man/man1/ldappasswd.1.old Mon Nov 30 09:02:00 2015
+++ openldap-2.4.44/doc/man/man1/ldappasswd.1 Tue Dec 1 15:28:25 2015
-@@ -3,7 +3,9 @@
+@@ -3,7 +3,11 @@
.\" Copyright 1998-2016 The OpenLDAP Foundation All Rights Reserved.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.SH NAME
-ldappasswd \- change the password of an LDAP entry
++/usr/bin/ldappasswd \- change the password of an LDAP entry
++.br
+/usr/bin/openldappasswd \- change the password of an LDAP entry
+.br
+/usr/lib/openldap/bin/ldappasswd \- change the password of an LDAP entry
@@ -111,11 +117,13 @@
--- openldap-2.4.44/doc/man/man1/ldapurl.1.old Mon Nov 30 09:02:00 2015
+++ openldap-2.4.44/doc/man/man1/ldapurl.1 Tue Dec 1 15:28:25 2015
-@@ -3,7 +3,9 @@
+@@ -3,7 +3,11 @@
.\" Copyright 2008-2016 The OpenLDAP Foundation All Rights Reserved.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.SH NAME
-ldapurl \- LDAP URL formatting tool
++/usr/bin/ldapurl \- LDAP URL formatting tool
++.br
+/usr/bin/openldapurl \- LDAP URL formatting tool
+.br
+/usr/lib/openldap/bin/ldapurl \- LDAP URL formatting tool
@@ -125,11 +133,13 @@
--- openldap-2.4.44/doc/man/man1/ldapwhoami.1.old Mon Nov 30 09:02:00 2015
+++ openldap-2.4.44/doc/man/man1/ldapwhoami.1 Tue Dec 1 15:28:25 2015
-@@ -3,7 +3,9 @@
+@@ -3,7 +3,11 @@
.\" Copyright 1998-2016 The OpenLDAP Foundation All Rights Reserved.
.\" Copying restrictions apply. See COPYRIGHT/LICENSE.
.SH NAME
-ldapwhoami \- LDAP who am i? tool
++/usr/bin/ldapwhoami \- LDAP who am i? tool
++.br
+/usr/bin/openldapwhoami \- LDAP who am i? tool
+.br
+/usr/lib/openldap/bin/ldapwhoami \- LDAP who am i? tool