The branch, master has been updated via 3bc18d9... s3-selftest: run RPC-EVENTLOG against s3. via bb91bbb... s3-test: setup initial eventlog infrastructure. via 3efaf5e... s3-selftest: setup initial eventlog infrastructure. via 453fed4... s4-smbtorture: skip BackupLog test against samba in RPC-EVENTLOG. from 4b80e14... s4:torture/rpc/samba3rpc.c: make use of dcerpc_binding_handle stubs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3bc18d9f67feea901cc9f8e254bf23429b03a4e7 Author: Günther Deschner <g...@samba.org> Date: Wed Mar 17 22:56:15 2010 +0100 s3-selftest: run RPC-EVENTLOG against s3. Guenther commit bb91bbb413132c62066e77c95c6dc4f1d8444628 Author: Günther Deschner <g...@samba.org> Date: Wed Mar 17 22:55:41 2010 +0100 s3-test: setup initial eventlog infrastructure. Guenther commit 3efaf5e6ba203df23151665baac821a7c09754d6 Author: Günther Deschner <g...@samba.org> Date: Wed Mar 17 22:55:00 2010 +0100 s3-selftest: setup initial eventlog infrastructure. Guenther commit 453fed4efd08fccd2979d0faf31a67facf133778 Author: Günther Deschner <g...@samba.org> Date: Wed Mar 17 22:44:44 2010 +0100 s4-smbtorture: skip BackupLog test against samba in RPC-EVENTLOG. Guenther ----------------------------------------------------------------------- Summary of changes: selftest/target/Samba3.pm | 13 +++++++++++++ source3/script/tests/selftest.sh | 7 ++++++- source3/script/tests/test_posix_s3.sh | 2 +- source4/torture/rpc/eventlog.c | 4 ++++ 4 files changed, 24 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index c3f696a..cc7713d 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -412,6 +412,9 @@ sub provision($$$$$$) my $lockdir="$prefix_abs/lockdir"; push(@dirs,$lockdir); + my $eventlogdir="$prefix_abs/lockdir/eventlog"; + push(@dirs,$eventlogdir); + my $logdir="$prefix_abs/logs"; push(@dirs,$logdir); @@ -438,6 +441,8 @@ sub provision($$$$$$) my $mod_printer_pl = "$ENV{PERL} $RealBin/../source3/script/tests/printing/modprinter.pl"; + my @eventlog_list = ("dns server", "application"); + open(CONF, ">$conffile") or die("Unable to open $conffile"); print CONF " [global] @@ -474,6 +479,8 @@ sub provision($$$$$$) addprinter command = $mod_printer_pl -a -s $conffile -- deleteprinter command = $mod_printer_pl -d -s $conffile -- + eventlog list = application \"dns server\" + kernel oplocks = no kernel change notify = no @@ -557,6 +564,12 @@ $unix_name-group:x:$unix_gids[0]: "; close(GROUP); + foreach my $evlog (@eventlog_list) { + my $evlogtdb = "$eventlogdir/$evlog.tdb"; + open(EVENTLOG, ">$evlogtdb") or die("Unable to open $evlogtdb"); + close(EVENTLOG); + } + $ENV{NSS_WRAPPER_PASSWD} = $nss_wrapper_passwd; $ENV{NSS_WRAPPER_GROUP} = $nss_wrapper_group; diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index e49bca8..e481c7e 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -95,6 +95,7 @@ COMMONCONFFILE=$LIBDIR/common.conf PRIVATEDIR=$PREFIX_ABS/private NCALRPCDIR=$PREFIX_ABS/ncalrpc LOCKDIR=$PREFIX_ABS/lockdir +EVENTLOGDIR=$LOCKDIR/eventlog LOGDIR=$PREFIX_ABS/logs SOCKET_WRAPPER_DIR=$PREFIX_ABS/sw CONFIGURATION="--configfile $CONFFILE" @@ -158,7 +159,7 @@ if test "x`smbd -b | grep NSS_WRAPPER`" = "x"; then fi -mkdir -p $PRIVATEDIR $NCALRPCDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR +mkdir -p $PRIVATEDIR $NCALRPCDIR $LIBDIR $PIDDIR $LOCKDIR $LOGDIR $EVENTLOGDIR mkdir -p $SOCKET_WRAPPER_DIR mkdir -p $WINBINDD_SOCKET_DIR chmod 755 $WINBINDD_SOCKET_DIR @@ -257,6 +258,7 @@ cat >$SERVERCONFFILE<<EOF addprinter command = $PERL $SRCDIR/../source3/script/tests/printing/modprinter.pl -a -s $SERVERCONFFILE -- deleteprinter command = $PERL $SRCDIR/../source3/script/tests/printing/modprinter.pl -d -s $SERVERCONFFILE -- + eventlog list = "dns server" application kernel oplocks = no kernel change notify = no @@ -352,6 +354,9 @@ nogroup:x:65534:nobody EOF fi +touch $EVENTLOGDIR/dns\ server.tdb +touch $EVENTLOGDIR/application.tdb + MAKE_TEST_BINARY="bin/smbpasswd" export MAKE_TEST_BINARY diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index eb78de7..f1b5608 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -41,7 +41,7 @@ rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC" rpc="$rpc RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC RPC-SAMBA3-WINREG" rpc="$rpc RPC-SAMBA3-GETALIASMEMBERSHIP-0" rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME" -rpc="$rpc RPC-SVCCTL RPC-NTSVCS RPC-WINREG" +rpc="$rpc RPC-SVCCTL RPC-NTSVCS RPC-WINREG RPC-EVENTLOG" rpc="$rpc RPC-SPOOLSS RPC-SPOOLSS-WIN RPC-SPOOLSS-NOTIFY RPC-SPOOLSS-PRINTER" rpc="$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES" rpc="$rpc RPC-LSA-PRIVILEGES " diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c index f0ad35f..101a8ce 100644 --- a/source4/torture/rpc/eventlog.c +++ b/source4/torture/rpc/eventlog.c @@ -386,6 +386,10 @@ static bool test_BackupLog(struct torture_context *tctx, struct eventlog_OpenUnknown0 unknown0; struct dcerpc_binding_handle *b = p->binding_handle; + if (torture_setting_bool(tctx, "samba3", false)) { + torture_skip(tctx, "skipping BackupLog test against samba"); + } + if (!get_policy_handle(tctx, b, &handle)) return false; -- Samba Shared Repository