r9786: Move ldb_map into ldb/modules/

Move samba3sam to dsdb/
(This used to be commit eb9d615bcd49328131613f64745760a90553b7f2)

7 files changed, 5 insertions, 865 deletions

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 23a99e367b..f75964c44f 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -41,7 +41,7 @@ NOPROTO = YES
 # Start MODULE libldb_map
 [MODULE::libldb_map]
 SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = lib/ldb/ldb_map/ldb_map.o
+INIT_OBJ_FILES = lib/ldb/modules/ldb_map.o
 # End MODULE libldb_map
 ################################################
 
@@ -115,8 +115,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM LDBSAMBA
 [SUBSYSTEM::LDBSAMBA]
 OBJ_FILES = \
-		lib/ldb/samba/ldif_handlers.o \
-		lib/ldb/samba/samba3sam.o
+		lib/ldb/samba/ldif_handlers.o
 # End SUBSYSTEM LDBSAMBA
 ################################################
 
diff --git a/source4/lib/ldb/ldb_map/README b/source4/lib/ldb/ldb_map/README
deleted file mode 100644
index 3c7e30a331..0000000000
--- a/source4/lib/ldb/ldb_map/README
+++ /dev/null
@@ -1,29 +0,0 @@
-This directory contains a skeleton backend for ldb backends that allow 
-using an LDAP server while mapping the attributes in that schema to 
-another schema. This backend will never be used itself but instead have 
-other backends based on it (e.g. ldb_samba3 for a Samba3-LDAP-to-samdb 
-backend)
-
-Each backend that uses this skeleton has to specify an array of 
-struct objectclass_mapping's (see ldb_map.h).
-
-If no mappings are defined for an objectclass, it will be kept as is.
-
-Special mapping routine for dn's (calls rdn mapping routine)
-Special mapping routine for rdn's
-
-Keep cache of mapped dn's so we don't have to traverse the tree each time
-
-search
-	Simply uses search_bytree
-	
-search_bytree
-	Map all attributes in parse_tree	
-
-add
-modify
-	Map ldb_message to LDAPMod
-	
-rename
-delete
-	Simply map dn
diff --git a/source4/lib/ldb/ldb_map/ldb_map.c b/source4/lib/ldb/modules/ldb_map.c
index 7a620f3b81..531d5ccd67 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.c
+++ b/source4/lib/ldb/modules/ldb_map.c
@@ -25,7 +25,7 @@
 #include "includes.h"
 #include "lib/ldb/include/ldb.h"
 #include "lib/ldb/include/ldb_private.h"
