140 lines
3.9 KiB
Diff
140 lines
3.9 KiB
Diff
From 25db869956b0f8edaa3a688a4b3dc92c2d9832f5 Mon Sep 17 00:00:00 2001
|
|
From: Simon Pichugin <spichugi@redhat.com>
|
|
Date: Thu, 12 Dec 2024 19:58:37 -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 e571600f35..39b7b80aec 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 f31e5bb3f8..b3676faaa7 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 d66f2cfb1f..10fe910dc3 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 032e4e1479..d33b092308 100644
|
|
--- a/clients/tools/ldapmodify.c
|
|
+++ b/clients/tools/ldapmodify.c
|
|
@@ -127,7 +127,7 @@ usage( void )
|
|
|
|
|
|
const char options[] = "aE:rS:"
|
|
- "cd:D:e:f:H:Ij:MnNO:o:P:QR:U:vVw:WxX:y:Y:Z";
|
|
+ "cd:D:e:f:h:H:Ij:MnNO: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 1197d3813f..6ea8b66380 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 cd0650e914..e34d897c7b 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 3755a937d2..ab9308f593 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 e359611882..a59595b56e 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 be1f81300a..ac6197b061 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.47.1
|
|
|