summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-01-20 14:30:58 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-01-20 14:30:58 +0000
commit1a74d8d1f0758d15c5c35d20e33d9868565812cf (patch)
tree7a0f62e8228770198cc5bb36de355c290ac77b44 /testsuite
parent32101155d4a0c80faf392f56a6baa7b91847dd99 (diff)
downloadsamba-1a74d8d1f0758d15c5c35d20e33d9868565812cf.tar.gz
samba-1a74d8d1f0758d15c5c35d20e33d9868565812cf.tar.bz2
samba-1a74d8d1f0758d15c5c35d20e33d9868565812cf.zip
This is another *BIG* change...
Samba now features a pluggable passdb interface, along the same lines as the one in use in the auth subsystem. In this case, only one backend may be active at a time by the 'normal' interface, and only one backend per passdb_context is permitted outside that. This pluggable interface is designed to allow any number of passdb backends to be compiled in, with the selection at runtime. The 'passdb backend' paramater has been created (and documented!) to support this. As such, configure has been modfied to allow (for example) --with-ldap and the old smbpasswd to be selected at the same time. This patch also introduces two new backends: smbpasswd_nua and tdbsam_nua. These two backends accept 'non unix accounts', where the user does *not* exist in /etc/passwd. These accounts' don't have UIDs in the unix sense, but to avoid conflicts in the algroitmic mapping of RIDs, they use the values specified in the 'non unix account range' paramter - in the same way as the winbind ranges are specifed. While I was at it, I cleaned up some of the code in pdb_tdb (code copied directly from smbpasswd and not really considered properly). Most of this was to do with % macro expansion on stored data. It isn't easy to get the macros into the tdb, and the first password change will 'expand' them. tdbsam needs to use a similar system to pdb_ldap in this regard. This patch only makes minor adjustments to pdb_nisplus and pdb_ldap, becouse I don't have the test facilities for these. I plan to incoroprate at least pdb_ldap into this scheme after consultation with Jerry. Each (converted) passdb module now no longer has any 'static' variables, and only exports 1 init function outside its .c file. The non-unix-account support in this patch has been proven! It is now possible to join a win2k machine to a Samba PDC without an account in /etc/passwd! Other changes: Minor interface adjustments: pdb_delete_sam_account() now takes a SAM_ACCOUNT, not a char*. pdb_update_sam_account() no longer takes the 'override' argument that was being ignored so often (every other passdb backend). Extra checks have been added in some places. Minor code changes: smbpasswd no longer attempts to initialise the passdb at startup, this is now done on first use. pdbedit has lost some of its 'machine account' logic, as this behaviour is now controlled by the passdb subsystem directly. The samr subsystem no longer calls 'local password change', but does the pdb interactions directly. This allow the ACB_ flags specifed to be transferred direct to the backend, without interference. Doco: I've updated the doco to reflect some of the changes, and removed some paramters no longer applicable to HEAD. (This used to be commit ff354c99c585068af6dc1ff35a1f109a806b326b)
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/build_farm/basicsmb-domainsec-nt4.test10
-rw-r--r--testsuite/build_farm/basicsmb-domainsec.test11
-rw-r--r--testsuite/build_farm/basicsmb.smb.conf.template4
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