diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/build_farm/basicsmb-domainsec-nt4.test | 10 | ||||
| -rw-r--r-- | testsuite/build_farm/basicsmb-domainsec.test | 11 | ||||
| -rw-r--r-- | testsuite/build_farm/basicsmb.smb.conf.template | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/testsuite/build_farm/basicsmb-domainsec-nt4.test b/testsuite/build_farm/basicsmb-domainsec-nt4.test index 933f8f9804..5bf3305516 100644 --- a/testsuite/build_farm/basicsmb-domainsec-nt4.test +++ b/testsuite/build_farm/basicsmb-domainsec-nt4.test @@ -6,15 +6,15 @@ fi test_joindomain_nt4() { - smbpasswd -a -m buildfarm$ + smbpasswd -L -a -m buildfarm$ - echo $prefix/bin/smbpasswd -L -j TESTWG - $prefix/bin/smbpasswd -L -j TESTWG + echo $prefix/bin/net rpc join oldstyle -S localhost + $prefix/bin/net rpc join oldstyle -S localhost status=$? if [ $status = 0 ]; then - echo "smbpasswd correctly joined the domain ($workgroup)" + echo "'net rpc join oldstyle' correctly joined the domain ($workgroup)" else - echo "smbpasswd failed to join the domain ($workgroup)! (status $status)" + echo "'net rpc join oldstyle' failed to join the domain ($workgroup)! (status $status)" return 1 fi return 0 diff --git a/testsuite/build_farm/basicsmb-domainsec.test b/testsuite/build_farm/basicsmb-domainsec.test index ff184c4c7f..5dd005a6ee 100644 --- a/testsuite/build_farm/basicsmb-domainsec.test +++ b/testsuite/build_farm/basicsmb-domainsec.test @@ -1,19 +1,16 @@ -if [ $whoami != "root" ]; then - exit 0; -fi . basicsmb.fns test_joindomain() { test_joindomain_password="$1" - echo "$prefix/bin/smbpasswd -L -j TESTWG -U $whoami%$test_join_domain_password" - $prefix/bin/smbpasswd -L -j TESTWG -U $whoami%$test_join_domain_password + echo "$prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password" + $prefix/bin/net rpc join -S localhost -U $whoami%$test_join_domain_password status=$? if [ $status = 0 ]; then - echo "smbpasswd correctly joined the domain ($workgroup)" + echo "'net rpc join' correctly joined the domain ($workgroup)" else - echo "smbpasswd failed to join the domain ($workgroup)! (status $status)" + echo "'net rpc join' failed to join the domain ($workgroup)! (status $status)" return 1 fi return 0 diff --git a/testsuite/build_farm/basicsmb.smb.conf.template b/testsuite/build_farm/basicsmb.smb.conf.template index ff837bbb09..8b75f299a2 100644 --- a/testsuite/build_farm/basicsmb.smb.conf.template +++ b/testsuite/build_farm/basicsmb.smb.conf.template @@ -17,6 +17,10 @@ panic action = echo bt | gdb PREFIX/sbin/smbd %d + passdb backend = smbpasswd_nua + + non unix account range = 10000-20000 + [test] path = PREFIX/testdir read only = no |