-#include "lib/ldb/ldb_map/ldb_map.h"
+#include "lib/ldb/modules/ldb_map.h"
 
 /* TODO:
  *  - objectclass hint in ldb_map_attribute 
diff --git a/source4/lib/ldb/ldb_map/ldb_map.h b/source4/lib/ldb/modules/ldb_map.h
index 02fec649c6..02fec649c6 100644
--- a/source4/lib/ldb/ldb_map/ldb_map.h
+++ b/source4/lib/ldb/modules/ldb_map.h
diff --git a/source4/lib/ldb/samba/samba3sam.c b/source4/lib/ldb/samba/samba3sam.c
deleted file mode 100644
index f7d83ced8f..0000000000
--- a/source4/lib/ldb/samba/samba3sam.c
+++ /dev/null
@@ -1,631 +0,0 @@
-/* 
-   ldb database library - Samba3 SAM compatibility backend
-
-   Copyright (C) Jelmer Vernooij 2005
-
-     ** NOTE! The following LGPL license applies to the ldb
-     ** library. This does NOT imply that all of Samba is released
-     ** under the LGPL
-   
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with this library; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
-
-#include "includes.h"
-#include "ldb/ldb_map/ldb_map.h"
-#include "ldb/include/ldb.h"
-#include "ldb/include/ldb_private.h"
-
-/* FIXME: 
- * sambaSID -> member  (dn!)
- * sambaSIDList -> member (dn!) 
- * sambaDomainName -> name 
- * sambaTrustPassword 
- * sambaUnixIdPool 
- * sambaIdmapEntry 
- * sambaAccountPolicy 
- * sambaSidEntry 
- * sambaAcctFlags -> systemFlags ?
- * sambaPasswordHistory  -> ntPwdHistory*/
-
-/* Not necessary:
- * sambaConfig
- * sambaShare
- * sambaConfigOption 
- * sambaNextGroupRid
- * sambaNextUserRid
- * sambaAlgorithmicRidBase
- */
-
-/* Not in Samba4: 
- * sambaKickoffTime
- * sambaPwdCanChange
- * sambaPwdMustChange
- * sambaHomePath
- * sambaHomeDrive
- * sambaLogonScript
- * sambaProfilePath
- * sambaUserWorkstations
- * sambaMungedDial
- * sambaLogonHours */
-
-/* In Samba4 but not in Samba3:
-*/
-
-static struct ldb_val convert_sid_rid(struct ldb_map_context *map, TALLOC_CTX *ctx, const struct ldb_val *val)
-{
-	printf("Converting SID TO RID *\n");
-
-	return ldb_val_dup(ctx, val);
-}
-
-static struct ldb_val convert_rid_sid(struct ldb_map_context *map, TALLOC_CTX *ctx, const struct ldb_val *val)
-{
-	printf("Converting RID TO SID *\n");
-
-	return ldb_val_dup(ctx, val);
-}
-
-static struct ldb_val convert_unix_id2name(struct ldb_map_context *map, TALLOC_CTX *ctx, const struct ldb_val *val)
-{
-	printf("Converting UNIX ID to name\n");
-
-	return ldb_val_dup(ctx, val);
-}
-
-static struct ldb_val convert_unix_name2id(struct ldb_map_context *map, TALLOC_CTX *ctx, const struct ldb_val *val)
-{
-	printf("Converting UNIX name to ID\n");
-
-	return ldb_val_dup(ctx, val);
-}
-
-const struct ldb_map_objectclass samba3_objectclasses[] = {
-	{ "group", "sambaGroupMapping" },
-	{ "user", "sambaSAMAccount" },
-	{ "domain", "sambaDomain" },
-	{ NULL, NULL }
-};
-
-const struct ldb_map_attribute samba3_attributes[] = 
-{
-	/* sambaNextRid -> nextRid */
-	{
-		.local_name = "nextRid",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaNextRid",
-	},
-
-	/* sambaBadPasswordTime -> badPasswordtime*/
-	{
-		.local_name = "badPasswordTime",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaBadPasswordTime",
-	},
-
-	/* sambaLMPassword -> lmPwdHash*/
-	{
-		.local_name = "lmPwdHash",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaLMPassword",
-	},
-
-	/* sambaGroupType -> groupType */
-	{
-		.local_name = "groupType",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaGroupType",
-	},
-
-	/* sambaNTPassword -> ntPwdHash*/
-	{
-		.local_name = "badPwdCount",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaNTPassword",
-	},
-
-	/* sambaPrimaryGroupSID -> primaryGroupID */
-	{
-		.local_name = "primaryGroupID",
-		.type = MAP_CONVERT,
-		.u.convert.remote_name = "sambaPrimaryGroupSID",
-		.u.convert.convert_local = convert_rid_sid,
-		.u.convert.convert_remote = convert_sid_rid, 
-	},
-
-	/* sambaBadPasswordCount -> badPwdCount */
-	{
-		.local_name = "badPwdCount",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaBadPasswordCount",
-	},
-
-	/* sambaLogonTime -> lastLogon*/
-	{
-		.local_name = "lastLogon",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaLogonTime",
-	},
-
-	/* sambaLogoffTime -> lastLogoff*/
-	{
-		.local_name = "lastLogoff",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaLogoffTime",
-	},
-
-	/* gidNumber -> unixName */
-	{
-		.local_name = "unixName",
-		.type = MAP_CONVERT,
-		.u.convert.remote_name = "gidNumber",
-		.u.convert.convert_local = convert_unix_name2id,
-		.u.convert.convert_remote = convert_unix_id2name, 
-	},
-
-	/* uid -> unixName */
-	{
-		.local_name = "unixName",
-		.type = MAP_CONVERT,
-		.u.convert.remote_name = "uid",
-		.u.convert.convert_local = convert_unix_name2id,
-		.u.convert.convert_remote = convert_unix_id2name,
-	},
-
-	/* displayName -> name */
-	{
-		.local_name = "name",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "displayName",
-	},
-
-	/* cn */
-	{
-		.local_name = "cn",
-		.type = MAP_KEEP,
-	},
-
-	/* sAMAccountName -> cn */
-	{
-		.local_name = "sAMAccountName",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "uid",
-	},
-
-	/* objectCategory */
-	{
-		.local_name = "objectCategory",
-		.type = MAP_IGNORE,
-	},
-
-	/* objectGUID */
-	{
-		.local_name = "objectGUID",
-		.type = MAP_IGNORE,
-	},
-
-	/* objectVersion */
-	{
-		.local_name = "objectVersion",
-		.type = MAP_IGNORE,
-	},
-
-	/* codePage */
-	{ 
-		.local_name = "codePage",
-		.type = MAP_IGNORE,
-	},
-
-	/* dNSHostName */
-	{
-		.local_name = "dNSHostName",
-		.type = MAP_IGNORE,
-	},
-
-
-	/* dnsDomain */
-	{
-		.local_name = "dnsDomain",
-		.type = MAP_IGNORE,
-	},
-
-	/* dnsRoot */
-	{
-		.local_name = "dnsRoot",
-		.type = MAP_IGNORE,
-	},
-
-	/* countryCode */
-	{
-		.local_name = "countryCode",
-		.type = MAP_IGNORE,
-	},
-
-	/* nTMixedDomain */
-	{ 
-		.local_name = "nTMixedDomain",
-		.type = MAP_IGNORE,
-	},
-
-	/* operatingSystem */
-	{ 
-		.local_name = "operatingSystem",
-		.type = MAP_IGNORE,
-	},
-
-	/* operatingSystemVersion */
-	{
-		.local_name = "operatingSystemVersion",
-		.type = MAP_IGNORE,
-	},
-
-
-	/* servicePrincipalName */
-	{
-		.local_name = "servicePrincipalName",
-		.type = MAP_IGNORE,
-	},
-
-	/* msDS-Behavior-Version */
-	{
-		.local_name = "msDS-Behavior-Version",
-		.type = MAP_IGNORE,
-	},
-
-	/* msDS-KeyVersionNumber */
-	{
-		.local_name = "msDS-KeyVersionNumber",
-		.type = MAP_IGNORE,
-	},
-
-	/* msDs-masteredBy */
-	{
-		.local_name = "msDs-masteredBy",
-		.type = MAP_IGNORE,
-	},
-
-	/* ou */
-	{
-		.local_name = "ou",
-		.type = MAP_KEEP,
-	},
-
-	/* dc */
-	{
-		.local_name = "dc",
-		.type = MAP_KEEP,
-	},
-
-	/* description */
-	{
-		.local_name = "description",
-		.type = MAP_KEEP,
-	},
-
-	/* sambaSID -> objectSid*/
-	{
-		.local_name = "objectSid",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaSID", 
-	},
-
-	/* sambaPwdLastSet -> pwdLastSet */
-	{
-		.local_name = "pwdLastSet",
-		.type = MAP_RENAME,
-		.u.rename.remote_name = "sambaPwdLastSet",
-	},	
-
-	/* accountExpires */
-	{
-		.local_name = "accountExpires", 
-		.type = MAP_IGNORE,
-	},
-
-	/* adminCount */
-	{
-		.local_name = "adminCount",
-		.type = MAP_IGNORE,
-	},
-
-	/* canonicalName */
-	{
-		.local_name = "canonicalName",
-		.type = MAP_IGNORE,
-	},
-
-	/* createTimestamp */
-	{
-		.local_name = "createTimestamp",
-		.type = MAP_IGNORE,
-	},
-	
-	/* creationTime */
-	{
-		.local_name = "creationTime",
-		.type = MAP_IGNORE,
-	},
-	
-	/* dMDLocation */
-	{
-		.local_name = "dMDLocation",
-		.type = MAP_IGNORE,
-	},
-	
-	/* fSMORoleOwner */
-	{
-		.local_name = "fSMORoleOwner",
-		.type = MAP_IGNORE,
-	},
-	
-	/* forceLogoff */
-	{
-		.local_name = "forceLogoff",
-		.type = MAP_IGNORE,
-	},
-	
-	/* instanceType */
-	{
-		.local_name = "instanceType",
-		.type = MAP_IGNORE,
-	},
-	
-	/* invocationId */
-	{
-		.local_name = "invocationId",
-		.type = MAP_IGNORE,
-	},
-	
-	/* isCriticalSystemObject */
-	{
-		.local_name = "isCriticalSystemObject",
-		.type = MAP_IGNORE,
-	},
-	
-	/* localPolicyFlags */
-	{
-		.local_name = "localPolicyFlags",
-		.type = MAP_IGNORE,
-	},
-	
-	/* lockOutObservationWindow */
-	{
-		.local_name = "lockOutObservationWindow",
-		.type = MAP_IGNORE,
-	},
-
-	/* lockoutDuration */
-	{
-		.local_name = "lockoutDuration",
-		.type = MAP_IGNORE,
-	},
-
-	/* lockoutThreshold */
-	{
-		.local_name = "lockoutThreshold",
-		.type = MAP_IGNORE,
-	},
-
-	/* logonCount */
-	{
-		.local_name = "logonCount",
-		.type = MAP_IGNORE,
-	},
-
-	/* masteredBy */
-	{
-		.local_name = "masteredBy",
-		.type = MAP_IGNORE,
-	},
-
-	/* maxPwdAge */
-	{
-		.local_name = "maxPwdAge",
-		.type = MAP_IGNORE,
-	},
-
-	/* member */
-	{
-		.local_name = "member",
-		.type = MAP_IGNORE,
-	},
-
-	/* memberOf */
-	{
-		.local_name = "memberOf",
-		.type = MAP_IGNORE,
-	},
-
-	/* minPwdAge */
-	{
-		.local_name = "minPwdAge",
-		.type = MAP_IGNORE,
-	},
-
-	/* minPwdLength */
-	{
-		.local_name = "minPwdLength",
-		.type = MAP_IGNORE,
-	},
-
-	/* modifiedCount */
-	{
-		.local_name = "modifiedCount",
-		.type = MAP_IGNORE,
-	},
-
-	/* modifiedCountAtLastProm */
-	{
-		.local_name = "modifiedCountAtLastProm",
-		.type = MAP_IGNORE,
-	},
-
-	/* modifyTimestamp */
-	{
-		.local_name = "modifyTimestamp",
-		.type = MAP_IGNORE,
-	},
-
-	/* nCName */
-	{
-		.local_name = "nCName",
-		.type = MAP_IGNORE,
-	},
-
-	/* nETBIOSName */
-	{
-		.local_name = "nETBIOSName",
-		.type = MAP_IGNORE,
-	},
-
-	/* oEMInformation */
-	{
-		.local_name = "oEMInformation",
-		.type = MAP_IGNORE,
-	},
-
-	/* privilege */
-	{
-		.local_name = "privilege",
-		.type = MAP_IGNORE,
-	},
-
-	/* pwdHistoryLength */
-	{
-		.local_name = "pwdHistoryLength",
-		.type = MAP_IGNORE,
-	},
-
-	/* pwdProperties */
-	{
-		.local_name = "pwdProperties",
-		.type = MAP_IGNORE,
-	},
-
-	/* rIDAvailablePool */
-	{
-		.local_name = "rIDAvailablePool",
-		.type = MAP_IGNORE,
-	},
-
-	/* revision */
-	{
-		.local_name = "revision",
-		.type = MAP_IGNORE,
-	},
-
-	/* ridManagerReference */
-	{
-		.local_name = "ridManagerReference",
-		.type = MAP_IGNORE,
-	},
-
-	/* sAMAccountType */
-	{
-		.local_name = "sAMAccountType",
-		.type = MAP_IGNORE,
-	},
-
-	/* sPNMappings */
-	{
-		.local_name = "sPNMappings",
-		.type = MAP_IGNORE,
-	},
-
-	/* serverReference */
-	{
-		.local_name = "serverReference",
-		.type = MAP_IGNORE,
-	},
-
-	/* serverState */
-	{
-		.local_name = "serverState",
-		.type = MAP_IGNORE,
-	},
-
-	/* showInAdvancedViewOnly */
-	{
-		.local_name = "showInAdvancedViewOnly",
-		.type = MAP_IGNORE,
-	},
-
-	/* subRefs */
-	{
-		.local_name = "subRefs",
-		.type = MAP_IGNORE,
-	},
-
-	/* systemFlags */
-	{
-		.local_name = "systemFlags",
-		.type = MAP_IGNORE,
-	},
-
-	/* uASCompat */
-	{
-		.local_name = "uASCompat",
-		.type = MAP_IGNORE,
-	},
-
-	/* uSNChanged */
-	{
-		.local_name = "uSNChanged",
-		.type = MAP_IGNORE,
-	},
-
-	/* uSNCreated */
-	{
-		.local_name = "uSNCreated",
-		.type = MAP_IGNORE,
-	},
-
-	/* unicodePwd */
-	{
-		.local_name = "unicodePwd",
-		.type = MAP_IGNORE,
-	},
-
-	/* userAccountControl */
-	{
-		.local_name = "userAccountControl",
-		.type = MAP_IGNORE,
-	},
-
-	/* whenChanged */
-	{
-		.local_name = "whenChanged",
-		.type = MAP_IGNORE,
-	},
-
-	/* whenCreated */
-	{
-		.local_name = "whenCreated",
-		.type = MAP_IGNORE,
-	},
-
-	{
-		.local_name = NULL,
-	}
-};
-
-	/* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
-struct ldb_module *ldb_samba3sam_module_init(struct ldb_context *ldb, const char *options[])
-#endif
-{
-	return ldb_map_init(ldb, samba3_attributes, samba3_objectclasses, "samba3sam");
-}
diff --git a/source4/lib/ldb/tests/samba3.ldif b/source4/lib/ldb/tests/samba3.ldif
deleted file mode 100644
index 035eb1c516..0000000000
--- a/source4/lib/ldb/tests/samba3.ldif
+++ /dev/null
@@ -1,200 +0,0 @@
-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/source4/lib/samba3/PLAN b/source4/lib/samba3/PLAN
index abc3d5d6ae..67395ca84c 100644
--- a/source4/lib/samba3/PLAN
+++ b/source4/lib/samba3/PLAN
@@ -1,4 +1,5 @@
 TODO (SoC project):
  - move ini parsing stuff to seperate file param/ini.c
- - test ldb_map backend (testsuite?)
  - parse "passdb backend" setting and parse tdbsam/passdb based on it
+ - test ldb_map backend (testsuite?)
+ - testsuite for the static upgrade