[SCM] Samba Shared Repository - branch master updated - 8c18d3a3164d36b3a3cdc09bb426e42e942d7e2e

[Jelmer Vernooij]

The branch, master has been updated
       via  8c18d3a3164d36b3a3cdc09bb426e42e942d7e2e (commit)
       via  2c1cd0c9fefc43124472f605694b11812d3d5d87 (commit)
      from  260c4e17e8bbb5feee2a5685e3acd887562c2bba (commit)

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


- Log -----------------------------------------------------------------
commit 8c18d3a3164d36b3a3cdc09bb426e42e942d7e2e
Merge: 2c1cd0c9fefc43124472f605694b11812d3d5d87 260c4e17e8bbb5feee2a5685e3acd887562c2bba
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jan 8 15:47:34 2009 +0100

    Merge branch 'master' of ssh://git.samba.org/data/git/samba

commit 2c1cd0c9fefc43124472f605694b11812d3d5d87
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Jan 8 15:23:35 2009 +0100

    Make sure smbtorture4 can find all gensec modules. (Fixes RPC-BINDSAMBA3)

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

Summary of changes:
 source3/script/tests/selftest.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index e8adc32..4786a78 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -164,6 +164,7 @@ cat >$SAMBA4CONFFILE<<EOF
 	interfaces = $TORTURE_INTERFACES
 	panic action = $SCRIPTDIR/gdb_backtrace %PID% %PROG%
 	include = $COMMONCONFFILE
+	modules dir = $SRCDIR/bin/modules
 EOF
 
 cat >$SERVERCONFFILE<<EOF


-- 
Samba Shared Repository