Bring back removed '-h' and '-p' client tools parameters

Resolves: RHEl-11306

.gitignore

@@ -29,3 +29,4 @@
 /openldap-2.6.2.tgz
 /openldap-ppolicy-check-password-1.1.tar.gz
 /openldap-2.6.3.tgz
+/openldap-2.6.6.tgz

.openldap.metadata

@@ -0,0 +1,2 @@
+d9f2c30aa3ec5760d4eb5923f461ca8eed92703d openldap-ppolicy-check-password-1.1.tar.gz
+633bc0ce9b5d91852c1fe38c720763f32d18390f openldap-2.6.6.tgz

openldap-Revert-ITS-9917-Remove--h-and-p-from-options.patch

@@ -0,0 +1,139 @@
+From aa5c93049d48b7fd1ff98661a00e4e12d7d47324 Mon Sep 17 00:00:00 2001
+From: Simon Pichugin <spichugi@redhat.com>
+Date: Wed, 13 Dec 2023 11:03:20 -0800
+Subject: [PATCH] Revert "ITS#9917 Remove 'h' and 'p' from options[] in client
+ tools"
+
+This reverts commit a8f7fd00043e2c63b6216aeb3ba69b0d0485311b.
+---
+ clients/tools/ldapcompare.c | 2 +-
+ clients/tools/ldapdelete.c  | 2 +-
+ clients/tools/ldapexop.c    | 2 +-
+ clients/tools/ldapmodify.c  | 2 +-
+ clients/tools/ldapmodrdn.c  | 2 +-
+ clients/tools/ldappasswd.c  | 2 +-
+ clients/tools/ldapsearch.c  | 2 +-
+ clients/tools/ldapvc.c      | 2 +-
+ clients/tools/ldapwhoami.c  | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
+index 63c30408f..a83c8d4ac 100644
+--- a/clients/tools/ldapcompare.c
++++ b/clients/tools/ldapcompare.c
+@@ -104,7 +104,7 @@ static int docompare LDAP_P((
+ 
+ 
+ const char options[] = "z"
+-	"Cd:D:e:H:IMnNO:o:P:QR:U:vVw:WxX:y:Y:Z";
++	"Cd:D:e:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+ 
+ #ifdef LDAP_CONTROL_DONTUSECOPY
+ int dontUseCopy = 0;
+diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
+index a66900d48..53f6e0278 100644
+--- a/clients/tools/ldapdelete.c
++++ b/clients/tools/ldapdelete.c
+@@ -82,7 +82,7 @@ usage( void )
+ 
+ 
+ const char options[] = "r"
+-	"cd:D:e:f:H:IMnNO:o:P:QR:U:vVw:WxX:y:Y:z:Z";
++	"cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:z:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldapexop.c b/clients/tools/ldapexop.c
+index bfe6e4eac..bd6e02979 100644
+--- a/clients/tools/ldapexop.c
++++ b/clients/tools/ldapexop.c
+@@ -52,7 +52,7 @@ usage( void )
+ 
+ 
+ const char options[] = ""
+-	"d:D:e:H:InNO:o:QR:U:vVw:WxX:y:Y:Z";
++	"d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
+index 33b723bda..c94c11a3a 100644
+--- a/clients/tools/ldapmodify.c
++++ b/clients/tools/ldapmodify.c
+@@ -125,7 +125,7 @@ usage( void )
+ 
+ 
+ const char options[] = "aE:rS:"
+-	"cd:D:e:f:H:IMnNO:o:P:QR:U:vVw:WxX:y:Y:Z";
++	"cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
+index 40a482f5d..d5cf43f7a 100644
+--- a/clients/tools/ldapmodrdn.c
++++ b/clients/tools/ldapmodrdn.c
+@@ -95,7 +95,7 @@ usage( void )
+ 
+ 
+ const char options[] = "rs:"
+-	"cd:D:e:f:H:IMnNO:o:P:QR:U:vVw:WxX:y:Y:Z";
++	"cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldappasswd.c b/clients/tools/ldappasswd.c
+index 9a48aabf3..1958a30f6 100644
+--- a/clients/tools/ldappasswd.c
++++ b/clients/tools/ldappasswd.c
+@@ -83,7 +83,7 @@ usage( void )
+ 
+ 
+ const char options[] = "Ea:As:St:T:"
+-	"d:D:e:H:InNO:o:QR:U:vVw:WxX:y:Y:Z";
++	"d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
+index 69e172c6c..48793314b 100644
+--- a/clients/tools/ldapsearch.c
++++ b/clients/tools/ldapsearch.c
+@@ -363,7 +363,7 @@ parse_vlv(char *cvalue)
+ }
+ 
+ const char options[] = "a:Ab:cE:F:l:Ls:S:tT:uz:"
+-	"Cd:D:e:f:H:IMnNO:o:P:QR:U:vVw:WxX:y:Y:Z";
++	"Cd:D:e:f:h:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldapvc.c b/clients/tools/ldapvc.c
+index 4f35025ec..846561847 100644
+--- a/clients/tools/ldapvc.c
++++ b/clients/tools/ldapvc.c
+@@ -86,7 +86,7 @@ usage( void )
+ 
+ 
+ const char options[] = "abE:"
+-	"d:D:e:H:InNO:o:QR:U:vVw:WxX:y:Y:Z";
++	"d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+diff --git a/clients/tools/ldapwhoami.c b/clients/tools/ldapwhoami.c
+index e8ac4b34b..45d32f5d9 100644
+--- a/clients/tools/ldapwhoami.c
++++ b/clients/tools/ldapwhoami.c
+@@ -62,7 +62,7 @@ usage( void )
+ 
+ 
+ const char options[] = ""
+-	"d:D:e:H:InNO:o:QR:U:vVw:WxX:y:Y:Z";
++	"d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+ 
+ int
+ handle_private_option( int i )
+-- 
+2.43.0
+

openldap.spec

@@ -15,8 +15,8 @@
 %global __brp_remove_la_files %nil
 
 Name: openldap
-Version: 2.6.3
-Release: 1%{?dist}
+Version: 2.6.6
+Release: 2%{?dist}
 Summary: LDAP support libraries
 License: OpenLDAP
 URL: http://www.openldap.org/
@@ -49,6 +49,7 @@ Patch6: openldap-switch-to-lt_dlopenadvise-to-get-RTLD_GLOBAL-set.patch
 Patch7: openldap-openssl-manpage-defaultCA.patch
 Patch8: openldap-add-export-symbols-LDAP_CONNECTIONLESS.patch
 Patch9: openldap-Revert-ITS-8618-Remove-deprecated-h-and-p.patch
+Patch10: openldap-Revert-ITS-9917-Remove--h-and-p-from-options.patch
 
 # check-password module specific patches
 Patch90: check-password-makefile.patch
@@ -162,6 +163,7 @@ pushd openldap-%{version}
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 # build smbk5pwd with other overlays
 ln -s ../../../contrib/slapd-modules/smbk5pwd/smbk5pwd.c servers/slapd/overlays
@@ -541,6 +543,16 @@ exit 0
 %{_libdir}/libslapi-2.4*.so.*
 
 %changelog
+* Thu Dec 14 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.6-2
+- The client tools parameters '-h' and '-p' are still deprecated,
+  but this release brings back the client tools options that
+  were removed during the previous rebase.
+  Resolves: RHEL-19384
+
+* Wed Oct 11 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.6-1
+- Rebase OpenLDAP in RHEL 9.4
+  Resolves: RHEL-11306
+
 * Wed Jun 14 2023 Simon Pichugin <spichugi@redhat.com> - 2.6.3-1
 - Rebase OpenLDAP to 2.6.3
   Related: rhbz#2212983

sources

@@ -1,2 +1,2 @@
 SHA512 (openldap-ppolicy-check-password-1.1.tar.gz) = a92854d7438cb95fac361da80a49d084d502155e8ce0ad2ea679db9529bbe0182aa4354e6139793c775e496349375d8f017678941d23315ff1c20fefc9573cdc
-SHA512 (openldap-2.6.3.tgz) = 56efbbfc68779ad635d2c25228eb9c4f1553b107b96e8a438029b1c5d2f2647cf4d437770554392b436718ea44a4813e17f5195049f67fc09d063a981096cd85
+SHA512 (openldap-2.6.6.tgz) = 0e800807b23f090b465dc18c2f0d342585f96768543b3298b85d17c18272d1c5576a66326d30b3520cac493cbd2ea70e309cd923bf19447c973a63d940619fa6