diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-04-23 15:12:35 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-04-23 15:12:35 +0200 |
| commit | 53d491c9a4011a7d9ad69db52fb91d163f3f990a (patch) | |
| tree | 9d0ed3130f35142da50c2e20e8addfe8909f459f /selftest | |
| parent | af6298a84dffb400551861c6dc34591f1473830c (diff) | |
| parent | 1722859abd169f2949b5822f97c810f2b8d162da (diff) | |
| download | samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.gz samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.tar.bz2 samba-53d491c9a4011a7d9ad69db52fb91d163f3f990a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba3.pm | 10 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index a36721406c..288ba8c8b7 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -505,7 +505,15 @@ sub provision($$$$$$) [print1] copy = tmp printable = yes - printing = test + printing = vlp + print command = $bindir_abs/vlp print %p %s + lpq command = $bindir_abs/vlp lpq %p + lp rm command = $bindir_abs/vlp lprm %p %j + lp pause command = $bindir_abs/vlp lppause %p %j + lp resume command = $bindir_abs/vlp lpresume %p %j + queue pause command = $bindir_abs/vlp queuepause %p + queue resume command = $bindir_abs/vlp queueresume %p + [print2] copy = print1 [print3] diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 1058ac66e0..781c9f3ae8 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -108,6 +108,7 @@ sub check_or_start($$$) } $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG}; + $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR}; $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD}; $ENV{NSS_WRAPPER_GROUP} = $env_vars->{NSS_WRAPPER_GROUP}; |