From 2c6c09eaeef9a94371c555e46f2d0a25e66c7d4e Mon Sep 17 00:00:00 2001 From: SATOH Fumiyasu Date: Mon, 30 Jan 2012 13:26:20 +0900 Subject: [PATCH 1/2] Add -o option to ldap*.1 man pages --- doc/man/man1/ldapcompare.1 | 12 ++++++++++++ doc/man/man1/ldapdelete.1 | 12 ++++++++++++ doc/man/man1/ldapexop.1 | 12 ++++++++++++ doc/man/man1/ldapmodify.1 | 12 ++++++++++++ doc/man/man1/ldapmodrdn.1 | 12 ++++++++++++ doc/man/man1/ldappasswd.1 | 12 ++++++++++++ doc/man/man1/ldapsearch.1 | 12 ++++++++++++ doc/man/man1/ldapwhoami.1 | 12 ++++++++++++ 8 files changed, 96 insertions(+), 0 deletions(-) diff --git a/doc/man/man1/ldapcompare.1 b/doc/man/man1/ldapcompare.1 index 3e5b2ae..9d4e910 100644 --- a/doc/man/man1/ldapcompare.1 +++ b/doc/man/man1/ldapcompare.1 @@ -37,6 +37,8 @@ ldapcompare \- LDAP compare tool [\c .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-O \ security-properties\fR] [\c .BR \-I ] @@ -174,6 +176,16 @@ Compare extensions: !dontUseCopy .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .BI \-O \ security-properties Specify SASL security properties. .TP diff --git a/doc/man/man1/ldapdelete.1 b/doc/man/man1/ldapdelete.1 index a68a98e..cd0d312 100644 --- a/doc/man/man1/ldapdelete.1 +++ b/doc/man/man1/ldapdelete.1 @@ -37,6 +37,8 @@ ldapdelete \- LDAP delete entry tool [\c .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-p \ ldapport\fR] [\c .BI \-O \ security-properties\fR] @@ -169,6 +171,16 @@ Delete extensions: (none) .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .B \-r Do a recursive delete. If the DN specified isn't a leaf, its children, and all their children are deleted down the tree. No diff --git a/doc/man/man1/ldapexop.1 b/doc/man/man1/ldapexop.1 index f144013..7f808c9 100644 --- a/doc/man/man1/ldapexop.1 +++ b/doc/man/man1/ldapexop.1 @@ -26,6 +26,8 @@ ldapexop [\c .BR \-e \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-f \ file\fR] [\c .BI \-h \ host\fR] @@ -146,6 +148,16 @@ Specify general extensions. \'!\' indicates criticality. not really controls) .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .BI \-f \ file Read operations from \fIfile\fP. .TP diff --git a/doc/man/man1/ldapmodify.1 b/doc/man/man1/ldapmodify.1 index 0dcb246..9b0148d 100644 --- a/doc/man/man1/ldapmodify.1 +++ b/doc/man/man1/ldapmodify.1 @@ -41,6 +41,8 @@ ldapmodify, ldapadd \- LDAP modify entry and LDAP add entry tools [\c .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-O \ security-properties\fR] [\c .BR \-I ] @@ -236,6 +238,16 @@ Modify extensions: [!]txn[=abort|commit] .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .B \-I Enable SASL Interactive mode. Always prompt. Default is to prompt only as needed. diff --git a/doc/man/man1/ldapmodrdn.1 b/doc/man/man1/ldapmodrdn.1 index 7cd6f24..b41152b 100644 --- a/doc/man/man1/ldapmodrdn.1 +++ b/doc/man/man1/ldapmodrdn.1 @@ -41,6 +41,8 @@ ldapmodrdn \- LDAP rename entry tool [\c .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-O \ security-properties\fR] [\c .BR \-I ] @@ -178,6 +180,16 @@ Modrdn extensions: (none) .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .B \-I Enable SASL Interactive mode. Always prompt. Default is to prompt only as needed. diff --git a/doc/man/man1/ldappasswd.1 b/doc/man/man1/ldappasswd.1 index 3815fdd..566fa17 100644 --- a/doc/man/man1/ldappasswd.1 +++ b/doc/man/man1/ldappasswd.1 @@ -25,6 +25,8 @@ ldappasswd \- change the password of an LDAP entry [\c .BI \-p \ ldapport\fR] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BR \-S ] [\c .BI \-s \ newPasswd\fR] @@ -114,6 +116,16 @@ Deprecated in favor of \fB\-H\fP. Specify an alternate TCP port where the ldap server is listening. Deprecated in favor of \fB\-H\fP. .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .B \-n Do not set password. (Can be useful when used in conjunction with \fB\-v\fP or \fB\-d\fP) diff --git a/doc/man/man1/ldapsearch.1 b/doc/man/man1/ldapsearch.1 index fe5a42b..9dae16b 100644 --- a/doc/man/man1/ldapsearch.1 +++ b/doc/man/man1/ldapsearch.1 @@ -61,6 +61,8 @@ ldapsearch \- LDAP search tool [\c .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-l \ timelimit\fR] [\c .BI \-z \ sizelimit\fR] @@ -293,6 +295,16 @@ Search extensions: [!][=] .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .BI \-l \ timelimit wait at most \fItimelimit\fP seconds for a search to complete. A timelimit of diff --git a/doc/man/man1/ldapwhoami.1 b/doc/man/man1/ldapwhoami.1 index 9b9ea5b..bb2563d 100644 --- a/doc/man/man1/ldapwhoami.1 +++ b/doc/man/man1/ldapwhoami.1 @@ -33,6 +33,8 @@ ldapwhoami \- LDAP who am i? tool [\c .BR \-E \ [ ! ] \fIext\fP [ =\fIextparam\fP ]] [\c +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ]] +[\c .BI \-O \ security-properties\fR] [\c .BR \-I ] @@ -136,6 +138,16 @@ WhoAmI extensions: (none) .fi .TP +.BR \-o \ \fIopt\fP [ =\fIoptparam\fP ] + +Specify general options. + +General options: +.nf + nettimeout= (in seconds, or "none" or "max") + ldif-wrap= (in columns, or "no" for no wrapping) +.fi +.TP .B \-I Enable SASL Interactive mode. Always prompt. Default is to prompt only as needed. -- 1.7.8.3 From 6d43e244ae2cd773f35a00078bf8bc6671a63e1c Mon Sep 17 00:00:00 2001 From: SATOH Fumiyasu Date: Mon, 30 Jan 2012 13:27:14 +0900 Subject: [PATCH 2/2] Add missing '>' in tools help message --- clients/tools/common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/clients/tools/common.c b/clients/tools/common.c index 0b7e6bc..5624945 100644 --- a/clients/tools/common.c +++ b/clients/tools/common.c @@ -374,7 +374,7 @@ N_(" -I use SASL Interactive mode\n"), N_(" -n show what would be done but don't actually do it\n"), N_(" -N do not use reverse DNS to canonicalize SASL host name\n"), N_(" -O props SASL security properties\n"), -N_(" -o [=[=] general options\n"), N_(" nettimeout= (in seconds, or \"none\" or \"max\")\n"), N_(" ldif-wrap= (in columns, or \"no\" for no wrapping)\n"), N_(" -p port port on LDAP server\n"), -- 1.7.8.3