ITS#9917 Remove 'h' and 'p' from options[] in client tools

The options -h and -p got removed from client tools in commit
66af4cfd5d3c559fcdf6d722b02fa66416b95f01. However, they were still
present in the options[] array in several client tools source files. So,
if one of those tools got executed with -h or -p followed by a value,
this lead to the error "unrecognized option -", without mentioning
which option was problematic. Removing 'h' and 'p' from options[] fixes
this.

diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
index a83c8d4ac8d5b4e2ce76993bd3cd34730bc2d645..63c30408f0f9bbaafbdc18ef362f660bb2a1ca77 100644 (file)
--- 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:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+       "Cd:D:e:H:IMnNO:o: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 dbc85b03555a89de38850e95e6cfad432a9602ba..6024a332930dc4e41a9a3d9b37e5612d4a41a4e2 100644 (file)
--- 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:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:z:Z";
+       "cd:D:e:f:H:IMnNO:o: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 bd6e0297912dc8e5c9858115ca3b21a6c08046ec..bfe6e4eac2c41a0b613fa0cbcb35229164224a2e 100644 (file)
--- a/clients/tools/ldapexop.c
+++ b/clients/tools/ldapexop.c
@@ -52,7 +52,7 @@ usage( void )
 
 
 const char options[] = ""
-       "d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+       "d:D:e:H:InNO:o: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 c94c11a3af6a860f44bf008fd52fdf69d25989f2..33b723bda0534c033a20266c54fb77889ff095b6 100644 (file)
--- 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:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+       "cd:D:e:f:H:IMnNO:o: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 d5cf43f7a28ce4324b281a7c5c9029dc9f343024..40a482f5d545d750bfc46c2665827c6c80f73c38 100644 (file)
--- 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:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+       "cd:D:e:f:H:IMnNO:o: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 77ef30539eb7ad66319ef3ea865905ab714c287b..2cf14d104e57075fae2a2551e9922aa5261fb2a4 100644 (file)
--- a/clients/tools/ldappasswd.c
+++ b/clients/tools/ldappasswd.c
@@ -81,7 +81,7 @@ usage( void )
 
 
 const char options[] = "a:As:St:T:"
-       "d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+       "d:D:e:H:InNO:o: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 48793314b4504e5ab27265d902f6eb939d816992..69e172c6cddecbbfa094f8feca55241fd83cf140 100644 (file)
--- 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:H:IMnNO:o:p:P:QR:U:vVw:WxX:y:Y:Z";
+       "Cd:D:e:f:H:IMnNO:o: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 84656184794d5a305a4c0f173a647bbb19553e78..4f35025ec182caaae94af34d07f9547009f9cf91 100644 (file)
--- a/clients/tools/ldapvc.c
+++ b/clients/tools/ldapvc.c
@@ -86,7 +86,7 @@ usage( void )
 
 
 const char options[] = "abE:"
-       "d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+       "d:D:e:H:InNO:o: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 45d32f5d9967cfff647bf763358115a7c215e36d..e8ac4b34bc12db46822640e1cb9a9d61950e8b69 100644 (file)
--- a/clients/tools/ldapwhoami.c
+++ b/clients/tools/ldapwhoami.c
@@ -62,7 +62,7 @@ usage( void )
 
 
 const char options[] = ""
-       "d:D:e:h:H:InNO:o:p:QR:U:vVw:WxX:y:Y:Z";
+       "d:D:e:H:InNO:o:QR:U:vVw:WxX:y:Y:Z";
 
 int
 handle_private_option( int i )