summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-19 16:26:00 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-19 16:26:00 +0200
commit163292f325981f233b6884e9c4675bf8ded88e6b (patch)
treea115297d8050ee1c65fb01c394bf6791d9814295 /source4/librpc
parent3fbcc2149e6d6acee30be32f3bb1ff82155f76a1 (diff)
parentacae07bc17d3e8dbafa5667711d25616f99a91a9 (diff)
downloadsamba-163292f325981f233b6884e9c4675bf8ded88e6b.tar.gz
samba-163292f325981f233b6884e9c4675bf8ded88e6b.tar.bz2
samba-163292f325981f233b6884e9c4675bf8ded88e6b.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/config.mk2
-rwxr-xr-xsource4/librpc/tests/test_ndrdump.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 8ace68fdb2..cf41f9884a 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -682,7 +682,7 @@ python_atsvc_OBJ_FILES = $(gen_ndrsrcdir)/py_atsvc.o
[PYTHON::python_dcerpc_nbt]
LIBRARY_REALNAME = samba/nbt.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC param swig_credentials python_dcerpc
+PRIVATE_DEPENDENCIES = NDR_NBT PYTALLOC param swig_credentials python_dcerpc python_dcerpc_misc python_dcerpc_security
python_dcerpc_nbt_OBJ_FILES = $(gen_ndrsrcdir)/py_nbt.o
diff --git a/source4/librpc/tests/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh
index dddfc0eae1..511856061c 100755
--- a/source4/librpc/tests/test_ndrdump.sh
+++ b/source4/librpc/tests/test_ndrdump.sh
@@ -8,9 +8,9 @@
failed=0
-samba4bindir=`dirname $0`/../../source4/bin
+samba4bindir=`dirname $0`/../../bin
ndrdump=$samba4bindir/ndrdump
-files=`dirname $0`/ndrdump
+files=`dirname $0`/
testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1`
testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1`