ldap/admin/src/scripts/bak2db.in | 8 ++++++++
ldap/admin/src/scripts/bak2db.pl.in | 1 +
ldap/admin/src/scripts/cleanallruv.pl.in | 1 +
ldap/admin/src/scripts/db2bak.in | 7 +++++++
ldap/admin/src/scripts/db2bak.pl.in | 1 +
ldap/admin/src/scripts/db2index.in | 8 ++++++++
ldap/admin/src/scripts/db2index.pl.in | 1 +
ldap/admin/src/scripts/db2ldif.in | 8 ++++++++
ldap/admin/src/scripts/db2ldif.pl.in | 1 +
ldap/admin/src/scripts/dbverify.in | 9 +++++++++
ldap/admin/src/scripts/dn2rdn.in | 8 ++++++++
ldap/admin/src/scripts/fixup-linkedattrs.pl.in | 1 +
ldap/admin/src/scripts/fixup-memberof.pl.in | 1 +
ldap/admin/src/scripts/ldif2db.in | 20 ++++++++++++++------
ldap/admin/src/scripts/ldif2db.pl.in | 1 +
ldap/admin/src/scripts/ldif2ldap.in | 8 ++++++++
ldap/admin/src/scripts/monitor.in | 8 ++++++++
ldap/admin/src/scripts/ns-accountstatus.pl.in | 2 +-
ldap/admin/src/scripts/ns-activate.pl.in | 2 +-
ldap/admin/src/scripts/ns-inactivate.pl.in | 2 +-
ldap/admin/src/scripts/restoreconfig.in | 8 ++++++++
ldap/admin/src/scripts/saveconfig.in | 8 ++++++++
ldap/admin/src/scripts/schema-reload.pl.in | 1 +
ldap/admin/src/scripts/suffix2instance.in | 20 +++++++++++++++-----
ldap/admin/src/scripts/syntax-validate.pl.in | 1 +
ldap/admin/src/scripts/upgradedb.in | 8 ++++++++
ldap/admin/src/scripts/upgradednformat.in | 8 ++++++++
ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in | 1 +
ldap/admin/src/scripts/verify-db.pl.in | 1 +
ldap/admin/src/scripts/vlvindex.in | 20 ++++++++++++++------
30 files changed, 154 insertions(+), 20 deletions(-)
New commits:
commit d4eadaefa652a2251afde5bff1166bdb267ac581
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Fri Dec 9 15:16:38 2016 -0500
Ticket 47662 - Better input argument validation and error messages for cli tools
Description: Improved usage errors for CLI tools, and also made the usage errors
consistent.
https://fedorahosted.org/389/ticket/47662
Reviewed by: nhosoi(Thanks!)
diff --git a/ldap/admin/src/scripts/bak2db.in b/ldap/admin/src/scripts/bak2db.in
index ab7c6b3..cb5ef14 100755
--- a/ldap/admin/src/scripts/bak2db.in
+++ b/ldap/admin/src/scripts/bak2db.in
@@ -57,6 +57,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/bak2db.pl.in b/ldap/admin/src/scripts/bak2db.pl.in
index cc98644..28f1c98 100644
--- a/ldap/admin/src/scripts/bak2db.pl.in
+++ b/ldap/admin/src/scripts/bak2db.pl.in
@@ -62,6 +62,7 @@ while ($i <= $#ARGV) {
} elsif ("$ARGV[$i]" eq "-v") { # verbose
$verbose = 1;
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/cleanallruv.pl.in
b/ldap/admin/src/scripts/cleanallruv.pl.in
index 8970b7e..f6e5477 100644
--- a/ldap/admin/src/scripts/cleanallruv.pl.in
+++ b/ldap/admin/src/scripts/cleanallruv.pl.in
@@ -71,6 +71,7 @@ while ($i <= $#ARGV)
# help
&usage; exit(0);
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/db2bak.in b/ldap/admin/src/scripts/db2bak.in
index adbe30b..e773b28 100755
--- a/ldap/admin/src/scripts/db2bak.in
+++ b/ldap/admin/src/scripts/db2bak.in
@@ -53,6 +53,13 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
diff --git a/ldap/admin/src/scripts/db2bak.pl.in b/ldap/admin/src/scripts/db2bak.pl.in
index 479e541..2e95383 100644
--- a/ldap/admin/src/scripts/db2bak.pl.in
+++ b/ldap/admin/src/scripts/db2bak.pl.in
@@ -65,6 +65,7 @@ while ($i <= $#ARGV) {
} elsif ("$ARGV[$i]" eq "-v") { # verbose
$verbose = 1;
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/db2index.in b/ldap/admin/src/scripts/db2index.in
index 748c58b..fec082e 100755
--- a/ldap/admin/src/scripts/db2index.in
+++ b/ldap/admin/src/scripts/db2index.in
@@ -52,6 +52,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/db2index.pl.in
b/ldap/admin/src/scripts/db2index.pl.in
index 178a9ac..847e67e 100644
--- a/ldap/admin/src/scripts/db2index.pl.in
+++ b/ldap/admin/src/scripts/db2index.pl.in
@@ -68,6 +68,7 @@ while ($i <= $#ARGV) {
} elsif ("$ARGV[$i]" eq "-v") { # verbose
$verbose = 1;
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/db2ldif.in b/ldap/admin/src/scripts/db2ldif.in
index b311590..85854b3 100755
--- a/ldap/admin/src/scripts/db2ldif.in
+++ b/ldap/admin/src/scripts/db2ldif.in
@@ -130,6 +130,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
if [ "$required_param" != "yes" ]
then
usage
diff --git a/ldap/admin/src/scripts/db2ldif.pl.in b/ldap/admin/src/scripts/db2ldif.pl.in
index b82ea41..e8ff229 100644
--- a/ldap/admin/src/scripts/db2ldif.pl.in
+++ b/ldap/admin/src/scripts/db2ldif.pl.in
@@ -153,6 +153,7 @@ while ($i <= $#ARGV) {
} elsif ("$ARGV[$i]" eq "-c") { # cwd
$i++; $cwd = $ARGV[$i];
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/dbverify.in b/ldap/admin/src/scripts/dbverify.in
index b98e9b2..601f726 100755
--- a/ldap/admin/src/scripts/dbverify.in
+++ b/ldap/admin/src/scripts/dbverify.in
@@ -46,6 +46,15 @@ do
esac
done
+
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/dn2rdn.in b/ldap/admin/src/scripts/dn2rdn.in
index 762e63a..53efd21 100755
--- a/ldap/admin/src/scripts/dn2rdn.in
+++ b/ldap/admin/src/scripts/dn2rdn.in
@@ -38,6 +38,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/fixup-linkedattrs.pl.in
b/ldap/admin/src/scripts/fixup-linkedattrs.pl.in
index 76a7d3f..b9a455e 100644
--- a/ldap/admin/src/scripts/fixup-linkedattrs.pl.in
+++ b/ldap/admin/src/scripts/fixup-linkedattrs.pl.in
@@ -65,6 +65,7 @@ while ($i <= $#ARGV)
# protocol preference
$i++; $protocol = $ARGV[$i];
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/fixup-memberof.pl.in
b/ldap/admin/src/scripts/fixup-memberof.pl.in
index bf7b5f5..f3d6447 100644
--- a/ldap/admin/src/scripts/fixup-memberof.pl.in
+++ b/ldap/admin/src/scripts/fixup-memberof.pl.in
@@ -69,6 +69,7 @@ while ($i <= $#ARGV)
# verbose
$verbose = 1;
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/ldif2db.in b/ldap/admin/src/scripts/ldif2db.in
index 3aed469..03a241b 100755
--- a/ldap/admin/src/scripts/ldif2db.in
+++ b/ldap/admin/src/scripts/ldif2db.in
@@ -81,23 +81,31 @@ do
esac
done
-initfile=$(get_init_file "@initconfigdir@" $servid)
-if [ $? -eq 1 ]
+if [ $# -lt 4 ]
then
usage
- echo "You must supply a valid server instance identifier. Use -Z to specify
instance name"
- echo "Available instances: $initfile"
exit 1
fi
-. $initfile
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
-if [ $# -lt 4 ]
+initfile=$(get_init_file "@initconfigdir@" $servid)
+if [ $? -eq 1 ]
then
usage
+ echo "You must supply a valid server instance identifier. Use -Z to specify
instance name"
+ echo "Available instances: $initfile"
exit 1
fi
+. $initfile
+
handleopts $@
quiet=$?
if [ $quiet -eq 0 ]; then
diff --git a/ldap/admin/src/scripts/ldif2db.pl.in b/ldap/admin/src/scripts/ldif2db.pl.in
index 540e52b..bdb311e 100644
--- a/ldap/admin/src/scripts/ldif2db.pl.in
+++ b/ldap/admin/src/scripts/ldif2db.pl.in
@@ -138,6 +138,7 @@ while ($i <= $#ARGV) {
} elsif ("$ARGV[$i]" eq "-P") { # protocol preference
$i++; $protocol = $ARGV[$i];
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/ldif2ldap.in b/ldap/admin/src/scripts/ldif2ldap.in
index 1e871be..eaaba7a 100755
--- a/ldap/admin/src/scripts/ldif2ldap.in
+++ b/ldap/admin/src/scripts/ldif2ldap.in
@@ -40,6 +40,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
if [ -z "$input_file" ]
then
usage
diff --git a/ldap/admin/src/scripts/monitor.in b/ldap/admin/src/scripts/monitor.in
index e9265a1..7edd254 100755
--- a/ldap/admin/src/scripts/monitor.in
+++ b/ldap/admin/src/scripts/monitor.in
@@ -40,6 +40,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/ns-accountstatus.pl.in
b/ldap/admin/src/scripts/ns-accountstatus.pl.in
index a20d2df..2b94051 100644
--- a/ldap/admin/src/scripts/ns-accountstatus.pl.in
+++ b/ldap/admin/src/scripts/ns-accountstatus.pl.in
@@ -761,7 +761,7 @@ while( $arg = shift){
} elsif ($arg eq "-P") {
$protocol = shift @ARGV;
} else {
- print "$arg: Unknown command line argument.\n";
+ print "ERROR - Unknown option: $ARGV[$i]\n";
usage();
exit 1
}
diff --git a/ldap/admin/src/scripts/ns-activate.pl.in
b/ldap/admin/src/scripts/ns-activate.pl.in
index 6e5ecc7..5922c9a 100644
--- a/ldap/admin/src/scripts/ns-activate.pl.in
+++ b/ldap/admin/src/scripts/ns-activate.pl.in
@@ -481,7 +481,7 @@ while( $arg = shift)
} elsif ($arg eq "-P") {
$protocol = shift @ARGV;
} else {
- print "$arg: Unknown command line argument.\n";
+ print "ERROR - Unknown option: $ARGV[$i]\n";
usage();
exit(1);
}
diff --git a/ldap/admin/src/scripts/ns-inactivate.pl.in
b/ldap/admin/src/scripts/ns-inactivate.pl.in
index af7e09b..ef37527 100644
--- a/ldap/admin/src/scripts/ns-inactivate.pl.in
+++ b/ldap/admin/src/scripts/ns-inactivate.pl.in
@@ -354,7 +354,7 @@ while( $arg = shift)
} elsif ($arg eq "-P") {
$protocol = shift @ARGV;
} else {
- print "$arg: Unknown command line argument.\n";
+ print "ERROR - Unknown option: $ARGV[$i]\n";
usage();
exit(1);
}
diff --git a/ldap/admin/src/scripts/restoreconfig.in
b/ldap/admin/src/scripts/restoreconfig.in
index 56c9e43..bdb1ebd 100755
--- a/ldap/admin/src/scripts/restoreconfig.in
+++ b/ldap/admin/src/scripts/restoreconfig.in
@@ -30,6 +30,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/saveconfig.in b/ldap/admin/src/scripts/saveconfig.in
index 16e3efc..85334e5 100755
--- a/ldap/admin/src/scripts/saveconfig.in
+++ b/ldap/admin/src/scripts/saveconfig.in
@@ -30,6 +30,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/schema-reload.pl.in
b/ldap/admin/src/scripts/schema-reload.pl.in
index 307100b..d880337 100644
--- a/ldap/admin/src/scripts/schema-reload.pl.in
+++ b/ldap/admin/src/scripts/schema-reload.pl.in
@@ -63,6 +63,7 @@ while ($i <= $#ARGV)
# protocol preference
$i++; $protocol = $ARGV[$i];
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage;
exit(1);
}
diff --git a/ldap/admin/src/scripts/suffix2instance.in
b/ldap/admin/src/scripts/suffix2instance.in
index d7c6661..88b031c 100755
--- a/ldap/admin/src/scripts/suffix2instance.in
+++ b/ldap/admin/src/scripts/suffix2instance.in
@@ -38,6 +38,20 @@ then
exit 1
fi
+if [ $# -lt 2 ]
+then
+ echo Usage: suffix2instance [-Z serverID] {-s includesuffix}*
+ exit 1
+fi
+
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
@@ -49,10 +63,6 @@ fi
. $initfile
-if [ $# -lt 2 ]
-then
- echo Usage: suffix2instance [-Z serverID] {-s includesuffix}*
- exit 1
-fi
+
eval @sbindir@/ns-slapd suffix2instance -D $CONFIG_DIR $args 2>&1
diff --git a/ldap/admin/src/scripts/syntax-validate.pl.in
b/ldap/admin/src/scripts/syntax-validate.pl.in
index 05dc938..5f52475 100644
--- a/ldap/admin/src/scripts/syntax-validate.pl.in
+++ b/ldap/admin/src/scripts/syntax-validate.pl.in
@@ -70,6 +70,7 @@ while ($i <= $#ARGV)
# verbose
$verbose = 1;
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage;
exit(1);
}
diff --git a/ldap/admin/src/scripts/upgradedb.in b/ldap/admin/src/scripts/upgradedb.in
index 2b7c79d..5f9ff8f 100755
--- a/ldap/admin/src/scripts/upgradedb.in
+++ b/ldap/admin/src/scripts/upgradedb.in
@@ -38,6 +38,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
initfile=$(get_init_file "@initconfigdir@" $servid)
if [ $? -eq 1 ]
then
diff --git a/ldap/admin/src/scripts/upgradednformat.in
b/ldap/admin/src/scripts/upgradednformat.in
index 9de60ea..e4f9dbe 100755
--- a/ldap/admin/src/scripts/upgradednformat.in
+++ b/ldap/admin/src/scripts/upgradednformat.in
@@ -49,6 +49,14 @@ do
esac
done
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
+
if [ -z "$be" ] || [ -z "$dir" ]; then
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 bafdb1a..c14bcd8 100644
--- a/ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in
+++ b/ldap/admin/src/scripts/usn-tombstone-cleanup.pl.in
@@ -71,6 +71,7 @@ while ($i <= $#ARGV)
# verbose
$verbose = 1;
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage;
exit(1);
}
diff --git a/ldap/admin/src/scripts/verify-db.pl.in
b/ldap/admin/src/scripts/verify-db.pl.in
index d481ecb..fcc93d7 100644
--- a/ldap/admin/src/scripts/verify-db.pl.in
+++ b/ldap/admin/src/scripts/verify-db.pl.in
@@ -128,6 +128,7 @@ while ($i <= $#ARGV) {
} elsif ("$ARGV[$i]" eq "-h") { # help
&usage; exit(0);
} else {
+ print "ERROR - Unknown option: $ARGV[$i]\n";
&usage; exit(1);
}
$i++;
diff --git a/ldap/admin/src/scripts/vlvindex.in b/ldap/admin/src/scripts/vlvindex.in
index a1696bc..ba2a2b3 100755
--- a/ldap/admin/src/scripts/vlvindex.in
+++ b/ldap/admin/src/scripts/vlvindex.in
@@ -44,21 +44,29 @@ do
esac
done
-initfile=$(get_init_file "@initconfigdir@" $servid)
-if [ $? -eq 1 ]
+if [ $# -lt 4 ]
then
usage
- echo "You must supply a valid server instance identifier. Use -Z to specify
instance name"
- echo "Available instances: $initfile"
exit 1
fi
-. $initfile
+shift $(($OPTIND - 1))
+if [ $1 ]
+then
+ echo "ERROR - Unknown option: $1"
+ usage
+ exit 1
+fi
-if [ $# -lt 4 ]
+initfile=$(get_init_file "@initconfigdir@" $servid)
+if [ $? -eq 1 ]
then
usage
+ echo "You must supply a valid server instance identifier. Use -Z to specify
instance name"
+ echo "Available instances: $initfile"
exit 1
fi
+. $initfile
+
eval @sbindir@/ns-slapd db2index -D $CONFIG_DIR $args