tests: Use --configfile instead of -s

We should use long options in tests to make clear what we are trying to
do.

Also the -s short option will be removed for --configfile later.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

4 files changed, 15 insertions, 15 deletions

diff --git a/examples/ad-bench/time_group.sh b/examples/ad-bench/time_group.sh
index 438376e6c10..bb989314b83 100644
--- a/examples/ad-bench/time_group.sh
+++ b/examples/ad-bench/time_group.sh
@@ -30,7 +30,7 @@ SERVER=$2
 
 add_group () {
 	GROUP=$1
-	${NET} ads group add "${GROUP}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads group add "${GROUP}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} ads group add returned error: $RET"
@@ -40,7 +40,7 @@ add_group () {
 
 del_group () {
 	GROUP=$1
-	${NET} ads group delete "${GROUP}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads group delete "${GROUP}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -49,7 +49,7 @@ del_group () {
 }
 
 enum_group () {
-	${NET} ads group -k -s $CONFIG_FILE -S $SERVER > /dev/null
+	${NET} ads group -k --configfile=$CONFIG_FILE -S $SERVER > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -59,7 +59,7 @@ enum_group () {
 
 info_group () {
 	GROUP=$1
-	${NET} ads group info "${GROUP}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads group info "${GROUP}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
diff --git a/examples/ad-bench/time_join.sh b/examples/ad-bench/time_join.sh
index e9c3873e49c..5d6afef68eb 100644
--- a/examples/ad-bench/time_join.sh
+++ b/examples/ad-bench/time_join.sh
@@ -29,7 +29,7 @@ NT_DOM=$(get_nt_dom $1)
 
 join_domain () {
 	SERVER=$1
-	${NET} ads join -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads join -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -39,7 +39,7 @@ join_domain () {
 
 leave_domain () {
 	SERVER=$1
-	${NET} ads leave -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads leave -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
diff --git a/examples/ad-bench/time_ldap.sh b/examples/ad-bench/time_ldap.sh
index 586c56873eb..1f28a5d145a 100644
--- a/examples/ad-bench/time_ldap.sh
+++ b/examples/ad-bench/time_ldap.sh
@@ -11,7 +11,7 @@ NT_DOM=$(get_nt_dom $1)
 SERVER=$2
 
 search_users () {
-	${NET} ads search '(objectCategory=user)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=user)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -20,7 +20,7 @@ search_users () {
 }
 
 search_groups () {
-	${NET} ads search '(objectCategory=group)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=group)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
@@ -28,7 +28,7 @@ search_groups () {
 }
 
 search_computers () {
-	${NET} ads search '(objectCategory=computer)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=computer)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
@@ -36,7 +36,7 @@ search_computers () {
 }
 
 search_wildcard () {
-	${NET} ads search '(objectCategory=*)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(objectCategory=*)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
@@ -44,7 +44,7 @@ search_wildcard () {
 }
 
 search_unindexed () {
-	${NET} ads search '(description=Built-in account for adminstering the computer/domain)' sAMAccountName -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads search '(description=Built-in account for adminstering the computer/domain)' sAMAccountName -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
 		exit 1
diff --git a/examples/ad-bench/time_user.sh b/examples/ad-bench/time_user.sh
index 5380115628b..549960b1733 100644
--- a/examples/ad-bench/time_user.sh
+++ b/examples/ad-bench/time_user.sh
@@ -30,7 +30,7 @@ SERVER=$2
 
 add_user () {
 	USER=$1
-	${NET} ads user add "${USER}" 'Sup3rS3cr3T!' -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads user add "${USER}" 'Sup3rS3cr3T!' -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} ads user add returned error: $RET"
@@ -40,7 +40,7 @@ add_user () {
 
 del_user () {
 	USER=$1
-	${NET} ads user delete "${USER}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads user delete "${USER}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -49,7 +49,7 @@ del_user () {
 }
 
 enum_user () {
-	${NET} ads user -k -s $CONFIG_FILE -S $SERVER > /dev/null
+	${NET} ads user -k --configfile=$CONFIG_FILE -S $SERVER > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"
@@ -59,7 +59,7 @@ enum_user () {
 
 info_user () {
 	USER=$1
-	${NET} ads user info "${USER}" -k -s $CONFIG_FILE -S ${SERVER} > /dev/null
+	${NET} ads user info "${USER}" -k --configfile=$CONFIG_FILE -S ${SERVER} > /dev/null
 	RET=$?
 	if [ $RET -ne 0 ]; then
 		echo "${NET} returned error: $RET"