[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  4519134 s3:tests: Fix test_net_tdb.sh with system tdb-tools
       via  79cb5cf selftest: Use the ad_dc with smbfs for ad_member env
      from  a078042 selftest: split a large system invocation line

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4519134ef72511c1d6a7321a6641dd869b4f2759
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Jan 10 09:32:49 2018 +0100

    s3:tests: Fix test_net_tdb.sh with system tdb-tools
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Wed Jan 10 18:30:56 CET 2018 on sn-devel-144

commit 79cb5cfa49abb6f928a6b95895c3c7f063b45472
Author: Andreas Schneider <asn at samba.org>
Date:   Thu Apr 6 08:50:06 2017 +0200

    selftest: Use the ad_dc with smbfs for ad_member env
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 selftest/target/Samba4.pm            | 6 +++---
 source3/script/tests/test_net_tdb.sh | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index e6bc3bb..628f4f1 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -2133,10 +2133,10 @@ sub setup_env($$$)
 	} elsif ($envname eq "chgdcpass") {
 		return $self->setup_chgdcpass("$path/chgdcpass", $self->{vars}->{chgdcpass});
 	} elsif ($envname eq "ad_member") {
-		if (not defined($self->{vars}->{ad_dc_ntvfs})) {
-			$self->setup_ad_dc_ntvfs("$path/ad_dc_ntvfs");
+		if (not defined($self->{vars}->{ad_dc})) {
+			$self->setup_ad_dc("$path/ad_dc");
 		}
-		return $target3->setup_admember("$path/ad_member", $self->{vars}->{ad_dc_ntvfs}, 29);
+		return $target3->setup_admember("$path/ad_member", $self->{vars}->{ad_dc}, 29);
 	} elsif ($envname eq "ad_dc") {
 		return $self->setup_ad_dc("$path/ad_dc");
 	} elsif ($envname eq "ad_dc_no_nss") {
diff --git a/source3/script/tests/test_net_tdb.sh b/source3/script/tests/test_net_tdb.sh
index 731cad3..61b1976 100755
--- a/source3/script/tests/test_net_tdb.sh
+++ b/source3/script/tests/test_net_tdb.sh
@@ -27,6 +27,11 @@ LOCKDIR=$8
 
 FILENAME=net_tdb_testfile
 
+samba_tdbtool=tdbtool
+if test -x $BINDIR/tdbtool; then
+	samba_tdbtool=$BINDIR/tdbtool
+fi
+
 failed=0
 
 incdir=`dirname $0`/../../../testprogs/blackbox
@@ -42,7 +47,7 @@ SMBCLIENTPID=$!
 sleep 1
 
 testit "Looking for record key of open file" \
-       $BINDIR/tdbtool $LOCKDIR/locking.tdb hexkeys || \
+	$samba_tdbtool $LOCKDIR/locking.tdb hexkeys || \
 	failed=$(expr $failed + 1)
 
 # The assumption here is that only one file is open, so only one
@@ -52,7 +57,7 @@ testit "Looking for record key of open file" \
 #[000] 01 FD 00 00 00 00 00 00  56 02 5C 00 00 00 00 00  ....... V.\....
 #[010] 00 00 00 00 00 00 00 00                           .......
 # Select only the hex data, remove space and join every thing together
-key=0x$($BINDIR/tdbtool $LOCKDIR/locking.tdb hexkeys | \
+key=0x$($samba_tdbtool $LOCKDIR/locking.tdb hexkeys | \
 	grep '\[' | cut -c 7-56 | sed -e 's/ //g' | tr -d '\n')
 
 testit "Looking for open file in locking.tdb" \


-- 
Samba Shared Repository