[openldap] fix update: missing options in manual pages of client tools
jvcelak
jvcelak at fedoraproject.org
Thu Feb 23 14:05:33 UTC 2012
commit 412132a293fd66e41cd5111cb398f19a6f334d4b
Author: Jan Vcelak <jvcelak at redhat.com>
Date: Thu Feb 23 15:04:46 2012 +0100
fix update: missing options in manual pages of client tools
Upstream considers '-C' as an obsolete and intentionally undocumented
option.
Resolves: #796232
openldap-man-clients-missing-options.patch | 65 ----------------------------
1 files changed, 0 insertions(+), 65 deletions(-)
---
diff --git a/openldap-man-clients-missing-options.patch b/openldap-man-clients-missing-options.patch
index 1a71b1a..06c5056 100644
--- a/openldap-man-clients-missing-options.patch
+++ b/openldap-man-clients-missing-options.patch
@@ -2,12 +2,9 @@ man: add missing options to the client tools
Summary of changes:
- typo in '-o' in --help output
- - missing '-C' in ldapsearch and ldapcompare
- manpages all tools:
+ add -o description (general options)
+ add -N description (reverse DNS SASL host name canonicalization)
- - manpages ldapsearch, ldapcompare:
- + add -C (perform referral chasing)
Author: Jan Vcelak <jvcelak at redhat.com>
Upstream ITS: #7177
@@ -26,43 +23,10 @@ index 0eacbbb..63e246c 100644
N_(" nettimeout=<timeout> (in seconds, or \"none\" or \"max\")\n"),
N_(" ldif-wrap=<width> (in columns, or \"no\" for no wrapping)\n"),
N_(" -p port port on LDAP server\n"),
-diff --git a/clients/tools/ldapcompare.c b/clients/tools/ldapcompare.c
-index 831f116..9808fb2 100644
---- a/clients/tools/ldapcompare.c
-+++ b/clients/tools/ldapcompare.c
-@@ -83,6 +83,7 @@ usage( void )
- fprintf( stderr, _(" b64value\tbase64 encoding of assertion value\n"));
-
- fprintf( stderr, _("Compare options:\n"));
-+ fprintf( stderr, _(" -C enable referrals chasing\n"));
- fprintf( stderr, _(" -E [!]<ext>[=<extparam>] compare extensions (! indicates criticality)\n"));
- fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n"));
- fprintf( stderr, _(" -M enable Manage DSA IT control (-MM to make critical)\n"));
-diff --git a/clients/tools/ldapsearch.c b/clients/tools/ldapsearch.c
-index 8aaccd4..eabfd52 100644
---- a/clients/tools/ldapsearch.c
-+++ b/clients/tools/ldapsearch.c
-@@ -124,6 +124,7 @@ usage( void )
- fprintf( stderr, _(" -A retrieve attribute names only (no values)\n"));
- fprintf( stderr, _(" -b basedn base dn for search\n"));
- fprintf( stderr, _(" -c continuous operation mode (do not stop on errors)\n"));
-+ fprintf( stderr, _(" -C enable referrals chasing\n"));
- fprintf( stderr, _(" -E [!]<ext>[=<extparam>] search extensions (! indicates criticality)\n"));
- fprintf( stderr, _(" [!]domainScope (domain scope)\n"));
- fprintf( stderr, _(" !dontUseCopy (Don't Use Copy)\n"));
diff --git a/doc/man/man1/ldapcompare.1 b/doc/man/man1/ldapcompare.1
index a732522..dba49fd 100644
--- a/doc/man/man1/ldapcompare.1
+++ b/doc/man/man1/ldapcompare.1
-@@ -9,6 +9,8 @@ ldapcompare \- LDAP compare tool
- [\c
- .BR \-n ]
- [\c
-+.BR \-C ]
-+[\c
- .BR \-v ]
- [\c
- .BR \-z ]
@@ -37,12 +39,18 @@ ldapcompare \- LDAP compare tool
[\c
.BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]]
@@ -82,16 +46,6 @@ index a732522..dba49fd 100644
.BI \-U \ authcid\fR]
[\c
.BI \-R \ realm\fR]
-@@ -81,6 +89,9 @@ TRUE, FALSE, or UNDEFINED on standard output.
- Show what would be done, but don't actually perform the compare. Useful for
- debugging in conjunction with \fB\-v\fP.
- .TP
-+.B \-C
-+Enable referrals chasing.
-+.TP
- .B \-v
- Run in verbose mode, with many diagnostics written to standard output.
- .TP
@@ -174,6 +185,30 @@ Search extensions:
rp[/<cookie>][/<slimit>] (LDAP Sync refreshAndPersist)
.fi
@@ -491,15 +445,6 @@ diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1
index 1b147e6..9243e3e 100644
--- a/doc/man/man1/ldapsearch.1
+++ b/doc/man/man1/ldapsearch.1
-@@ -11,6 +11,8 @@ ldapsearch \- LDAP search tool
- [\c
- .BR \-c ]
- [\c
-+.BR \-C ]
-+[\c
- .BR \-u ]
- [\c
- .BR \-v ]
@@ -65,12 +67,18 @@ ldapsearch \- LDAP search tool
[\c
.BI \-z \ sizelimit\fR]
@@ -519,16 +464,6 @@ index 1b147e6..9243e3e 100644
.BI \-U \ authcid\fR]
[\c
.BI \-R \ realm\fR]
-@@ -116,6 +124,9 @@ Continuous operation mode. Errors are reported, but ldapsearch will continue
- with searches. The default is to exit after reporting an error. Only useful
- in conjunction with \fB\-f\fP.
- .TP
-+.B \-C
-+Enable referrals chasing.
-+.TP
- .B \-u
- Include the User Friendly Name form of the Distinguished Name (DN)
- in the output.
@@ -310,6 +321,30 @@ means the maximum integer allowable by the protocol.
A server may impose a maximal sizelimit which only
the root user may override.
More information about the scm-commits
mailing list