[PATCH 15/17] Support using system ldbmodify.

Jelmer Vernooij jelmer at samba.org
Sat Nov 1 13:22:07 MDT 2014


Fixes this test when bin/ldbmodify isn't built because we're using the
system ldbmodify.

Change-Id: I2ff0d9808245353006c6be4989976a3edad8f98e
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
---
 nsswitch/tests/test_rfc2307_mapping.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nsswitch/tests/test_rfc2307_mapping.sh b/nsswitch/tests/test_rfc2307_mapping.sh
index f1e3ea9..4fd93a4 100755
--- a/nsswitch/tests/test_rfc2307_mapping.sh
+++ b/nsswitch/tests/test_rfc2307_mapping.sh
@@ -19,7 +19,12 @@ failed=0
 samba4bindir="$BINDIR"
 wbinfo="$VALGRIND $samba4bindir/wbinfo"
 samba_tool="$VALGRIND $samba4bindir/samba-tool"
-ldbmodify="$samba4bindir/ldbmodify"
+if [ -f "$samba4bindir/ldbmodify" ]; then
+	ldbmodify="$samba4bindir/ldbmodify"
+else
+	# Using system ldbmodify
+	ldbmodify="ldbmodify"
+fi
 
 . `dirname $0`/../../testprogs/blackbox/subunit.sh
 
-- 
2.1.1



More information about the samba-technical mailing list