From 391f9aaf0571c54a9748247cb4a2b1ee437eaef4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 30 Aug 2005 10:47:51 +0000 Subject: r9785: Add some testdata (This used to be commit 721431cff73b06d6e74ca47d25adbf89b900fd5a) --- testdata/samba3/account_policy.tdb | Bin 0 -> 8192 bytes testdata/samba3/registry.tdb | Bin 0 -> 8192 bytes testdata/samba3/samba3.ldif | 200 +++++++++++++++++++++++++++++++++++++ testdata/samba3/wins.dat | 23 +++++ 4 files changed, 223 insertions(+) create mode 100644 testdata/samba3/account_policy.tdb create mode 100644 testdata/samba3/registry.tdb create mode 100644 testdata/samba3/samba3.ldif create mode 100644 testdata/samba3/wins.dat (limited to 'testdata/samba3') diff --git a/testdata/samba3/account_policy.tdb b/testdata/samba3/account_policy.tdb new file mode 100644 index 0000000000..ece960af0e Binary files /dev/null and b/testdata/samba3/account_policy.tdb differ diff --git a/testdata/samba3/registry.tdb b/testdata/samba3/registry.tdb new file mode 100644 index 0000000000..a87b2ec67c Binary files /dev/null and b/testdata/samba3/registry.tdb differ diff --git a/testdata/samba3/samba3.ldif b/testdata/samba3/samba3.ldif new file mode 100644 index 0000000000..035eb1c516 --- /dev/null +++ b/testdata/samba3/samba3.ldif @@ -0,0 +1,200 @@ +dn: ou=Users,ou=Tests,dc=vernstok,dc=nl +objectClass: organizationalUnit +ou: Users + +dn: ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: organizationalUnit +ou: Groups + +dn: uid=nobody,ou=Users,ou=Tests,dc=vernstok,dc=nl +cn: nobody +sn: nobody +objectClass: inetOrgPerson +objectClass: sambaSAMAccount +objectClass: posixAccount +objectClass: shadowAccount +gidNumber: 514 +uid: nobody +uidNumber: 999 +homeDirectory: /dev/null +sambaPwdLastSet: 0 +sambaLogonTime: 0 +sambaLogoffTime: 2147483647 +sambaKickoffTime: 2147483647 +sambaPwdCanChange: 0 +sambaPwdMustChange: 2147483647 +sambaHomePath: \\PDC-SMB3\home\%U +sambaHomeDrive: H: +sambaProfilePath: \\PDC-SMB3\profiles\%U\nobody +sambaPrimaryGroupSID: S-1-5-21-4231626423-2410014848-2360679739-514 +sambaLMPassword: NO PASSWORDXXXXXXXXXXXXXXXXXXXXX +sambaNTPassword: NO PASSWORDXXXXXXXXXXXXXXXXXXXXX +sambaAcctFlags: [NU ] +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2998 +loginShell: /bin/false + +dn: cn=Domain Admins,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 512 +cn: Domain Admins +memberUid: Administrator +description: Netbios Domain Administrators +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-512 +sambaGroupType: 2 +displayName: Domain Admins + +dn: cn=Domain Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 513 +cn: Domain Users +description: Netbios Domain Users +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-513 +sambaGroupType: 2 +displayName: Domain Users + +dn: cn=Domain Guests,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 514 +cn: Domain Guests +description: Netbios Domain Guests Users +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-514 +sambaGroupType: 2 +displayName: Domain Guests + +dn: cn=Print Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 550 +cn: Print Operators +description: Netbios Domain Print Operators +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-550 +sambaGroupType: 2 +displayName: Print Operators + +dn: cn=Backup Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 551 +cn: Backup Operators +description: Netbios Domain Members can bypass file security to back up files +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-551 +sambaGroupType: 2 +displayName: Backup Operators + +dn: cn=Replicator,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 552 +cn: Replicator +description: Netbios Domain Supports file replication in a sambaDomainName +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-552 +sambaGroupType: 2 +displayName: Replicator + +dn: cn=Domain Computers,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 553 +cn: Domain Computers +description: Netbios Domain Computers accounts +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-553 +sambaGroupType: 2 +displayName: Domain Computers + +dn: cn=Administrators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 544 +cn: Administrators +description: Netbios Domain Members can fully administer the computer/sambaDomainName +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-544 +sambaGroupType: 2 +displayName: Administrators + +dn: cn=Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 545 +cn: Users +description: Netbios Domain Ordinary users +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-545 +sambaGroupType: 2 +displayName: users + +dn: cn=Guests,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 546 +cn: Guests +memberUid: nobody +description: Netbios Domain Users granted guest access to the computer/sambaDomainName +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-546 +sambaGroupType: 2 +displayName: Guests + +dn: cn=Power Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 547 +cn: Power Users +description: Netbios Domain Members can share directories and printers +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-547 +sambaGroupType: 2 +displayName: Power Users + +dn: cn=Account Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 548 +cn: Account Operators +description: Netbios Domain Users to manipulate users accounts +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-548 +sambaGroupType: 2 +displayName: Account Operators + +dn: cn=Server Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +objectClass: posixGroup +objectClass: sambaGroupMapping +gidNumber: 549 +cn: Server Operators +description: Netbios Domain Server Operators +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-549 +sambaGroupType: 2 +displayName: Server Operators + +dn: ou=Computers,ou=Tests,dc=vernstok,dc=nl +objectClass: organizationalUnit +ou: Computers + +dn: uid=Administrator,ou=Users,ou=Tests,dc=vernstok,dc=nl +cn: Administrator +sn: Administrator +objectClass: inetOrgPerson +objectClass: sambaSAMAccount +objectClass: posixAccount +objectClass: shadowAccount +gidNumber: 512 +uid: Administrator +uidNumber: 0 +homeDirectory: /home/%U +sambaPwdLastSet: 0 +sambaLogonTime: 0 +sambaLogoffTime: 2147483647 +sambaKickoffTime: 2147483647 +sambaPwdCanChange: 0 +sambaPwdMustChange: 2147483647 +sambaHomePath: \\PDC-SMB3\home\%U +sambaHomeDrive: H: +sambaProfilePath: \\PDC-SMB3\profiles\%U\Administrator +sambaPrimaryGroupSID: S-1-5-21-4231626423-2410014848-2360679739-512 +sambaLMPassword: XXX +sambaNTPassword: XXX +sambaAcctFlags: [U ] +sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2996 +loginShell: /bin/false +gecos: Netbios Domain Administrator + + diff --git a/testdata/samba3/wins.dat b/testdata/samba3/wins.dat new file mode 100644 index 0000000000..f636b3d190 --- /dev/null +++ b/testdata/samba3/wins.dat @@ -0,0 +1,23 @@ +VERSION 1 0 +"ADMINISTRATOR#03" 1124185120 192.168.1.5 64R +"AURELIA#00" 1125117925 192.168.8.6 44R +"AURELIA#20" 1125117921 192.168.8.6 44R +"AVALLACH#00" 1125049158 192.168.1.5 64R +"AVALLACH#03" 1125101210 192.168.1.5 64R +"AVALLACH#20" 1125101209 192.168.1.5 64R +"AVALLACH$#03" 1125101125 192.168.1.5 64R +"GANIEDA#00" 1125148158 192.168.4.34 64R +"GANIEDA#03" 1125148158 192.168.4.34 64R +"GANIEDA#20" 1125148158 192.168.4.34 64R +"GANIEDA$#03" 1125173455 192.168.4.34 64R +"MERLIN#00" 1125137792 192.168.1.7 64R +"MERLIN#03" 1125137792 192.168.1.7 64R +"MERLIN#20" 1125137792 192.168.1.7 64R +"RHONWYN#00" 1125107162 192.168.1.1 192.168.4.1 192.168.0.7 66R +"RHONWYN#03" 1125107162 192.168.1.1 192.168.4.1 192.168.0.7 66R +"RHONWYN#20" 1125107162 192.168.1.1 192.168.4.1 192.168.0.7 66R +"MYDOMAIN#00" 1125107162 255.255.255.255 e4R +"MYDOMAIN#1b" 1125107162 192.168.1.1 192.168.4.1 192.168.0.7 64R +"MYDOMAIN#1c" 1125107162 192.168.1.1 192.168.4.1 192.168.0.7 e4R +"MYDOMAIN#1e" 1125107162 255.255.255.255 e4R +"WORKGROUP#00" 1125117930 255.255.255.255 e4R -- cgit From cf016f972b931b54c155ca8e6df485e05c37b034 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 30 Aug 2005 16:09:38 +0000 Subject: r9805: Add 'data' property to param EJS object Write out new smb.conf file. Parameters that have disappeared between Samba 3 and 4 will optionally be prefixed with 'samba3:' (This used to be commit 27eefbd9059fe0a3daca15a71da7b4cb88ed22ec) --- testdata/samba3/share_info.tdb | Bin 0 -> 8192 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 testdata/samba3/share_info.tdb (limited to 'testdata/samba3') diff --git a/testdata/samba3/share_info.tdb b/testdata/samba3/share_info.tdb new file mode 100644 index 0000000000..2861748907 Binary files /dev/null and b/testdata/samba3/share_info.tdb differ -- cgit From 81952ea4e8f17e848b3dba487a38787cf5ae304c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 30 Aug 2005 16:30:11 +0000 Subject: r9806: Some more test data (This used to be commit 96a511b6de08385d58998f5ae5f4f569c9b730cf) --- testdata/samba3/group_mapping.tdb | Bin 0 -> 8192 bytes testdata/samba3/passdb.tdb | Bin 0 -> 8192 bytes testdata/samba3/registry.tdb | Bin 8192 -> 8192 bytes testdata/samba3/secrets.tdb | Bin 0 -> 8192 bytes testdata/samba3/share_info.tdb | Bin 8192 -> 8192 bytes testdata/samba3/smb.conf | 23 +++++++++++++++++++++++ testdata/samba3/winbindd_idmap.tdb | Bin 0 -> 8192 bytes 7 files changed, 23 insertions(+) create mode 100644 testdata/samba3/group_mapping.tdb create mode 100644 testdata/samba3/passdb.tdb create mode 100644 testdata/samba3/secrets.tdb create mode 100644 testdata/samba3/smb.conf create mode 100644 testdata/samba3/winbindd_idmap.tdb (limited to 'testdata/samba3') diff --git a/testdata/samba3/group_mapping.tdb b/testdata/samba3/group_mapping.tdb new file mode 100644 index 0000000000..e1be1d4714 Binary files /dev/null and b/testdata/samba3/group_mapping.tdb differ diff --git a/testdata/samba3/passdb.tdb b/testdata/samba3/passdb.tdb new file mode 100644 index 0000000000..e32d7be628 Binary files /dev/null and b/testdata/samba3/passdb.tdb differ diff --git a/testdata/samba3/registry.tdb b/testdata/samba3/registry.tdb index a87b2ec67c..85045cacb9 100644 Binary files a/testdata/samba3/registry.tdb and b/testdata/samba3/registry.tdb differ diff --git a/testdata/samba3/secrets.tdb b/testdata/samba3/secrets.tdb new file mode 100644 index 0000000000..f9a0f7ba5d Binary files /dev/null and b/testdata/samba3/secrets.tdb differ diff --git a/testdata/samba3/share_info.tdb b/testdata/samba3/share_info.tdb index 2861748907..ba4268f847 100644 Binary files a/testdata/samba3/share_info.tdb and b/testdata/samba3/share_info.tdb differ diff --git a/testdata/samba3/smb.conf b/testdata/samba3/smb.conf new file mode 100644 index 0000000000..b0b74d008d --- /dev/null +++ b/testdata/samba3/smb.conf @@ -0,0 +1,23 @@ +[global] + workgroup = SAMBA + security = user + passdb backend = smbpasswd:smbpasswd tdbsam:passdb.tdb ldapsam:tdb://samba3.ldb + debug level = 5 + +[cd1] +path = /mnt/cd1 +public = yes + +[cd2] +path = /mnt/cd2 +public = yes + +[media] +path = /media +public = yes + +[tmp] +path = /tmp +guest only = yes +public = yes +read only = no diff --git a/testdata/samba3/winbindd_idmap.tdb b/testdata/samba3/winbindd_idmap.tdb new file mode 100644 index 0000000000..aa4fa53952 Binary files /dev/null and b/testdata/samba3/winbindd_idmap.tdb differ -- cgit From 40f85ace04abad7460d0f0afe9211c4280482c6c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 30 Aug 2005 22:38:34 +0000 Subject: r9813: Conver testsuite for samba3sam module to EJS (This used to be commit 77f24ed131bf57c30bb500e1d8d387bd4b403ddc) --- testdata/samba3/smbpasswd | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 testdata/samba3/smbpasswd (limited to 'testdata/samba3') diff --git a/testdata/samba3/smbpasswd b/testdata/samba3/smbpasswd new file mode 100644 index 0000000000..6e3c34dfaa --- /dev/null +++ b/testdata/samba3/smbpasswd @@ -0,0 +1,3 @@ +nobodypw:65534:B28BD20B0D3770EBAAD3B435B51404EE:B123AB4EC733F895B1260A3A08D9C69B:[NU ]:LCT-43148525: +rootpw:0:552902031BEDE9EFAAD3B435B51404EE:878D8014606CDA29677A44EFA1353FC7:[U ]:LCT-4314851B: +jelmerpw:1000:193130B61A7F81C0AAD3B435B51404EE:C2AE1FE6E648846352453E816F2AEB93:[U ]:LCT-4314850D: -- cgit From a0e672af9e5ddbb35a53d8b906e735a1d48849ce Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 31 Aug 2005 14:30:56 +0000 Subject: r9828: Fix path to testdata (tests are always run from source/) (This used to be commit 76666d401071bf9b67b0402efc1d647f45533259) --- testdata/samba3/smb.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/smb.conf b/testdata/samba3/smb.conf index b0b74d008d..a903dc2c3e 100644 --- a/testdata/samba3/smb.conf +++ b/testdata/samba3/smb.conf @@ -1,7 +1,7 @@ [global] workgroup = SAMBA security = user - passdb backend = smbpasswd:smbpasswd tdbsam:passdb.tdb ldapsam:tdb://samba3.ldb + passdb backend = smbpasswd:../testdata/samba3/smbpasswd tdbsam:../testdata/samba3/passdb.tdb ldapsam:tdb://samba3.ldb debug level = 5 [cd1] -- cgit From 2f23a8cec1537439fef3456389d55d95c5e78493 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 31 Aug 2005 15:46:41 +0000 Subject: r9830: Fix support for importing registry values. Extended the examplre registry tdb. (This used to be commit 11e2a1938966f3aa9e9c25433181c20843951a6b) --- testdata/samba3/registry.tdb | Bin 8192 -> 8192 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/registry.tdb b/testdata/samba3/registry.tdb index 85045cacb9..9d64e02d84 100644 Binary files a/testdata/samba3/registry.tdb and b/testdata/samba3/registry.tdb differ -- cgit From 0712cbdab4c397b9f74fcd681f40df9c9c2c59a8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 31 Aug 2005 16:51:09 +0000 Subject: r9834: More tests for the upgrade from Samba3 (This used to be commit d2db164d6f674cada470e871c558c75f98244141) --- testdata/samba3/verify | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100755 testdata/samba3/verify (limited to 'testdata/samba3') diff --git a/testdata/samba3/verify b/testdata/samba3/verify new file mode 100755 index 0000000000..ed6ed95189 --- /dev/null +++ b/testdata/samba3/verify @@ -0,0 +1,51 @@ +#!/usr/bin/env smbscript +/* Verifies that the data present in this directory + Can be read correctly by Samba4. Do not update + without changing the corresponding TDB file! + Written by Jelmer Vernooij, 2005. + */ + +libinclude("base.js"); + +var path = substr(ARGV[0], 0, -strlen("verify")); +printf("Reading from %s\n", path); + +var s = samba3_read(path, path+"smb.conf"); +assert(s != undefined); + +// smb.conf checks +assert(s.configuration.get("passdb backend") != undefined); + +var data = s.configuration.data(); +assert(data != undefined); +var global = data["global"]; +assert(global != undefined); +assert(global["passdb backend"] == s.configuration.get("passdb backend")); +assert(global["passdb backend"] != undefined); + +println("smb.conf ok"); + +assert(s.winsentries.length == 22); +assert(s.samaccounts.length == 3); +assert(s.shares.length == 0); +assert(s.registry.keys.length == 28); +assert(s.groupmappings.length == 13); +assert(s.aliases.length == 0); +assert(s.idmapdb.mappings.length == 4); + +println("database entry count correct"); + +// account policies +assert(s.policy.min_password_length == 5); +assert(s.policy.minimum_password_age == 0); +assert(s.policy.maximum_password_age == 999999999); +assert(s.policy.refuse_machine_password_change == 0); +assert(s.policy.reset_count_minutes == 0); +assert(s.policy.disconnect_time == -1); +assert(s.policy.user_must_logon_to_change_password == 0); +assert(s.policy.password_history == 0); +assert(s.policy.lockout_duration == 0); +assert(s.policy.bad_lockout_minutes == 0); + +println("account policies ok"); + -- cgit From e2e2508b586a112e612bf3660f80d25c9bf8bc90 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 1 Sep 2005 15:33:31 +0000 Subject: r9899: Be more conservative about what is sent to the remote server in ldb_map. (This used to be commit 76e943d4416e38ce4cce27d5403bc3e133d0025b) --- testdata/samba3/samba3.ldif | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/samba3.ldif b/testdata/samba3/samba3.ldif index 035eb1c516..67c0ae1432 100644 --- a/testdata/samba3/samba3.ldif +++ b/testdata/samba3/samba3.ldif @@ -1,12 +1,19 @@ -dn: ou=Users,ou=Tests,dc=vernstok,dc=nl +dn: sambaDomainName=TESTS,dc=vernstok,dc=nl +objectclass: sambaDomain +objectclass: top +sambaSID: S-1-5-21-4231626423-2410014848-2360679739 +sambaNextRid: 2000 +sambaDomainName: TESTS + +dn: ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: organizationalUnit ou: Users -dn: ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: organizationalUnit ou: Groups -dn: uid=nobody,ou=Users,ou=Tests,dc=vernstok,dc=nl +dn: uid=nobody,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl cn: nobody sn: nobody objectClass: inetOrgPerson @@ -33,7 +40,7 @@ sambaAcctFlags: [NU ] sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2998 loginShell: /bin/false -dn: cn=Domain Admins,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Domain Admins,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 512 @@ -44,7 +51,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-512 sambaGroupType: 2 displayName: Domain Admins -dn: cn=Domain Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Domain Users,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 513 @@ -54,7 +61,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-513 sambaGroupType: 2 displayName: Domain Users -dn: cn=Domain Guests,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Domain Guests,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 514 @@ -64,7 +71,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-514 sambaGroupType: 2 displayName: Domain Guests -dn: cn=Print Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Print Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 550 @@ -74,7 +81,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-550 sambaGroupType: 2 displayName: Print Operators -dn: cn=Backup Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Backup Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 551 @@ -84,7 +91,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-551 sambaGroupType: 2 displayName: Backup Operators -dn: cn=Replicator,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Replicator,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 552 @@ -94,7 +101,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-552 sambaGroupType: 2 displayName: Replicator -dn: cn=Domain Computers,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Domain Computers,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 553 @@ -104,7 +111,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-553 sambaGroupType: 2 displayName: Domain Computers -dn: cn=Administrators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Administrators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 544 @@ -114,7 +121,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-544 sambaGroupType: 2 displayName: Administrators -dn: cn=Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Users,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 545 @@ -124,7 +131,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-545 sambaGroupType: 2 displayName: users -dn: cn=Guests,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Guests,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 546 @@ -135,7 +142,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-546 sambaGroupType: 2 displayName: Guests -dn: cn=Power Users,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Power Users,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 547 @@ -145,7 +152,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-547 sambaGroupType: 2 displayName: Power Users -dn: cn=Account Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Account Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 548 @@ -155,7 +162,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-548 sambaGroupType: 2 displayName: Account Operators -dn: cn=Server Operators,ou=Groups,ou=Tests,dc=vernstok,dc=nl +dn: cn=Server Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 549 @@ -165,11 +172,11 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-549 sambaGroupType: 2 displayName: Server Operators -dn: ou=Computers,ou=Tests,dc=vernstok,dc=nl +dn: ou=Computers,sambaDomainName=TESTS,dc=vernstok,dc=nl objectClass: organizationalUnit ou: Computers -dn: uid=Administrator,ou=Users,ou=Tests,dc=vernstok,dc=nl +dn: uid=Administrator,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl cn: Administrator sn: Administrator objectClass: inetOrgPerson -- cgit From 027583e6de2a6981d1c0e8959e1e37bf758be8f9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 13 Aug 2006 23:58:04 +0000 Subject: r17525: This is a merge from the Google Summer of Code 2006 project by Martin Kühl . MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Martin took over the work done last year by Jelmer, in last year's SoC. This was a substanital task, as the the ldb modules API changed significantly during the past year, with the addition of async calls. This changeset reimplements and enables the ldb_map ldb module and adapts the example module and test case, both named samba3sam, to the implementation. The ldb_map module supports splitting an ldb database into two parts (called the "local" and "remote" part) and storing the data in one of them (the remote database) in a different format while the other acts as a fallback. This allows ldb to e.g. store to and load data from a remote LDAP server and present it according to the Samba4 schema while still allowing the LDAP to present and modify its data separately. A complex example of this is the samba3sam module (by Jelmer Vernooij), which maps data between the samba3 and samba4 schemas. A simpler example is given by the entryUUID module (by Andrew Bartlett), which handles some of the differences between AD and OpenLDAP in operational attributes. It principally maps objectGUID, to and from entryUUID elements. This is also an example of a module that doesn't use the local backend as fallback storage. This merge also splits the ldb_map.c file into smaller, more manageable parts. (This used to be commit af2bece4d343a9f787b2e3628848b266cec2b9f0) --- testdata/samba3/samba3.ldif | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/samba3.ldif b/testdata/samba3/samba3.ldif index 67c0ae1432..470f7ff246 100644 --- a/testdata/samba3/samba3.ldif +++ b/testdata/samba3/samba3.ldif @@ -1,19 +1,19 @@ -dn: sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: sambaDomainName=TESTS,${BASEDN} objectclass: sambaDomain objectclass: top sambaSID: S-1-5-21-4231626423-2410014848-2360679739 sambaNextRid: 2000 sambaDomainName: TESTS -dn: ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: ou=Users,sambaDomainName=TESTS,${BASEDN} objectClass: organizationalUnit ou: Users -dn: ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: organizationalUnit ou: Groups -dn: uid=nobody,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: uid=nobody,ou=Users,sambaDomainName=TESTS,${BASEDN} cn: nobody sn: nobody objectClass: inetOrgPerson @@ -40,7 +40,7 @@ sambaAcctFlags: [NU ] sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2998 loginShell: /bin/false -dn: cn=Domain Admins,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Domain Admins,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 512 @@ -51,7 +51,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-512 sambaGroupType: 2 displayName: Domain Admins -dn: cn=Domain Users,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Domain Users,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 513 @@ -61,7 +61,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-513 sambaGroupType: 2 displayName: Domain Users -dn: cn=Domain Guests,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Domain Guests,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 514 @@ -71,7 +71,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-514 sambaGroupType: 2 displayName: Domain Guests -dn: cn=Print Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Print Operators,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 550 @@ -81,7 +81,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-550 sambaGroupType: 2 displayName: Print Operators -dn: cn=Backup Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Backup Operators,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 551 @@ -91,7 +91,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-551 sambaGroupType: 2 displayName: Backup Operators -dn: cn=Replicator,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Replicator,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 552 @@ -101,7 +101,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-552 sambaGroupType: 2 displayName: Replicator -dn: cn=Domain Computers,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Domain Computers,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 553 @@ -111,7 +111,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-553 sambaGroupType: 2 displayName: Domain Computers -dn: cn=Administrators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Administrators,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 544 @@ -121,7 +121,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-544 sambaGroupType: 2 displayName: Administrators -dn: cn=Users,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Users,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 545 @@ -131,7 +131,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-545 sambaGroupType: 2 displayName: users -dn: cn=Guests,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Guests,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 546 @@ -142,7 +142,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-546 sambaGroupType: 2 displayName: Guests -dn: cn=Power Users,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Power Users,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 547 @@ -152,7 +152,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-547 sambaGroupType: 2 displayName: Power Users -dn: cn=Account Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Account Operators,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 548 @@ -162,7 +162,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-548 sambaGroupType: 2 displayName: Account Operators -dn: cn=Server Operators,ou=Groups,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: cn=Server Operators,ou=Groups,sambaDomainName=TESTS,${BASEDN} objectClass: posixGroup objectClass: sambaGroupMapping gidNumber: 549 @@ -172,11 +172,11 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-549 sambaGroupType: 2 displayName: Server Operators -dn: ou=Computers,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: ou=Computers,sambaDomainName=TESTS,${BASEDN} objectClass: organizationalUnit ou: Computers -dn: uid=Administrator,ou=Users,sambaDomainName=TESTS,dc=vernstok,dc=nl +dn: uid=Administrator,ou=Users,sambaDomainName=TESTS,${BASEDN} cn: Administrator sn: Administrator objectClass: inetOrgPerson -- cgit From 3ecfa9958eab6cf02aed6a740fe3beb2bc189a21 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 15 Aug 2006 02:18:32 +0000 Subject: r17545: I forgot to commit this file, a source file for the the samba3sam tests, by mkhl. Andrew Bartlett (This used to be commit f6844d04e391e9d2a2f9178458de9212509a01ac) --- testdata/samba3/provision_samba3sam.ldif | 201 +++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 testdata/samba3/provision_samba3sam.ldif (limited to 'testdata/samba3') diff --git a/testdata/samba3/provision_samba3sam.ldif b/testdata/samba3/provision_samba3sam.ldif new file mode 100644 index 0000000000..27a61c7263 --- /dev/null +++ b/testdata/samba3/provision_samba3sam.ldif @@ -0,0 +1,201 @@ +dn: @INDEXLIST +@IDXATTR: name +@IDXATTR: sAMAccountName +@IDXATTR: objectSid +@IDXATTR: objectClass +@IDXATTR: objectCategory +@IDXATTR: member +@IDXATTR: uidNumber +@IDXATTR: gidNumber +@IDXATTR: unixName +@IDXATTR: privilege +@IDXATTR: nCName + +dn: @ATTRIBUTES +userPrincipalName: CASE_INSENSITIVE +servicePrincipalName: CASE_INSENSITIVE +dnsDomain: CASE_INSENSITIVE +dnsRoot: CASE_INSENSITIVE +nETBIOSName: CASE_INSENSITIVE +cn: CASE_INSENSITIVE +dc: CASE_INSENSITIVE +name: CASE_INSENSITIVE +dn: CASE_INSENSITIVE +sAMAccountName: CASE_INSENSITIVE +objectClass: CASE_INSENSITIVE +sambaPassword: HIDDEN +krb5Key: HIDDEN +ntPwdHash: HIDDEN +sambaNTPwdHistory: HIDDEN +lmPwdHash: HIDDEN +sambaLMPwdHistory: HIDDEN +createTimestamp: HIDDEN +modifyTimestamp: HIDDEN +groupType: INTEGER +sAMAccountType: INTEGER +systemFlags: INTEGER +userAccountControl: INTEGER + +dn: @SUBCLASSES +top: domain +top: person +top: group +domain: domainDNS +domain: builtinDomain +person: organizationalPerson +organizationalPerson: user +user: computer +template: userTemplate +template: groupTemplate + +dn: @KLUDGEACL +passwordAttribute: sambaPassword +passwordAttribute: ntPwdHash +passwordAttribute: sambaNTPwdHistory +passwordAttribute: lmPwdHash +passwordAttribute: sambaLMPwdHistory +passwordAttribute: krb5key + +# the rootDSE module looks in this record for its base data +dn: cn=ROOTDSE +subschemaSubentry: CN=Aggregate,CN=Schema,CN=Configuration,${BASEDN} +dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,${BASEDN} +defaultNamingContext: ${BASEDN} +rootDomainNamingContext: ${BASEDN} +configurationNamingContext: CN=Configuration,${BASEDN} +schemaNamingContext: CN=Schema,CN=Configuration,${BASEDN} +supportedLDAPVersion: 3 +dnsHostName: ${DNSNAME} +ldapServiceName: ${DNSDOMAIN}:${NETBIOSNAME}$@${REALM} +serverName: CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site,CN=Sites,CN=Configuration,${BASEDN} +domainFunctionality: 0 +forestFunctionality: 0 +domainControllerFunctionality: 2 +isSynchronized: TRUE +vendorName: Samba Team (http://samba.org) +vendorVersion: ${VERSION} + +dn: CN=Templates +objectClass: top +objectClass: container +cn: Templates +description: Container for SAM account templates +instanceType: 4 +showInAdvancedViewOnly: TRUE +systemFlags: 2348810240 +objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN} +isCriticalSystemObject: TRUE + +### +# note! the template users must not match normal searches. Be careful +# with what classes you put them in +### + +dn: CN=TemplateUser,CN=Templates +objectClass: top +objectClass: person +objectClass: organizationalPerson +objectClass: Template +objectClass: userTemplate +cn: TemplateUser +instanceType: 4 +userAccountControl: 514 +badPwdCount: 0 +codePage: 0 +countryCode: 0 +badPasswordTime: 0 +lastLogoff: 0 +lastLogon: 0 +pwdLastSet: 0 +primaryGroupID: 513 +accountExpires: -1 +logonCount: 0 +sAMAccountType: 805306368 +objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN} + +dn: CN=TemplateComputer,CN=Templates +objectClass: top +objectClass: person +objectClass: organizationalPerson +objectClass: Template +objectClass: userTemplate +cn: TemplateComputer +instanceType: 4 +userAccountControl: 4098 +badPwdCount: 0 +codePage: 0 +countryCode: 0 +badPasswordTime: 0 +lastLogoff: 0 +lastLogon: 0 +pwdLastSet: 0 +primaryGroupID: 513 +accountExpires: -1 +logonCount: 0 +sAMAccountType: 805306369 +objectCategory: CN=Computer,CN=Schema,CN=Configuration,${BASEDN} + +dn: CN=TemplateTrustingDomain,CN=Templates +objectClass: top +objectClass: Template +objectClass: userTemplate +cn: TemplateTrustingDomain +instanceType: 4 +userAccountControl: 2080 +badPwdCount: 0 +codePage: 0 +countryCode: 0 +badPasswordTime: 0 +lastLogoff: 0 +lastLogon: 0 +primaryGroupID: 513 +accountExpires: -1 +logonCount: 0 +sAMAccountType: 805306370 + +dn: CN=TemplateGroup,CN=Templates +objectClass: top +objectClass: Template +objectClass: groupTemplate +cn: TemplateGroup +instanceType: 4 +groupType: -2147483646 +sAMAccountType: 268435456 +objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} + +# Currently this isn't used, we don't have a way to detect it different from an incoming alias +# +# dn: CN=TemplateAlias,CN=Templates +# objectClass: top +# objectClass: Template +# objectClass: aliasTemplate +# cn: TemplateAlias +# instanceType: 4 +# groupType: -2147483644 +# sAMAccountType: 268435456 + +dn: CN=TemplateForeignSecurityPrincipal,CN=Templates +objectClass: top +objectClass: Template +objectClass: foreignSecurityPrincipalTemplate +cn: TemplateForeignSecurityPrincipal +instanceType: 4 +showInAdvancedViewOnly: TRUE +objectCategory: CN=Foreign-Security-Principal,CN=Schema,CN=Configuration,${BASEDN} + +dn: CN=TemplateSecret,CN=Templates +objectClass: top +objectClass: leaf +objectClass: Template +objectClass: secretTemplate +cn: TemplateSecret +instanceType: 4 + +dn: CN=TemplateTrustedDomain,CN=Templates +objectClass: top +objectClass: leaf +objectClass: Template +objectClass: trustedDomainTemplate +cn: TemplateTrustedDomain +instanceType: 4 + -- cgit From ca6a8c5f0b23a001d39082ac55db354926ac6349 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 2 Jan 2007 03:37:07 +0000 Subject: r20458: This data is invalid, and causes the samba3sam test to fail, because we now convert these values. Andrew Bartlett (This used to be commit a0b401d41ab1396f270518411c4b48e8f5b200a7) --- testdata/samba3/samba3.ldif | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/samba3.ldif b/testdata/samba3/samba3.ldif index 470f7ff246..479df242ff 100644 --- a/testdata/samba3/samba3.ldif +++ b/testdata/samba3/samba3.ldif @@ -197,8 +197,8 @@ sambaHomePath: \\PDC-SMB3\home\%U sambaHomeDrive: H: sambaProfilePath: \\PDC-SMB3\profiles\%U\Administrator sambaPrimaryGroupSID: S-1-5-21-4231626423-2410014848-2360679739-512 -sambaLMPassword: XXX -sambaNTPassword: XXX +sambaLMPassword: 193130B61A7F81C0AAD3B435B51404EE +sambaNTPassword: C2AE1FE6E648846352453E816F2AEB93 sambaAcctFlags: [U ] sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2996 loginShell: /bin/false -- cgit From 99fb785ea1dcf8ccc7bcbceed350178884e824b1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 3 Mar 2007 02:06:54 +0000 Subject: r21673: Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled. (This used to be commit ef794f03d50022a77303c77045a04d9407d07cbc) --- testdata/samba3/verify | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'testdata/samba3') diff --git a/testdata/samba3/verify b/testdata/samba3/verify index ed6ed95189..ca495b137d 100755 --- a/testdata/samba3/verify +++ b/testdata/samba3/verify @@ -5,6 +5,13 @@ Written by Jelmer Vernooij, 2005. */ +var sys; +var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA"); +if (options == undefined) { + println("Failed to parse options"); + return -1; +} + libinclude("base.js"); var path = substr(ARGV[0], 0, -strlen("verify")); @@ -49,3 +56,4 @@ assert(s.policy.bad_lockout_minutes == 0); println("account policies ok"); +exit(0); -- cgit From ac2a7014837b1ce135e732fd7a9b950d9fbc1401 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Sep 2007 02:07:55 +0000 Subject: r24882: Use the torture API in BASE-CHARSET. (This used to be commit 93910d92cd431add876e98a12712253bee8c52e7) --- testdata/samba3/smb.conf | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/smb.conf b/testdata/samba3/smb.conf index a903dc2c3e..b00397d2ee 100644 --- a/testdata/samba3/smb.conf +++ b/testdata/samba3/smb.conf @@ -5,19 +5,19 @@ debug level = 5 [cd1] -path = /mnt/cd1 -public = yes + path = /mnt/cd1 + public = yes [cd2] -path = /mnt/cd2 -public = yes + path = /mnt/cd2 + public = yes [media] -path = /media -public = yes + path = /media + public = yes [tmp] -path = /tmp -guest only = yes -public = yes -read only = no + path = /tmp + guest only = yes + public = yes + read only = no -- cgit From 56fb8d3c0022a766444d9919d727e5ede99a5ea2 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 31 Oct 2007 01:19:20 +0100 Subject: r25759: catch up the samba3sam tests with the change from cn=rootdse to @ROOTDSE Andrew Bartlett (This used to be commit 84a14973cee94a5f8645515cffb20ee89b5360d1) --- testdata/samba3/provision_samba3sam.ldif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/provision_samba3sam.ldif b/testdata/samba3/provision_samba3sam.ldif index 27a61c7263..c3e949c34b 100644 --- a/testdata/samba3/provision_samba3sam.ldif +++ b/testdata/samba3/provision_samba3sam.ldif @@ -57,7 +57,7 @@ passwordAttribute: sambaLMPwdHistory passwordAttribute: krb5key # the rootDSE module looks in this record for its base data -dn: cn=ROOTDSE +dn: @ROOTDSE subschemaSubentry: CN=Aggregate,CN=Schema,CN=Configuration,${BASEDN} dsServiceName: CN=NTDS Settings,CN=${NETBIOSNAME},CN=Servers,CN=Default-First-Site-Name,CN=Sites,CN=Configuration,${BASEDN} defaultNamingContext: ${BASEDN} -- cgit From 58f9b5702a432a39a8276367532635300034d180 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 14 Nov 2007 03:51:02 +0100 Subject: r25948: Fix up the samba3sam test (which is very fragile) to work with the new restrictions imposed by the samldb module. This module is worth keeping, because when we go back to do more extensive backend mapping, the testing of this module shows it is still possible. Andrew Bartlett (This used to be commit a10d2554dc1f9b57ce2a98ea20969b3b3c8aec53) --- testdata/samba3/provision_samba3sam.ldif | 123 ------------------------------- 1 file changed, 123 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/provision_samba3sam.ldif b/testdata/samba3/provision_samba3sam.ldif index c3e949c34b..9d13f8a1e0 100644 --- a/testdata/samba3/provision_samba3sam.ldif +++ b/testdata/samba3/provision_samba3sam.ldif @@ -75,127 +75,4 @@ isSynchronized: TRUE vendorName: Samba Team (http://samba.org) vendorVersion: ${VERSION} -dn: CN=Templates -objectClass: top -objectClass: container -cn: Templates -description: Container for SAM account templates -instanceType: 4 -showInAdvancedViewOnly: TRUE -systemFlags: 2348810240 -objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN} -isCriticalSystemObject: TRUE - -### -# note! the template users must not match normal searches. Be careful -# with what classes you put them in -### - -dn: CN=TemplateUser,CN=Templates -objectClass: top -objectClass: person -objectClass: organizationalPerson -objectClass: Template -objectClass: userTemplate -cn: TemplateUser -instanceType: 4 -userAccountControl: 514 -badPwdCount: 0 -codePage: 0 -countryCode: 0 -badPasswordTime: 0 -lastLogoff: 0 -lastLogon: 0 -pwdLastSet: 0 -primaryGroupID: 513 -accountExpires: -1 -logonCount: 0 -sAMAccountType: 805306368 -objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN} - -dn: CN=TemplateComputer,CN=Templates -objectClass: top -objectClass: person -objectClass: organizationalPerson -objectClass: Template -objectClass: userTemplate -cn: TemplateComputer -instanceType: 4 -userAccountControl: 4098 -badPwdCount: 0 -codePage: 0 -countryCode: 0 -badPasswordTime: 0 -lastLogoff: 0 -lastLogon: 0 -pwdLastSet: 0 -primaryGroupID: 513 -accountExpires: -1 -logonCount: 0 -sAMAccountType: 805306369 -objectCategory: CN=Computer,CN=Schema,CN=Configuration,${BASEDN} - -dn: CN=TemplateTrustingDomain,CN=Templates -objectClass: top -objectClass: Template -objectClass: userTemplate -cn: TemplateTrustingDomain -instanceType: 4 -userAccountControl: 2080 -badPwdCount: 0 -codePage: 0 -countryCode: 0 -badPasswordTime: 0 -lastLogoff: 0 -lastLogon: 0 -primaryGroupID: 513 -accountExpires: -1 -logonCount: 0 -sAMAccountType: 805306370 - -dn: CN=TemplateGroup,CN=Templates -objectClass: top -objectClass: Template -objectClass: groupTemplate -cn: TemplateGroup -instanceType: 4 -groupType: -2147483646 -sAMAccountType: 268435456 -objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} - -# Currently this isn't used, we don't have a way to detect it different from an incoming alias -# -# dn: CN=TemplateAlias,CN=Templates -# objectClass: top -# objectClass: Template -# objectClass: aliasTemplate -# cn: TemplateAlias -# instanceType: 4 -# groupType: -2147483644 -# sAMAccountType: 268435456 - -dn: CN=TemplateForeignSecurityPrincipal,CN=Templates -objectClass: top -objectClass: Template -objectClass: foreignSecurityPrincipalTemplate -cn: TemplateForeignSecurityPrincipal -instanceType: 4 -showInAdvancedViewOnly: TRUE -objectCategory: CN=Foreign-Security-Principal,CN=Schema,CN=Configuration,${BASEDN} - -dn: CN=TemplateSecret,CN=Templates -objectClass: top -objectClass: leaf -objectClass: Template -objectClass: secretTemplate -cn: TemplateSecret -instanceType: 4 - -dn: CN=TemplateTrustedDomain,CN=Templates -objectClass: top -objectClass: leaf -objectClass: Template -objectClass: trustedDomainTemplate -cn: TemplateTrustedDomain -instanceType: 4 -- cgit From 777ea0d434c05817349c204b43ac252e4ed10eda Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 14 Nov 2007 10:40:58 +0100 Subject: r25952: Add in new data file required by samba3sam test. Andrew Bartlett (This used to be commit f36a35dd690f2b15171976a4d093a306cb0d3c68) --- testdata/samba3/provision_samba3sam_templates.ldif | 123 +++++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 testdata/samba3/provision_samba3sam_templates.ldif (limited to 'testdata/samba3') diff --git a/testdata/samba3/provision_samba3sam_templates.ldif b/testdata/samba3/provision_samba3sam_templates.ldif new file mode 100644 index 0000000000..368c78d727 --- /dev/null +++ b/testdata/samba3/provision_samba3sam_templates.ldif @@ -0,0 +1,123 @@ +dn: CN=Templates +objectClass: top +objectClass: container +cn: Templates +description: Container for SAM account templates +instanceType: 4 +showInAdvancedViewOnly: TRUE +systemFlags: 2348810240 +objectCategory: CN=Container,CN=Schema,CN=Configuration,${BASEDN} +isCriticalSystemObject: TRUE + +### +# note! the template users must not match normal searches. Be careful +# with what classes you put them in +### + +dn: CN=TemplateUser,CN=Templates +objectClass: top +objectClass: person +objectClass: organizationalPerson +objectClass: Template +objectClass: userTemplate +cn: TemplateUser +instanceType: 4 +userAccountControl: 514 +badPwdCount: 0 +codePage: 0 +countryCode: 0 +badPasswordTime: 0 +lastLogoff: 0 +lastLogon: 0 +pwdLastSet: 0 +primaryGroupID: 513 +accountExpires: -1 +logonCount: 0 +sAMAccountType: 805306368 +objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN} + +dn: CN=TemplateComputer,CN=Templates +objectClass: top +objectClass: person +objectClass: organizationalPerson +objectClass: Template +objectClass: userTemplate +cn: TemplateComputer +instanceType: 4 +userAccountControl: 4098 +badPwdCount: 0 +codePage: 0 +countryCode: 0 +badPasswordTime: 0 +lastLogoff: 0 +lastLogon: 0 +pwdLastSet: 0 +primaryGroupID: 513 +accountExpires: -1 +logonCount: 0 +sAMAccountType: 805306369 +objectCategory: CN=Computer,CN=Schema,CN=Configuration,${BASEDN} + +dn: CN=TemplateTrustingDomain,CN=Templates +objectClass: top +objectClass: Template +objectClass: userTemplate +cn: TemplateTrustingDomain +instanceType: 4 +userAccountControl: 2080 +badPwdCount: 0 +codePage: 0 +countryCode: 0 +badPasswordTime: 0 +lastLogoff: 0 +lastLogon: 0 +primaryGroupID: 513 +accountExpires: -1 +logonCount: 0 +sAMAccountType: 805306370 + +dn: CN=TemplateGroup,CN=Templates +objectClass: top +objectClass: Template +objectClass: groupTemplate +cn: TemplateGroup +instanceType: 4 +groupType: -2147483646 +sAMAccountType: 268435456 +objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} + +# Currently this isn't used, we don't have a way to detect it different from an incoming alias +# +# dn: CN=TemplateAlias,CN=Templates +# objectClass: top +# objectClass: Template +# objectClass: aliasTemplate +# cn: TemplateAlias +# instanceType: 4 +# groupType: -2147483644 +# sAMAccountType: 268435456 + +dn: CN=TemplateForeignSecurityPrincipal,CN=Templates +objectClass: top +objectClass: Template +objectClass: foreignSecurityPrincipalTemplate +cn: TemplateForeignSecurityPrincipal +instanceType: 4 +showInAdvancedViewOnly: TRUE +objectCategory: CN=Foreign-Security-Principal,CN=Schema,CN=Configuration,${BASEDN} + +dn: CN=TemplateSecret,CN=Templates +objectClass: top +objectClass: leaf +objectClass: Template +objectClass: secretTemplate +cn: TemplateSecret +instanceType: 4 + +dn: CN=TemplateTrustedDomain,CN=Templates +objectClass: top +objectClass: leaf +objectClass: Template +objectClass: trustedDomainTemplate +cn: TemplateTrustedDomain +instanceType: 4 -- cgit From 0a6dc219559cb6385b6d2c5482e7588184e9ccc8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 11 Feb 2008 13:38:07 +0100 Subject: Remove tests for Samba 3 EJS code. (This used to be commit 7aff2ddd8ca1ff68fc704fdb139d81d6daa51115) --- testdata/samba3/verify | 59 -------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100755 testdata/samba3/verify (limited to 'testdata/samba3') diff --git a/testdata/samba3/verify b/testdata/samba3/verify deleted file mode 100755 index ca495b137d..0000000000 --- a/testdata/samba3/verify +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env smbscript -/* Verifies that the data present in this directory - Can be read correctly by Samba4. Do not update - without changing the corresponding TDB file! - Written by Jelmer Vernooij, 2005. - */ - -var sys; -var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA"); -if (options == undefined) { - println("Failed to parse options"); - return -1; -} - -libinclude("base.js"); - -var path = substr(ARGV[0], 0, -strlen("verify")); -printf("Reading from %s\n", path); - -var s = samba3_read(path, path+"smb.conf"); -assert(s != undefined); - -// smb.conf checks -assert(s.configuration.get("passdb backend") != undefined); - -var data = s.configuration.data(); -assert(data != undefined); -var global = data["global"]; -assert(global != undefined); -assert(global["passdb backend"] == s.configuration.get("passdb backend")); -assert(global["passdb backend"] != undefined); - -println("smb.conf ok"); - -assert(s.winsentries.length == 22); -assert(s.samaccounts.length == 3); -assert(s.shares.length == 0); -assert(s.registry.keys.length == 28); -assert(s.groupmappings.length == 13); -assert(s.aliases.length == 0); -assert(s.idmapdb.mappings.length == 4); - -println("database entry count correct"); - -// account policies -assert(s.policy.min_password_length == 5); -assert(s.policy.minimum_password_age == 0); -assert(s.policy.maximum_password_age == 999999999); -assert(s.policy.refuse_machine_password_change == 0); -assert(s.policy.reset_count_minutes == 0); -assert(s.policy.disconnect_time == -1); -assert(s.policy.user_must_logon_to_change_password == 0); -assert(s.policy.password_history == 0); -assert(s.policy.lockout_duration == 0); -assert(s.policy.bad_lockout_minutes == 0); - -println("account policies ok"); - -exit(0); -- cgit From 2a02f4dcabdabbf7ef6b5b9b77fc69cd39baa79c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 17 Apr 2008 14:51:30 +0200 Subject: Fix samba3sam test. sAMAccountType is blocked by the samldb module. Andrew Bartlett (This used to be commit d15ca7e38ba6cc39ab16aa52cdd071be922c9903) --- testdata/samba3/provision_samba3sam_templates.ldif | 5 ----- 1 file changed, 5 deletions(-) (limited to 'testdata/samba3') diff --git a/testdata/samba3/provision_samba3sam_templates.ldif b/testdata/samba3/provision_samba3sam_templates.ldif index 368c78d727..4fe6571eef 100644 --- a/testdata/samba3/provision_samba3sam_templates.ldif +++ b/testdata/samba3/provision_samba3sam_templates.ldif @@ -33,7 +33,6 @@ pwdLastSet: 0 primaryGroupID: 513 accountExpires: -1 logonCount: 0 -sAMAccountType: 805306368 objectCategory: CN=Person,CN=Schema,CN=Configuration,${BASEDN} dn: CN=TemplateComputer,CN=Templates @@ -55,7 +54,6 @@ pwdLastSet: 0 primaryGroupID: 513 accountExpires: -1 logonCount: 0 -sAMAccountType: 805306369 objectCategory: CN=Computer,CN=Schema,CN=Configuration,${BASEDN} dn: CN=TemplateTrustingDomain,CN=Templates @@ -74,7 +72,6 @@ lastLogon: 0 primaryGroupID: 513 accountExpires: -1 logonCount: 0 -sAMAccountType: 805306370 dn: CN=TemplateGroup,CN=Templates objectClass: top @@ -83,7 +80,6 @@ objectClass: groupTemplate cn: TemplateGroup instanceType: 4 groupType: -2147483646 -sAMAccountType: 268435456 objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} # Currently this isn't used, we don't have a way to detect it different from an incoming alias @@ -95,7 +91,6 @@ objectCategory: CN=Group,CN=Schema,CN=Configuration,${BASEDN} # cn: TemplateAlias # instanceType: 4 # groupType: -2147483644 -# sAMAccountType: 268435456 dn: CN=TemplateForeignSecurityPrincipal,CN=Templates objectClass: top -- cgit