The branch, master has been updated
via 30b1e44... s3-selftest: enable RPC-SPOOLSS-DRIVER against s3.
via 6beec1a... s4-smbtorture: skip tests when no local driver directory
is around.
via 14bb3f7... s3-selftest: add print$ share with two arch dirs.
via 2a2de10... s3-selftest: add print$ share with two arch dirs.
from 4b1dab5... s3-winbind: fix setup_domain_child() callers.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 30b1e44382e1b81999c6388866305fb0324252a3
Author: Günther Deschner <[email protected]>
Date: Fri Apr 23 13:52:57 2010 +0200
s3-selftest: enable RPC-SPOOLSS-DRIVER against s3.
Guenther
commit 6beec1a04df635c9c8539e4837cc783e76b3c562
Author: Günther Deschner <[email protected]>
Date: Fri Apr 23 13:52:19 2010 +0200
s4-smbtorture: skip tests when no local driver directory is around.
Guenther
commit 14bb3f71aa3a2c23c5a0396deae4af9ab1e3ac5d
Author: Günther Deschner <[email protected]>
Date: Fri Apr 23 13:51:33 2010 +0200
s3-selftest: add print$ share with two arch dirs.
(make test variant)
Guenther
commit 2a2de10ac690ad13d3474a252729fc36c79321fc
Author: Günther Deschner <[email protected]>
Date: Fri Apr 23 13:51:02 2010 +0200
s3-selftest: add print$ share with two arch dirs.
Guenther
-----------------------------------------------------------------------
Summary of changes:
selftest/target/Samba3.pm | 8 ++++++++
source3/script/tests/selftest.sh | 8 ++++++++
source3/script/tests/test_posix_s3.sh | 1 +
source4/torture/rpc/spoolss.c | 4 ++++
4 files changed, 21 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 90873b8..e82ac7e 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -418,6 +418,12 @@ sub provision($$$$$$)
my $logdir="$prefix_abs/logs";
push(@dirs,$logdir);
+ my $driver32dir="$shrdir/W32X86";
+ push(@dirs,$driver32dir);
+
+ my $driver64dir="$shrdir/x64";
+ push(@dirs,$driver64dir);
+
# this gets autocreated by winbindd
my $wbsockdir="$prefix_abs/winbindd";
my $wbsockprivdir="$lockdir/winbindd_privileged";
@@ -575,6 +581,8 @@ sub provision($$$$$$)
copy = print1
[print4]
copy = print1
+[print\$]
+ copy = tmp
";
close(CONF);
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index fef80ab..54b1c9c 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -182,6 +182,12 @@ fi
chmod 777 $SHRDIR
##
+## Create driver share dirs
+##
+mkdir $SHRDIR/W32X86
+mkdir $SHRDIR/x64
+
+##
## Create a read-only directory.
##
RO_SHRDIR=`echo $SHRDIR | sed -e 's:/[^/]*$::'`
@@ -362,6 +368,8 @@ cat >$SERVERCONFFILE<<EOF
copy = print1
[print4]
copy = print1
+[print$]
+ copy = tmp
EOF
##
diff --git a/source3/script/tests/test_posix_s3.sh
b/source3/script/tests/test_posix_s3.sh
index 44464a4..0bd982a 100755
--- a/source3/script/tests/test_posix_s3.sh
+++ b/source3/script/tests/test_posix_s3.sh
@@ -43,6 +43,7 @@ rpc="$rpc RPC-SAMBA3-GETALIASMEMBERSHIP-0"
rpc="$rpc RPC-SAMBA3-NETLOGON RPC-SAMBA3-SESSIONKEY RPC-SAMBA3-GETUSERNAME"
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-SPOOLSS-DRIVER"
rpc="$rpc RPC-LSA-GETUSER RPC-LSA-LOOKUPSIDS RPC-LSA-LOOKUPNAMES"
rpc="$rpc RPC-LSA-PRIVILEGES "
rpc="$rpc RPC-SAMR RPC-SAMR-USERS RPC-SAMR-USERS-PRIVILEGES RPC-SAMR-PASSWORDS"
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 81b63e9..3cf1a93 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -7328,6 +7328,10 @@ static bool test_add_driver_arg(struct torture_context
*tctx,
fillup_printserver_info(tctx, p, d),
"failed to fillup printserver info");
+ if (!directory_exist(d->local.driver_directory)) {
+ torture_skip(tctx, "Skipping Printer Driver test as no local
driver is available");
+ }
+
torture_assert(tctx,
upload_printer_driver(tctx, dcerpc_server_name(p), d),
"failed to upload printer driver");
--
Samba Shared Repository
