The branch, master has been updated
via 4612092 selftest: Remove spoolss tests from knownfail.
via 20cfa38 selftest: Add missing printing options for plugin_s4_dc.
via fb917eb file_server: Fix spoolss support with s3fs.
via bf36462 selftest: Define the log directory for s3fs.
from 5131359 auth/credentials: Support match-by-key in
cli_credentials_get_server_gss_creds()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 461209255d08a19c6e8b038c05251a0e9567298f
Author: Andreas Schneider <[email protected]>
Date: Thu Aug 30 13:55:17 2012 +0200
selftest: Remove spoolss tests from knownfail.
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Thu Aug 30 17:17:55 CEST 2012 on sn-devel-104
commit 20cfa38b9deb0e455e112e76c6c7174aca6233a8
Author: Andreas Schneider <[email protected]>
Date: Thu Aug 30 14:09:49 2012 +0200
selftest: Add missing printing options for plugin_s4_dc.
commit fb917eba47f52241ed2cac1bd3cbd207d9857d98
Author: Andreas Schneider <[email protected]>
Date: Thu Aug 30 15:11:41 2012 +0200
file_server: Fix spoolss support with s3fs.
commit bf36462555032a11b9399c0f89527bce63d8c5ca
Author: Andreas Schneider <[email protected]>
Date: Thu Aug 30 14:09:10 2012 +0200
selftest: Define the log directory for s3fs.
-----------------------------------------------------------------------
Summary of changes:
file_server/file_server.c | 2 +-
selftest/knownfail | 66 ---------------------------------------------
selftest/target/Samba4.pm | 27 ++++++++++++++++++
3 files changed, 28 insertions(+), 67 deletions(-)
Changeset truncated at 500 lines:
diff --git a/file_server/file_server.c b/file_server/file_server.c
index b6f7382..a3efcb2 100644
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -59,7 +59,7 @@ static const char *generate_smb_conf(struct task_server *task)
fdprintf(fd, "rpc_server:ntsvcs = embedded\n");
fdprintf(fd, "rpc_server:winreg = embedded\n");
fdprintf(fd, "rpc_server:spoolss = embedded\n");
- fdprintf(fd, "rpc_daemon:spoolssd = disabled\n");
+ fdprintf(fd, "rpc_daemon:spoolssd = embedded\n");
fdprintf(fd, "rpc_server:tcpip = no\n");
fdprintf(fd, "map hidden = no\n");
diff --git a/selftest/knownfail b/selftest/knownfail
index 7276543..ca5bef2 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -231,72 +231,6 @@
^samba3.rpc.eventlog.eventlog.OpenEventLog\(plugin_s4_dc\)
^samba3.rap.basic.netsessiongetinfo\(plugin_s4_dc\)
#
-# The spoolss bugs are due (at least in part) to missing configuration
-# in Samba4.pm. We want printing working in Samba 4.0, so these need
-# to be fixed one way or the other.
-#
-^samba3.rpc.spoolss.printserver.printserver.openprinter_badnamelist\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.printer_data_list\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_forms\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.forms\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.forms_winreg\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_ports\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.add_port\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.get_printer_driver_directory\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.get_print_processor_directory\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_printer_drivers\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_monitors\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_print_processors\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.print_processors_winreg\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_printprocdata\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_printers\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_ports_old\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_printers_servername\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.enum_printer_drivers_old\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printserver.printserver.architecture_buffer\(plugin_s4_dc\)
-^samba3.rpc.spoolss.win.win.testWinXP\(plugin_s4_dc\)
-^samba3.rpc.spoolss.notify.notify.testReplyOpenPrinter\(plugin_s4_dc\)
-^samba3.rpc.spoolss.notify.notify.testRFFPCNEx\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.openprinter\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.csetprinter\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printer_info\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.sd\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.dm\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printer_info_winreg\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.change_id\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.keys\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printerdata_consistency\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printerdata_keys\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printerdata_values\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printerdata_set\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printerdata_winreg\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printerdata_dsspooler\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinter.printer_rename\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.openprinter\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.csetprinter\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printer_info\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.sd\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.dm\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printer_info_winreg\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.change_id\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.keys\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printerdata_consistency\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printerdata_keys\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printerdata_values\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printerdata_set\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printerdata_winreg\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printerdata_dsspooler\(plugin_s4_dc\)
-^samba3.rpc.spoolss.printer.addprinterex.printer_rename\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.del_driver_unused_files\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.del_driver_all_files\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.multiple_drivers\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.add_driver_adobe_cupsaddsmb\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.add_driver_adobe\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.add_driver_ex_32\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.add_driver_32\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.add_driver_ex_64\(plugin_s4_dc\)
-^samba3.rpc.spoolss.driver.driver.add_driver_64\(plugin_s4_dc\)
-#
# The Samba4 netlogon server does not implement these LogonControl operations
#
^samba3.rpc.netlogon.admin.netlogon.LogonControl2\(plugin_s4_dc\)
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 28b40ad..21b8dcf 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -478,6 +478,7 @@ sub provision_raw_prepare($$$$$$$$$$)
$ctx->{privatedir} = "$prefix_abs/private";
$ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc";
$ctx->{lockdir} = "$prefix_abs/lockdir";
+ $ctx->{logdir} = "$prefix_abs/logs";
$ctx->{statedir} = "$prefix_abs/statedir";
$ctx->{cachedir} = "$prefix_abs/cachedir";
$ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket";
@@ -495,6 +496,7 @@ sub provision_raw_prepare($$$$$$$$$$)
push(@{$ctx->{directories}}, $ctx->{etcdir});
push(@{$ctx->{directories}}, $ctx->{piddir});
push(@{$ctx->{directories}}, $ctx->{lockdir});
+ push(@{$ctx->{directories}}, $ctx->{logdir});
push(@{$ctx->{directories}}, $ctx->{statedir});
push(@{$ctx->{directories}}, $ctx->{cachedir});
@@ -588,6 +590,7 @@ sub provision_raw_step1($$)
ldb:nosync = true
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
+ log file = $ctx->{logdir}/log.\%m
log level = $ctx->{server_loglevel}
lanman auth = Yes
rndc command = true
@@ -719,6 +722,12 @@ sub provision($$$$$$$$$)
push(@{$ctx->{directories}}, "$ctx->{share}");
push(@{$ctx->{directories}}, "$ctx->{share}/test1");
push(@{$ctx->{directories}}, "$ctx->{share}/test2");
+
+ # precreate directories for printer drivers
+ push(@{$ctx->{directories}}, "$ctx->{share}/W32X86");
+ push(@{$ctx->{directories}}, "$ctx->{share}/x64");
+ push(@{$ctx->{directories}}, "$ctx->{share}/WIN40");
+
my $msdfs = "no";
$msdfs = "yes" if ($server_role eq "domain controller");
$ctx->{smb_conf_extra_options} = "
@@ -1350,6 +1359,7 @@ sub provision_plugin_s4_dc($$)
my $bindir_abs = abs_path($self->{bindir});
my $lockdir="$prefix_abs/lockdir";
+ my $conffile="$prefix_abs/etc/smb.conf";
my $extra_smbconf_options = "
server services = -smb +s3fs
@@ -1375,6 +1385,9 @@ sub provision_plugin_s4_dc($$)
printcap name = /dev/null
+ addprinter command =
$ENV{SRCDIR_ABS}/source3/script/tests/printing/modprinter.pl -a -s $conffile --
+ deleteprinter command =
$ENV{SRCDIR_ABS}/source3/script/tests/printing/modprinter.pl -d -s $conffile --
+
printing = vlp
print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
lpq command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb lpq %p
@@ -1404,6 +1417,20 @@ sub provision_plugin_s4_dc($$)
[hideunread]
copy = tmp
hide unreadable = yes
+
+[print\$]
+ copy = tmp
+
+[print1]
+ copy = tmp
+ printable = yes
+
+[print2]
+ copy = print1
+[print3]
+ copy = print1
+[lp]
+ copy = print1
";
print "PROVISIONING PLUGIN S4 DC...";
--
Samba Shared Repository
