The branch, master has been updated via b97d31abb44 nsswitch:tests: Use ldb(modify|search) from the system via 5ea3a15be68 manpages: samba-dcerpcd: fix typo (add missing space) from 5f2565f0a8e testprogs: Do not run tests if undump.sh is not available
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b97d31abb44717a35951a9fcbef0248a7fb150af Author: Andreas Schneider <a...@samba.org> Date: Thu Dec 1 15:49:43 2022 +0100 nsswitch:tests: Use ldb(modify|search) from the system If Samba is built against the system libldb, use the system tools. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Mon Dec 5 09:36:40 UTC 2022 on sn-devel-184 commit 5ea3a15be6896a0520382610e5d4ce6ac207aeec Author: Mikhail Novosyolov <m.novosyo...@rosalinux.ru> Date: Fri Oct 21 12:08:39 2022 +0300 manpages: samba-dcerpcd: fix typo (add missing space) Signed-off-by: Mikhail Novosyolov <m.novosyo...@rosalinux.ru> Reviewed-by: Andreas Schneider <a...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: docs-xml/manpages/samba-dcerpcd.8.xml | 2 +- nsswitch/tests/test_idmap_ad.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/manpages/samba-dcerpcd.8.xml b/docs-xml/manpages/samba-dcerpcd.8.xml index da8b77c9517..1e6f1918a17 100644 --- a/docs-xml/manpages/samba-dcerpcd.8.xml +++ b/docs-xml/manpages/samba-dcerpcd.8.xml @@ -70,7 +70,7 @@ helpers">true</smbconfoption> is set (the default setting), it is invoked on demand from <command>smbd</command> or <command>winbind</command> with a command line - containing--np-helper to serve DCERPC over named pipes + containing --np-helper to serve DCERPC over named pipes (np). It can also be used in a standalone mode where it is started separately from <command>smbd</command> or <command>winbind</command> via system startup scripts. If diff --git a/nsswitch/tests/test_idmap_ad.sh b/nsswitch/tests/test_idmap_ad.sh index 323aa1728d0..aef74bead96 100755 --- a/nsswitch/tests/test_idmap_ad.sh +++ b/nsswitch/tests/test_idmap_ad.sh @@ -16,8 +16,15 @@ TRUST_SERVER="$5" TRUST_PASSWORD="$6" wbinfo="$VALGRIND $BINDIR/wbinfo" -ldbmodify="$VALGRIND $BINDIR/ldbmodify" -ldbsearch="$VALGRIND $BINDIR/ldbsearch" +ldbmodify="${VALGRIND} ldbmodify" +if [ -x "${BINDIR}/ldbmodify" ]; then + ldbmodify="${VALGRIND} ${BINDIR}/ldbmodify" +fi + +ldbsearch="${VALGRIND} ldbsearch" +if [ -x "${BINDIR}/ldbsearch" ]; then + ldbsearch="${VALGRIND} ${BINDIR}/ldbsearch" +fi failed=0 -- Samba Shared Repository