r9718: Work a bit on the SWAT interface

(This used to be commit b1844905d2c1ca26aef0ccba799ff16383348fc1)

4 files changed, 64 insertions, 61 deletions

diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/ldb_map/ldb_map.c
index 5ae4a435d8..1a8ea2afc4 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/ldb_map/ldb_map.c
@@ -136,8 +136,10 @@ static struct ldb_parse_tree *ldb_map_parse_tree(struct ldb_module *module, TALL
 		return attr->convert_operator(privdat, module, tree);
 	}
 
-	if (map_type == MAP_IGNORE)
+	if (map_type == MAP_IGNORE) {
+		DEBUG(0, ("Search on ignored attribute '%s'!\n", tree->u.equality.attr));
 		return NULL;
+	}
 
 	if (map_type == MAP_GENERATE) {
 		DEBUG(0, ("Can't do conversion for MAP_GENERATE in map_parse_tree without convert_operator for '%s'\n", tree->u.equality.attr));
diff --git a/source4/lib/ldb/tests/samba3.ldif b/source4/lib/ldb/tests/samba3.ldif
index fb0a1386d4..02103b65b6 100644
--- a/source4/lib/ldb/tests/samba3.ldif
+++ b/source4/lib/ldb/tests/samba3.ldif
@@ -1,49 +1,4 @@
-dn: dc=idealx,dc=org
-objectClass: dcObject
-objectclass: organization
-o: idealx
-dc: idealx
-
-dn: ou=Users,dc=idealx,dc=org
-objectClass: organizationalUnit
-ou: Users
-
-dn: ou=Groups,dc=idealx,dc=org
-objectClass: organizationalUnit
-ou: Groups
-
-dn: ou=Computers,dc=idealx,dc=org
-objectClass: organizationalUnit
-ou: Computers
-dn: uid=Administrator,ou=Users,dc=idealx,dc=org
-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
-
-dn: uid=nobody,ou=Users,dc=idealx,dc=org
+dn: uid=nobody,ou=Users,dc=test,dc=vernstok,dc=nl
 cn: nobody
 sn: nobody
 objectClass: inetOrgPerson
@@ -70,7 +25,7 @@ sambaAcctFlags: [NU         ]
 sambaSID: S-1-5-21-4231626423-2410014848-2360679739-2998
 loginShell: /bin/false
 
-dn: cn=Domain Admins,ou=Groups,dc=idealx,dc=org
+dn: cn=Domain Admins,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 512
@@ -81,7 +36,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-512
 sambaGroupType: 2
 displayName: Domain Admins
 
-dn: cn=Domain Users,ou=Groups,dc=idealx,dc=org
+dn: cn=Domain Users,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 513
@@ -91,7 +46,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-513
 sambaGroupType: 2
 displayName: Domain Users
 
-dn: cn=Domain Guests,ou=Groups,dc=idealx,dc=org
+dn: cn=Domain Guests,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 514
@@ -101,7 +56,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-514
 sambaGroupType: 2
 displayName: Domain Guests
 
-dn: cn=Print Operators,ou=Groups,dc=idealx,dc=org
+dn: cn=Print Operators,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 550
@@ -111,7 +66,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-550
 sambaGroupType: 2
 displayName: Print Operators
 
-dn: cn=Backup Operators,ou=Groups,dc=idealx,dc=org
+dn: cn=Backup Operators,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 551
@@ -121,7 +76,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-551
 sambaGroupType: 2
 displayName: Backup Operators
 
-dn: cn=Replicator,ou=Groups,dc=idealx,dc=org
+dn: cn=Replicator,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 552
@@ -131,7 +86,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-552
 sambaGroupType: 2
 displayName: Replicator
 
-dn: cn=Domain Computers,ou=Groups,dc=idealx,dc=org
+dn: cn=Domain Computers,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 553
@@ -141,7 +96,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-553
 sambaGroupType: 2
 displayName: Domain Computers
 
-dn: cn=Administrators,ou=Groups,dc=idealx,dc=org
+dn: cn=Administrators,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 544
@@ -151,7 +106,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-544
 sambaGroupType: 2
 displayName: Administrators
 
-dn: cn=Users,ou=Groups,dc=idealx,dc=org
+dn: cn=Users,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 545
@@ -161,7 +116,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-545
 sambaGroupType: 2
 displayName: users
 
-dn: cn=Guests,ou=Groups,dc=idealx,dc=org
+dn: cn=Guests,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 546
@@ -172,7 +127,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-546
 sambaGroupType: 2
 displayName: Guests
 
-dn: cn=Power Users,ou=Groups,dc=idealx,dc=org
+dn: cn=Power Users,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 547
@@ -182,7 +137,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-547
 sambaGroupType: 2
 displayName: Power Users
 
-dn: cn=Account Operators,ou=Groups,dc=idealx,dc=org
+dn: cn=Account Operators,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 548
@@ -192,7 +147,7 @@ sambaSID: S-1-5-21-4231626423-2410014848-2360679739-548
 sambaGroupType: 2
 displayName: Account Operators
 
-dn: cn=Server Operators,ou=Groups,dc=idealx,dc=org
+dn: cn=Server Operators,ou=Groups,dc=test,dc=vernstok,dc=nl
 objectClass: posixGroup
 objectClass: sambaGroupMapping
 gidNumber: 549
@@ -201,3 +156,36 @@ description: Netbios Domain Server Operators
 sambaSID: S-1-5-21-4231626423-2410014848-2360679739-549
 sambaGroupType: 2
 displayName: Server Operators
+
+dn: ou=Computers,dc=test,dc=vernstok,dc=nl
+objectClass: organizationalUnit
+ou: Computers
+dn: uid=Administrator,ou=Users,dc=test,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/source4/lib/samba3/PLAN b/source4/lib/samba3/PLAN
index 26bf54634c..8bc90da427 100644
--- a/source4/lib/samba3/PLAN
+++ b/source4/lib/samba3/PLAN
@@ -1,6 +1,6 @@
 Three possible viable approaches:
  1) TDB conversion approach. Read in TDB dump out LDIF (one-way)
-  - samr.ldb: from tdbsam/smbpasswd, account_policy.tdb, secrets.tdb, group_mapping.tdb, privilege.tdb
+  - samr.ldb: from tdbsam/smbpasswd, account_policy.tdb, secrets.tdb, group_mapping.tdb
   - registry.ldb: from registry.tdb
   - wins.ldif: from wins.tdb/wins.dat
   - smb.conf/ea's: generated from the old smb.conf + share_info.tdb
@@ -29,3 +29,13 @@ Three possible viable approaches:
   - convert smb.conf (using Jerry's registry hack)
 
 (going with a combination of 1 and 2)
+
+ldb mapping backend:
+ - do search in new and old (mapped) backend and merge results?
+
+Upgrade process:
+ - take libdir & smb.conf
+ - read various tdb files / old smb.conf 
+ - write new smb.conf (ejs?)
+  - list of parameters to keep.. generate some of the others
+ - add generated LDIF (ejs?)
diff --git a/source4/lib/samba3/README b/source4/lib/samba3/README
index 3f6553f7e8..83520f673d 100644
--- a/source4/lib/samba3/README
+++ b/source4/lib/samba3/README
@@ -3,3 +3,6 @@ Samba3 import, migration and compatibility.
 
 For example, the first file in this directory (smbpasswd.c) handles
 portions of the smbpasswd file format.
+
+The other files in this directory support reading the various 
+TDB databases from Samba3.