diff options
| author | Andreas Schneider <asn@samba.org> | 2012-08-30 14:09:49 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-08-30 15:42:58 +0200 |
| commit | 20cfa38b9deb0e455e112e76c6c7174aca6233a8 (patch) | |
| tree | 01f6b2b1bcdcc83afe1e1657e6eb1a70708d53d9 | |
| parent | fb917eba47f52241ed2cac1bd3cbd207d9857d98 (diff) | |
| download | samba-20cfa38b9deb0e455e112e76c6c7174aca6233a8.tar.gz samba-20cfa38b9deb0e455e112e76c6c7174aca6233a8.tar.bz2 samba-20cfa38b9deb0e455e112e76c6c7174aca6233a8.zip | |
selftest: Add missing printing options for plugin_s4_dc.
| -rw-r--r-- | selftest/target/Samba4.pm | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 77e3e74921..21b8dcf72e 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -722,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} = " @@ -1353,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 @@ -1378,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 @@ -1407,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..."; |