From 6bfbdfe814936bfee31a94d9c3dd9af6b07b6bea Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Wed, 1 Mar 2017 11:41:33 -0500 Subject: [PATCH] Issue 49044 - Fix script usage and man pages Bug Description: All the perl scripts say that "-v" displays verbose output. This is not an actual option though. Some of the shell script say "-v" if also for verbose output, when in fact it is just for displaying the server version. The man pages for the shell scripts do not advertise the version output option "-v". Fix Description: Fix the usage and man pages for all the scripts. https://pagure.io/389-ds-base/issue/49044 Reviewed by: ? --- ldap/admin/src/scripts/bak2db.pl.in | 19 ++++++------------- ldap/admin/src/scripts/cleanallruv.pl.in | 10 +--------- ldap/admin/src/scripts/db2bak.pl.in | 17 +++++------------ ldap/admin/src/scripts/db2index.pl.in | 11 ++--------- ldap/admin/src/scripts/db2ldif.pl.in | 9 +-------- ldap/admin/src/scripts/fixup-linkedattrs.pl.in | 12 ++---------- ldap/admin/src/scripts/fixup-memberof.pl.in | 6 +----- ldap/admin/src/scripts/ldif2db.in | 2 +- ldap/admin/src/scripts/ldif2db.pl.in | 11 ++--------- ldap/admin/src/scripts/schema-reload.pl.in | 12 ++---------- ldap/admin/src/scripts/syntax-validate.pl.in | 12 ++---------- ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in | 12 ++---------- man/man8/bak2db.8 | 6 +++++- man/man8/bak2db.pl.8 | 6 +----- man/man8/cleanallruv.pl.8 | 6 +----- man/man8/db2bak.8 | 6 +++++- man/man8/db2bak.pl.8 | 6 +----- man/man8/db2index.8 | 6 +++++- man/man8/db2index.pl.8 | 6 +----- man/man8/db2ldif.8 | 6 +++++- man/man8/db2ldif.pl.8 | 6 +----- man/man8/fixup-linkedattrs.pl.8 | 6 +----- man/man8/fixup-memberof.pl.8 | 6 +----- man/man8/ldif2db.8 | 8 ++++++-- man/man8/ldif2db.pl.8 | 6 +----- man/man8/schema-reload.pl.8 | 6 +----- man/man8/syntax-validate.pl.8 | 6 +----- man/man8/usn-tombstone-cleanup.pl.8 | 6 +----- 28 files changed, 64 insertions(+), 167 deletions(-) diff --git a/ldap/admin/src/scripts/bak2db.pl.in b/ldap/admin/src/scripts/bak2db.pl.in index 28f1c98..bba8b93 100644 --- a/ldap/admin/src/scripts/bak2db.pl.in +++ b/ldap/admin/src/scripts/bak2db.pl.in @@ -25,7 +25,7 @@ $i = 0; sub usage { print(STDERR "Usage: bak2db.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename } -a dirname [-t dbtype]\n"); - print(STDERR " [-n backendname] [-P protocol] [-v] [-h]\n"); + print(STDERR " [-n backendname] [-P protocol] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); print(STDERR " -w password - Directory Manager's password\n"); @@ -36,22 +36,21 @@ sub usage { print(STDERR " -t dbtype - Database type (default: ldbm database)\n"); print(STDERR " -n backend - Backend database name. Example: userRoot\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } while ($i <= $#ARGV) { if ("$ARGV[$i]" eq "-a") { # backup directory $i++; $archivedir = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-D") { # Directory Manager + } elsif ("$ARGV[$i]" eq "-D") { # Directory Manager $i++; $rootdn = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-w") { # Directory Manager's password + } elsif ("$ARGV[$i]" eq "-w") { # Directory Manager's password $i++; $passwd = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-j") { # Read Directory Manager's password from a file $i++; $passwdfile = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-t") { # database type + } elsif ("$ARGV[$i]" eq "-t") { # database type $i++; $dbtype = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-n") { # backend instance name + } elsif ("$ARGV[$i]" eq "-n") { # backend instance name $i++; $instance = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-Z") { # server instance name $i++; $servid = $ARGV[$i]; @@ -59,8 +58,6 @@ while ($i <= $#ARGV) { $i++; $protocol = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-h") { # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v") { # verbose - $verbose = 1; } else { print "ERROR - Unknown option: $ARGV[$i]\n"; &usage; exit(1); @@ -75,11 +72,7 @@ while ($i <= $#ARGV) { %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if ($archivedir eq ""){ &usage; exit(1); diff --git a/ldap/admin/src/scripts/cleanallruv.pl.in b/ldap/admin/src/scripts/cleanallruv.pl.in index f6e5477..8129625 100644 --- a/ldap/admin/src/scripts/cleanallruv.pl.in +++ b/ldap/admin/src/scripts/cleanallruv.pl.in @@ -34,7 +34,6 @@ sub usage { print(STDERR " -r rid - The replica id that you want to clean\n"); print(STDERR " -A - Abort an existing cleanallruv task(must use with -b and -r args\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -64,9 +63,6 @@ while ($i <= $#ARGV) } elsif ("$ARGV[$i]" eq "-P"){ # protocol preference $i++; $protocol = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-v"){ - # verbose - $verbose = 1; } elsif ("$ARGV[$i]" eq "-h"){ # help &usage; exit(0); @@ -84,11 +80,7 @@ while ($i <= $#ARGV) %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if ($basedn eq "" || $rid eq ""){ &usage; exit(1); diff --git a/ldap/admin/src/scripts/db2bak.pl.in b/ldap/admin/src/scripts/db2bak.pl.in index 2e95383..c73caa1 100644 --- a/ldap/admin/src/scripts/db2bak.pl.in +++ b/ldap/admin/src/scripts/db2bak.pl.in @@ -37,7 +37,6 @@ sub usage { print(STDERR " -a backupdir - Backup directory\n"); print(STDERR " -t dbtype - Database type (default: ldbm database)\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -45,16 +44,16 @@ $nestit = 0; while ($i <= $#ARGV) { if ("$ARGV[$i]" eq "-a") { # backup directory $i++; $archivedir = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-A") { # backup directory + } elsif ("$ARGV[$i]" eq "-A") { # backup directory $nestit = 1; $i++; $archivedir = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-D") { # Directory Manager + } elsif ("$ARGV[$i]" eq "-D") { # Directory Manager $i++; $rootdn = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-w") { # Directory Manager's password + } elsif ("$ARGV[$i]" eq "-w") { # Directory Manager's password $i++; $passwd = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-j") { # Read Directory Manager's password from a file $i++; $passwdfile = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-t") { # database type + } elsif ("$ARGV[$i]" eq "-t") { # database type $i++; $dbtype = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-Z") { # Server identifier $i++; $servid = $ARGV[$i]; @@ -62,8 +61,6 @@ while ($i <= $#ARGV) { $i++; $protocol = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-h") { # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v") { # verbose - $verbose = 1; } else { print "ERROR - Unknown option: $ARGV[$i]\n"; &usage; exit(1); @@ -78,11 +75,7 @@ while ($i <= $#ARGV) { %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; $mybakdir = "@localstatedir@/lib/@PACKAGE_NAME@/slapd-$servid/bak"; diff --git a/ldap/admin/src/scripts/db2index.pl.in b/ldap/admin/src/scripts/db2index.pl.in index 847e67e..0cfaeca 100644 --- a/ldap/admin/src/scripts/db2index.pl.in +++ b/ldap/admin/src/scripts/db2index.pl.in @@ -26,7 +26,7 @@ $vlv_count = 0; sub usage { print(STDERR "Usage: db2index.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename } [-P protocol]\n"); - print(STDERR " -n backendname [-t attributeName[:indextypes[:matchingrules]]] [-T vlvTag] [-v] [-h]\n"); + print(STDERR " -n backendname [-t attributeName[:indextypes[:matchingrules]]] [-T vlvTag] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); print(STDERR " -w password - Directory Manager's password\n"); @@ -42,7 +42,6 @@ sub usage { print(STDERR " Example: -t foo:eq,pres\n"); print(STDERR " -T vlvTag - VLV index name\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose\n"); print(STDERR " -h - Display usage\n"); } @@ -65,8 +64,6 @@ while ($i <= $#ARGV) { $i++; $protocol = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-h") { # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v") { # verbose - $verbose = 1; } else { print "ERROR - Unknown option: $ARGV[$i]\n"; &usage; exit(1); @@ -81,11 +78,7 @@ while ($i <= $#ARGV) { %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if ($instance eq ""){ &usage; exit(1); diff --git a/ldap/admin/src/scripts/db2ldif.pl.in b/ldap/admin/src/scripts/db2ldif.pl.in index e8ff229..179d236 100644 --- a/ldap/admin/src/scripts/db2ldif.pl.in +++ b/ldap/admin/src/scripts/db2ldif.pl.in @@ -63,7 +63,6 @@ sub usage { print(STDERR " -E - Decrypt encrypted data when exporting\n"); print(STDERR " -1 - Do not print version line\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -148,8 +147,6 @@ while ($i <= $#ARGV) { &usage; exit(0); } elsif ("$ARGV[$i]" eq "-P") { # protocol preference $i++; $protocol = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-v") { # verbose - $verbose = 1; } elsif ("$ARGV[$i]" eq "-c") { # cwd $i++; $cwd = $ARGV[$i]; } else { @@ -167,11 +164,7 @@ while ($i <= $#ARGV) { $ldifdir = "@localstatedir@/lib/@PACKAGE_NAME@/slapd-$servid/ldif"; $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if ($instances[0] eq "" && $included[0] eq ""){ &usage; exit(1); diff --git a/ldap/admin/src/scripts/fixup-linkedattrs.pl.in b/ldap/admin/src/scripts/fixup-linkedattrs.pl.in index b9a455e..d4ee200 100644 --- a/ldap/admin/src/scripts/fixup-linkedattrs.pl.in +++ b/ldap/admin/src/scripts/fixup-linkedattrs.pl.in @@ -23,7 +23,7 @@ $i = 0; sub usage { print(STDERR "Usage: fixed-linkedupattrs.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename }\n"); - print(STDERR " [-l linkDN] [-P protocol] [-v] [-h]\n"); + print(STDERR " [-l linkDN] [-P protocol] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); print(STDERR " -w password - Directory Manager's password\n"); @@ -34,7 +34,6 @@ sub usage { print(STDERR " up the links for. If omitted, all configured\n"); print(STDERR " linked attributes will be fixed up.\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -58,9 +57,6 @@ while ($i <= $#ARGV) } elsif ("$ARGV[$i]" eq "-h"){ # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v"){ - # verbose - $verbose = 1; } elsif ("$ARGV[$i]" eq "-P") { # protocol preference $i++; $protocol = $ARGV[$i]; @@ -78,11 +74,7 @@ while ($i <= $#ARGV) %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; # # Construct the task entry diff --git a/ldap/admin/src/scripts/fixup-memberof.pl.in b/ldap/admin/src/scripts/fixup-memberof.pl.in index f3d6447..fc00c2f 100644 --- a/ldap/admin/src/scripts/fixup-memberof.pl.in +++ b/ldap/admin/src/scripts/fixup-memberof.pl.in @@ -23,7 +23,7 @@ $i = 0; sub usage { print(STDERR "Usage: fixup-memberof.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename }\n"); - print(STDERR " [-P protocol] -b baseDN [-f filter] [-v] [-h]\n"); + print(STDERR " [-P protocol] -b baseDN [-f filter] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); print(STDERR " -w password - Directory Manager's password\n"); @@ -35,7 +35,6 @@ sub usage { print(STDERR " If omitted, all entries with objectclass inetuser/inetadmin under the\n"); print(STDERR " specified base will have their memberOf attribute regenerated.\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -65,9 +64,6 @@ while ($i <= $#ARGV) } elsif ("$ARGV[$i]" eq "-h"){ # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v"){ - # verbose - $verbose = 1; } else { print "ERROR - Unknown option: $ARGV[$i]\n"; &usage; exit(1); diff --git a/ldap/admin/src/scripts/ldif2db.in b/ldap/admin/src/scripts/ldif2db.in index 03a241b..f968303 100755 --- a/ldap/admin/src/scripts/ldif2db.in +++ b/ldap/admin/src/scripts/ldif2db.in @@ -31,7 +31,7 @@ usage() echo " -O - Do not index the attributes" echo " -E - Encrypt attributes" echo " -q - Quiet mode - suppresses output" - echo " -v - Verbose output" + echo " -v - Display version" echo " -h - Display usage" } diff --git a/ldap/admin/src/scripts/ldif2db.pl.in b/ldap/admin/src/scripts/ldif2db.pl.in index bdb311e..a5d834f 100644 --- a/ldap/admin/src/scripts/ldif2db.pl.in +++ b/ldap/admin/src/scripts/ldif2db.pl.in @@ -31,7 +31,7 @@ $encrypt_on_import = 0; sub usage { print(STDERR "Usage: ldif2db.pl -n backend [-Z serverID] [-D rootdn] { -w password | -w - | -j filename }\n"); - print(STDERR " [-P protocol] {-s include}* [{-x exclude}*] [-O] [-c chunksize] [-v] [-h]\n"); + print(STDERR " [-P protocol] {-s include}* [{-x exclude}*] [-O] [-c chunksize] [-h]\n"); print(STDERR " [-E] [-g [string] [-G namespace_id]] {-i filename}*\n"); print(STDERR "Note: either \"-n backend\", \"-s includesuffix\", and \"-i ldiffile\" are required.\n"); print(STDERR "Options:\n"); @@ -53,7 +53,6 @@ sub usage { print(STDERR " -G name - Namespace id for name based uniqueid (-g deterministic)\n"); print(STDERR " -E - Encrypt data when importing\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -129,8 +128,6 @@ while ($i <= $#ARGV) { $i++; $uniqidname = $ARGV[$i]; } elsif ("$ARGV[$i]" eq "-Z") { # server id $i++; $servid = $ARGV[$i]; - } elsif ("$ARGV[$i]" eq "-v") { # verbose - $verbose = 1; } elsif ("$ARGV[$i]" eq "-h") { # help &usage; exit(0); } elsif ("$ARGV[$i]" eq "-E") { # encrypt on import @@ -151,11 +148,7 @@ while ($i <= $#ARGV) { %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if (($instance eq "" && $included[0] eq "") || $ldiffiles[0] eq "" ){ &usage; exit(1); diff --git a/ldap/admin/src/scripts/schema-reload.pl.in b/ldap/admin/src/scripts/schema-reload.pl.in index d880337..03bb610 100644 --- a/ldap/admin/src/scripts/schema-reload.pl.in +++ b/ldap/admin/src/scripts/schema-reload.pl.in @@ -22,7 +22,7 @@ $ENV{'PATH'} = "@ldaptool_bindir@:/usr/bin:/usr/lib64/mozldap/"; $i = 0; sub usage { - print(STDERR "Usage: schema-reload.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename } [-P protocol] [-d schemadir] [-v] [-h]\n"); + print(STDERR "Usage: schema-reload.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename } [-P protocol] [-d schemadir] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); print(STDERR " -w password - Directory Manager's password\n"); @@ -31,7 +31,6 @@ sub usage { print(STDERR " -j filename - Read Directory Manager's password from file\n"); print(STDERR " -d schemadir - Directory where schema files are located\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -56,9 +55,6 @@ while ($i <= $#ARGV) # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v"){ - # verbose - $verbose = 1; } elsif ("$ARGV[$i]" eq "-P") { # protocol preference $i++; $protocol = $ARGV[$i]; @@ -77,11 +73,7 @@ while ($i <= $#ARGV) %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; # # Construct the task entry diff --git a/ldap/admin/src/scripts/syntax-validate.pl.in b/ldap/admin/src/scripts/syntax-validate.pl.in index 5f52475..717a6ed 100644 --- a/ldap/admin/src/scripts/syntax-validate.pl.in +++ b/ldap/admin/src/scripts/syntax-validate.pl.in @@ -22,7 +22,7 @@ $ENV{'SHLIB_PATH'} = "$ENV{'LD_LIBRARY_PATH'}"; $i = 0; sub usage { - print(STDERR "Usage: syntax-validate.pl [-v] [-Z serverID] [-D rootdn] { -w password | -w - | -j filename }\n"); + print(STDERR "Usage: syntax-validate.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename }\n"); print(STDERR " [-P protocol] -b baseDN [-f filter] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); @@ -35,7 +35,6 @@ sub usage { print(STDERR " If omitted, all entries under the specified\n"); print(STDERR " base will have their attribute values validated.\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -66,9 +65,6 @@ while ($i <= $#ARGV) # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v"){ - # verbose - $verbose = 1; } else { print "ERROR - Unknown option: $ARGV[$i]\n"; &usage; @@ -84,11 +80,7 @@ while ($i <= $#ARGV) %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if ( $basedn_arg eq "" ){ &usage; exit(1); diff --git a/ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in b/ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in index c14bcd8..4168433 100644 --- a/ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in +++ b/ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in @@ -22,7 +22,7 @@ $i = 0; sub usage { print(STDERR "Usage: usn-tombstone-cleanup.pl [-Z serverID] [-D rootdn] { -w password | -w - | -j filename }\n"); - print(STDERR " -s suffix -n backend [-m maxusn_to_delete] [-P protocol] [-v] [-h]\n"); + print(STDERR " -s suffix -n backend [-m maxusn_to_delete] [-P protocol] [-h]\n"); print(STDERR "Options:\n"); print(STDERR " -D rootdn - Directory Manager\n"); print(STDERR " -w password - Directory Manager's password\n"); @@ -33,7 +33,6 @@ sub usage { print(STDERR " -n backend - Backend instance in which USN tombstone entries are cleaned up (alternative to suffix)\n"); print(STDERR " -m maxusn_to_delete - USN tombstone entries are deleted up to the entry with maxusn_to_delete\n"); print(STDERR " -P protocol - STARTTLS, LDAPS, LDAPI, LDAP (default: uses most secure protocol available)\n"); - print(STDERR " -v - Verbose output\n"); print(STDERR " -h - Display usage\n"); } @@ -67,9 +66,6 @@ while ($i <= $#ARGV) # help &usage; exit(0); - } elsif ("$ARGV[$i]" eq "-v"){ - # verbose - $verbose = 1; } else { print "ERROR - Unknown option: $ARGV[$i]\n"; &usage; @@ -85,11 +81,7 @@ while ($i <= $#ARGV) %info = DSUtil::get_info($confdir, $host, $port, $rootdn); $info{rootdnpw} = DSUtil::get_password_from_file($passwd, $passwdfile); $info{protocol} = $protocol; -if ($verbose == 1){ - $info{args} = "-v -a"; -} else { - $info{args} = "-a"; -} +$info{args} = "-a"; if ( $suffix_arg eq "" && $backend_arg eq "" ){ &usage; exit(1); diff --git a/man/man8/bak2db.8 b/man/man8/bak2db.8 index 0b61f14..77864728 100644 --- a/man/man8/bak2db.8 +++ b/man/man8/bak2db.8 @@ -18,7 +18,7 @@ .SH NAME bak2db - Directory Server script for restoring a backup .SH SYNOPSIS -bak2db archivedir [\-Z serverID] [\-n backendname] [\-q] | [\-h] +bak2db archivedir [\-Z serverID] [\-n backendname] [\-q] [\-v] [\-h] .SH DESCRIPTION Restores the database from a archived backup. The Directory Server must be stopped prior to running this script. .SH OPTIONS @@ -38,6 +38,10 @@ The name of the LDBM database to restore. Example: userRoot .br Quiet mode. Reduces output of task. .TP +.B \fB\-v\fR +Display version +.br +.TP .B \fB\-h\fR .br Display the usage. diff --git a/man/man8/bak2db.pl.8 b/man/man8/bak2db.pl.8 index a551d3d..1bb76c5 100644 --- a/man/man8/bak2db.pl.8 +++ b/man/man8/bak2db.pl.8 @@ -18,7 +18,7 @@ .SH NAME bak2db.pl - Directory Server perl script for restoring a backup .SH SYNOPSIS -bak2db.pl \-a archivedir [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-t dbtype] [\-n backendname] [\-P protocol] [\-v] [\-h] +bak2db.pl \-a archivedir [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-t dbtype] [\-n backendname] [\-P protocol] [\-h] .SH DESCRIPTION Restores a database from a backup. The Directory Server must be started prior to running this script. .SH OPTIONS @@ -56,10 +56,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/cleanallruv.pl.8 b/man/man8/cleanallruv.pl.8 index 1f23858..55678ac 100644 --- a/man/man8/cleanallruv.pl.8 +++ b/man/man8/cleanallruv.pl.8 @@ -18,7 +18,7 @@ .SH NAME cleanallruv.pl - Directory Server perl script for issuing a cleanAllRUV task .SH SYNOPSIS -cleanallruv.pl [\-v] [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-b basedn \-r rid [\-A] [\-P protocol] [\-h] +cleanallruv.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-b basedn \-r rid [\-A] [\-P protocol] [\-h] .SH DESCRIPTION Creates and adds a cleanAllRUV task to the Directory Server .SH OPTIONS @@ -59,10 +59,6 @@ available for the root user. .br Abort a cleanAllRUV task that is currently running. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/db2bak.8 b/man/man8/db2bak.8 index 79edb64..5de017e 100644 --- a/man/man8/db2bak.8 +++ b/man/man8/db2bak.8 @@ -18,7 +18,7 @@ .SH NAME db2bak - Directory Server script for making a backup of the database .SH SYNOPSIS -db2bak [archivedir] [\-Z serverID] [\-q] [\-h] +db2bak [archivedir] [\-Z serverID] [\-q] [\-v] [\-h] .SH DESCRIPTION Creates a backup of the database. This script can be executed while the server is running or stopped. .SH OPTIONS @@ -31,6 +31,10 @@ The full path to the directory to store the backup. The server ID of the Directory Server instance. If there is only one instance on the system, this option can be skipped. .TP +.B \fB\-v\fR +Display version +.br +.TP .B \fB\-q\fR .br Quiet mode. Reduces output of task. diff --git a/man/man8/db2bak.pl.8 b/man/man8/db2bak.pl.8 index 71beae4..9a34d51 100644 --- a/man/man8/db2bak.pl.8 +++ b/man/man8/db2bak.pl.8 @@ -18,7 +18,7 @@ .SH NAME db2bak.pl - Directory Server perl script for creating a backup .SH SYNOPSIS -db2bak.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-t dbtype] [\-a backupdir] [\-A backupdir] [\-P protocol] [\-v] [\-h] +db2bak.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-t dbtype] [\-a backupdir] [\-A backupdir] [\-P protocol] [\-h] .SH DESCRIPTION Creates a backup of the Directory Server database. The Directory Server must be started prior to running this script. @@ -57,10 +57,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/db2index.8 b/man/man8/db2index.8 index 4b62670..1e70cc9 100644 --- a/man/man8/db2index.8 +++ b/man/man8/db2index.8 @@ -18,7 +18,7 @@ .SH NAME db2index - Directory Server script for indexing attributes .SH SYNOPSIS -db2index [\-Z serverID] [\-n backend | {\-s includeSuffix}* \-t attribute[:indextypes[:matchingrules]] \-T vlvTag] [\-h] +db2index [\-Z serverID] [\-n backend | {\-s includeSuffix}* \-t attribute[:indextypes[:matchingrules]] \-T vlvTag] [\-v] [\-h] .SH DESCRIPTION Reindexes the database index files. The Directory Server must be stopped prior to running this script. .SH OPTIONS @@ -41,6 +41,10 @@ An optional matching rule OID can also be set. .B \fB\-T\fR \fIvlvTag\fR This is the name of the vlv index entry under cn=config. .TP +.B \fB\-v\fR +Display version +.br +.TP .B \fB\-h\fR .br Display the usage. diff --git a/man/man8/db2index.pl.8 b/man/man8/db2index.pl.8 index df9da7e..4ff9c7a 100644 --- a/man/man8/db2index.pl.8 +++ b/man/man8/db2index.pl.8 @@ -18,7 +18,7 @@ .SH NAME db2index.pl - Directory Server perl script for indexing a database .SH SYNOPSIS -db2index.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-n backendname] [\-P protocol] [\-t attributeName[:indextypes[:matchingrules]]] [\-T vlvTag] [\-v] [\-h] +db2index.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-n backendname] [\-P protocol] [\-t attributeName[:indextypes[:matchingrules]]] [\-T vlvTag] [\-h] .SH DESCRIPTION Indexes attributes in the specified database. If no attributes are specified, then all the attribute indexes will be regenerated. The Directory Server must be started prior to running this script. .SH OPTIONS @@ -57,10 +57,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/db2ldif.8 b/man/man8/db2ldif.8 index 361b224..2a787f2 100644 --- a/man/man8/db2ldif.8 +++ b/man/man8/db2ldif.8 @@ -18,7 +18,7 @@ .SH NAME db2ldif - Directory Server script for exporting the database .SH SYNOPSIS -db2ldif [\-Z serverID] {\-n backend_instance}* | {\-s includeSuffix}* [{\-x excludeSuffix}*] [\-a outputFile] [\-m] [\-M] [\-r] [\-u] [\-U] [\-C] [\-N] [\-E] [\-1] [\-q] [\-h] +db2ldif [\-Z serverID] {\-n backend_instance}* | {\-s includeSuffix}* [{\-x excludeSuffix}*] [\-a outputFile] [\-v] [\-m] [\-M] [\-r] [\-u] [\-U] [\-C] [\-N] [\-E] [\-1] [\-q] [\-h] .SH DESCRIPTION Exports the contents of the database to a LDIF file. This script can be executed while the server is still running, except when using the \-r option. .SH OPTIONS @@ -54,6 +54,10 @@ By default, all instances are stored in the filename specified by the \-a option .br Export replication data(information required to initialize a replica when the LDIF is imported). .TP +.B \fB\-v\fR +Display version +.br +.TP .B \fB\-u\fR .br Do not export the unique-id attribute. diff --git a/man/man8/db2ldif.pl.8 b/man/man8/db2ldif.pl.8 index 1ddc1cf..f02d3ed 100644 --- a/man/man8/db2ldif.pl.8 +++ b/man/man8/db2ldif.pl.8 @@ -19,7 +19,7 @@ db2ldif.pl - Directory Server perl script for exporting a database to a LDIF file .SH SYNOPSIS db2ldif.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j pwfilename } [\-P protocol] -{\-n backendname}* | {\-s includeSuffix}* [{\-x excludeSuffix}*] [\-m] [\-M] [\-r] [\-u] [\-C] [\-N] [\-E] [\-1] [\-U] [\-a filename] [\-v] [\-h] +{\-n backendname}* | {\-s includeSuffix}* [{\-x excludeSuffix}*] [\-m] [\-M] [\-r] [\-u] [\-C] [\-N] [\-E] [\-1] [\-U] [\-a filename] [\-h] .SH DESCRIPTION Exports the contents of the database to LDIF. This script creates an entry in the directory that launches this dynamic task. .SH OPTIONS @@ -98,10 +98,6 @@ Decrypts any encrypted data during export. .br Deletes, for reasons of backward compatibility, the first line of the LDIF file that gives the version of the LDIF standard. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/fixup-linkedattrs.pl.8 b/man/man8/fixup-linkedattrs.pl.8 index 7dd2bd7..ee484c8 100644 --- a/man/man8/fixup-linkedattrs.pl.8 +++ b/man/man8/fixup-linkedattrs.pl.8 @@ -18,7 +18,7 @@ .SH NAME fixup-linkedattrs.pl - Directory Server perl script for creating a "fixup" task for linked attributes. .SH SYNOPSIS -fixup-linkedattrs.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-l linkDN] [\-P protocol] [\-v] [\-h] +fixup-linkedattrs.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-l linkDN] [\-P protocol] [\-h] .SH DESCRIPTION Creates the managed attributes in the user entries once the linking plug-in instance is created or updates the managed attributes to keep everything in sync after operations like replication or synchronization. .SH OPTIONS @@ -50,10 +50,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/fixup-memberof.pl.8 b/man/man8/fixup-memberof.pl.8 index 4323579..55b7503 100644 --- a/man/man8/fixup-memberof.pl.8 +++ b/man/man8/fixup-memberof.pl.8 @@ -18,7 +18,7 @@ .SH NAME fixup-memberof.pl - Directory Server perl script for memberOf attributes. .SH SYNOPSIS -fixup-memberof.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-b baseDN [\-f filter] [\-P protocol] [\-v] [\-h] +fixup-memberof.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-b baseDN [\-f filter] [\-P protocol] [\-h] .SH DESCRIPTION Regenerates and updates memberOf on user entries to coordinate changes in group membership. .SH OPTIONS @@ -54,10 +54,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/ldif2db.8 b/man/man8/ldif2db.8 index c8ebac2..a5db3ea 100644 --- a/man/man8/ldif2db.8 +++ b/man/man8/ldif2db.8 @@ -18,7 +18,7 @@ .SH NAME ldif2db - Directory Server script for importing a LDIF file .SH SYNOPSIS -ldif2db [\-Z serverID] \-n backendname {\-s includesuffix}* [{\-x excludesuffix}*] [\-g [string] [\-G namespace_id]] {\-i ldiffile}* [\-c chunksize] [\-O] [\-E] [\-q] [\-h] +ldif2db [\-Z serverID] \-n backendname {\-s includesuffix}* [{\-x excludesuffix}*] [\-g [string] [\-G namespace_id]] {\-i ldiffile}* [\-c chunksize] [\-v] [\-O] [\-E] [\-q] [\-h] .SH DESCRIPTION Imports a LDIF file. Either the option '\-n' or '\-s' must be used. The server instance must be stopped prior to running this command. .SH OPTIONS @@ -47,6 +47,10 @@ The number of entries to process before starting a fresh pass during the import. .br Requests that only the core database is created without attribute indexes. .TP +.B \fB\-v\fR +Display version +.br +.TP .B \fB\-g\fR \fI[string]\fR Generates a unique ID. Type none for no unique ID to be generated and deterministic for the generated unique ID to be name-based. By default, a time-based unique ID is generated. When using the deterministic generation to have a name-based unique ID, it is also possible to specify the namespace for the server to use, as follows: @@ -63,7 +67,7 @@ Encrypts data during import. This option is used only if database encryption is .TP .B \fB\-v\fR .br -Display verbose output +Display version .TP .B \fB\-h\fR .br diff --git a/man/man8/ldif2db.pl.8 b/man/man8/ldif2db.pl.8 index 198864a..cc3e316 100644 --- a/man/man8/ldif2db.pl.8 +++ b/man/man8/ldif2db.pl.8 @@ -18,7 +18,7 @@ .SH NAME ldif2db.pl - Directory Server perl script for importing a LDIF file .SH SYNOPSIS -ldif2db.pl \-n backend [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-P protocol] {\-s includeSuffix}* [{\-x excludeSuffix}*] [\-O] [\-c chunksize] [\-v] [\-h] [\-g [string]] [\-G namespace_id] {\-i filename}* +ldif2db.pl \-n backend [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-P protocol] {\-s includeSuffix}* [{\-x excludeSuffix}*] [\-O] [\-c chunksize] [\-h] [\-g [string]] [\-G namespace_id] {\-i filename}* .SH DESCRIPTION Imports LDIF file(s) into the server. Either the option '\-n' or '\-s' must be used. This script creates an entry in the directory that launches this dynamic task. .SH OPTIONS @@ -76,10 +76,6 @@ Requests that only the core database is created without attribute indexes. .B \fB\-c\fR \fIChunk size\fR The number of entries to process before starting a fresh pass during the import. By default this is handled internally by the server. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/schema-reload.pl.8 b/man/man8/schema-reload.pl.8 index d598880..17380cf 100644 --- a/man/man8/schema-reload.pl.8 +++ b/man/man8/schema-reload.pl.8 @@ -18,7 +18,7 @@ .SH NAME schema-reload.pl - Directory Server perl script for updating the schema. .SH SYNOPSIS -schema-reload.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-P protocol] [\-d schemadir] [\-v] [\-h] +schema-reload.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } [\-P protocol] [\-d schemadir] [\-h] .SH DESCRIPTION Manually reloads the schema files used by the Directory Server instance, either in the default location, or in user-specified locations. .SH OPTIONS @@ -50,10 +50,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/syntax-validate.pl.8 b/man/man8/syntax-validate.pl.8 index 115e3ed..ece2d59 100644 --- a/man/man8/syntax-validate.pl.8 +++ b/man/man8/syntax-validate.pl.8 @@ -18,7 +18,7 @@ .SH NAME syntax-validate.pl - Directory Server perl script for validating attribute syntax. .SH SYNOPSIS -syntax-validate.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-b baseDN [\-f filter] [\-P protocol] [\-v] [\-h] +syntax-validate.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-b baseDN [\-f filter] [\-P protocol] [\-h] .SH DESCRIPTION Syntax validation checks every modification to attributes to make sure that the new value has the required syntax for that attribute type. All attribute syntaxes are validated against the definitions in RFC 4514. .SH OPTIONS @@ -53,10 +53,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage diff --git a/man/man8/usn-tombstone-cleanup.pl.8 b/man/man8/usn-tombstone-cleanup.pl.8 index a8df579..f78b230 100644 --- a/man/man8/usn-tombstone-cleanup.pl.8 +++ b/man/man8/usn-tombstone-cleanup.pl.8 @@ -18,7 +18,7 @@ .SH NAME usn-tombstone-cleanup.pl - Directory Server perl script for cleaning up tombstone entries. .SH SYNOPSIS -usn-tombstone-cleanup.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-s suffix \-n backend [\-m maxusn_to_delete] [\-P protocol] [\-v] [\-h] +usn-tombstone-cleanup.pl [\-Z serverID] [\-D rootdn] { \-w password | \-w \- | \-j filename } \-s suffix \-n backend [\-m maxusn_to_delete] [\-P protocol] [\-h] .SH DESCRIPTION Deletes the tombstone entries maintained by the instance if the USN Plug-in is enabled. .SH OPTIONS @@ -56,10 +56,6 @@ The connection protocol to connect to the Directory Server. Protocols are START If this option is skipped, the most secure protocol that is available is used. For LDAPI, AUTOBIND is also available for the root user. .TP -.B \fB\-v\fR -.br -Display verbose output -.TP .B \fB\-h\fR .br Display usage -- 2.7.4