r18867: change the group mapping code to use ldb instead of tdb

See the discussion of this on the samba-technical list
(This used to be commit 4ad1436ceae0128e187222fce0fc79adb3049d3f)

7 files changed, 1676 insertions, 667 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 662b1feb6f..1a4c63df0a 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -126,7 +126,7 @@ FLAGS2 =
 FLAGS3 = 
 FLAGS4 = 
 FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4)
-FLAGS  = $(ISA) $(FLAGS5) 
+FLAGS  = $(ISA) $(FLAGS5) -I$(srcdir)/lib -D_SAMBA_BUILD_=3
 
 PASSWD_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" -DPRIVATE_DIR=\"$(PRIVATE_DIR)\"
 PATH_FLAGS1 = -DCONFIGFILE=\"$(CONFIGFILE)\"  -DSBINDIR=\"$(SBINDIR)\"
@@ -152,13 +152,15 @@ BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
 BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
 	bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ \
 	bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@ bin/sharesec@EXEEXT@
+BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \
+	bin/ldbdel@EXEEXT@ bin/ldbmodify@EXEEXT@ 
 
 TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
 	bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
 	bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
 	bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@
 
-BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) @EXTRA_BIN_PROGS@
+BIN_PROGS = $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) @EXTRA_BIN_PROGS@
 
 EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ bin/talloctort@EXEEXT@ \
 	bin/log2pcap@EXEEXT@
@@ -382,7 +384,7 @@ CP850_OBJ = modules/CP850.o
 CP437_OBJ = modules/CP437.o
 CHARSET_MACOSXFS_OBJ = modules/charset_macosxfs.o
 
-GROUPDB_OBJ = groupdb/mapping.o
+GROUPDB_OBJ = groupdb/mapping.o groupdb/mapping_ldb.o
 
 PROFILE_OBJ = profile/profile.o
 PROFILES_OBJ = utils/profiles.o \
@@ -471,7 +473,7 @@ SMBD_OBJ_BASE = $(PARAM_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
 		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
 		$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(LIBADS_SERVER_OBJ) \
 		$(REGISTRY_OBJ) $(POPT_LIB_OBJ) \
-		$(BUILDOPT_OBJ) $(SMBLDAP_OBJ)
+		$(BUILDOPT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 PRINTING_OBJ = printing/pcap.o printing/print_svid.o printing/print_aix.o \
                printing/print_cups.o printing/print_generic.o \
@@ -505,14 +507,13 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(LIBSMB_OBJ) \
 	   $(LOCKING_OBJ) $(PASSDB_OBJ) $(SECRETS_OBJ) $(KRBCLIENT_OBJ) \
 	   $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
 	   $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
-           $(PASSCHANGE_OBJ)
+           $(PASSCHANGE_OBJ) $(LDB_OBJ)
 
 STATUS_OBJ = utils/status.o utils/status_profile.o \
 	     $(LOCKING_OBJ) $(PARAM_OBJ) \
              $(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
 	     $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(ERRORMAP_OBJ) $(RPC_PARSE_OBJ1) \
              $(DOSERR_OBJ)
-             
 
 SMBCONTROL_OBJ = utils/smbcontrol.o $(LOCKING_OBJ) $(PARAM_OBJ) \
 	$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
@@ -533,12 +534,12 @@ TESTPARM_OBJ = utils/testparm.o \
 SMBPASSWD_OBJ = utils/smbpasswd.o utils/passwd_util.o $(PASSCHANGE_OBJ) \
 		$(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
 		$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
-		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ)
+		$(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) $(LDB_OBJ)
 
 PDBEDIT_OBJ = utils/pdbedit.o utils/passwd_util.o $(PARAM_OBJ) $(PASSDB_OBJ) \
 		$(LIBSAMBA_OBJ) $(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) \
 		$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) libsmb/asn1.o \
-		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) libsmb/errormap.o
+		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ) libsmb/errormap.o
 
 SMBGET_OBJ = utils/smbget.o $(POPT_LIB_OBJ) $(LIBSMBCLIENT_OBJ)
 
@@ -555,7 +556,7 @@ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
              $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
              $(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
 	     $(LIBADS_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
-	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
+	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
 
 PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
 		  @LIBREPLACE_OBJS@ @SOCKET_WRAPPER_OBJS@ @BUILD_INIPARSER@
@@ -565,7 +566,7 @@ LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \
 		   $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 	  	   $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		   $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-		   $(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
+		   $(SECRETS_OBJ) $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
 
 CAC_OBJ = $(LIBSMBCLIENT_OBJ) \
 			 libmsrpc/libmsrpc.o libmsrpc/libmsrpc_internal.o \
@@ -582,7 +583,7 @@ LIBBIGBALLOFMUD_MAJOR = 0
 
 LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) \
 	$(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) $(PASSDB_OBJ) \
-	$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ)
+	$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 LIBBIGBALLOFMUD_PICOBJS = $(LIBBIGBALLOFMUD_OBJ:.o=.@PICSUFFIX@)
 
@@ -615,7 +616,7 @@ NET_OBJ = $(NET_OBJ1) $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
 	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
 	  $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
 	  $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
-	  lib/display_sec.o
+	  $(LDB_OBJ) lib/display_sec.o
 
 CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)
@@ -654,7 +655,7 @@ NSSTEST_OBJ = torture/nsstest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 
 PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		$(LIB_NONSMBD_OBJ) $(SECRETS_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-		$(SMBLDAP_OBJ) $(POPT_LIB_OBJ) 
+		$(SMBLDAP_OBJ) $(POPT_LIB_OBJ) $(LDB_OBJ)
 
 
 VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
@@ -669,13 +670,13 @@ LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \
 SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
 			   $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
 			   $(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(SECRETS_OBJ) \
-			   $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ)
+			   $(POPT_LIB_OBJ) $(DCUTIL_OBJ) $(LIBADS_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
 		$(PARAM_OBJ) \
 		$(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
 		$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(SECRETS_OBJ) $(POPT_LIB_OBJ) \
-		$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
+		$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ)
 
 EVTLOGADM_OBJ0	= utils/eventlogadm.o 
 
@@ -732,7 +733,7 @@ PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
 		pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
 		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 		$(SECRETS_OBJ) $(SMBLDAP_OBJ) $(LIBSAMBA_OBJ) \
-		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ)
+		$(RPC_PARSE_OBJ1) $(DOSERR_OBJ) $(LDB_OBJ)
 
 PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.@PICSUFFIX@)
 
@@ -767,13 +768,47 @@ WINBINDD_OBJ = \
 		$(SECRETS_OBJ) $(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
 		$(DCUTIL_OBJ) $(IDMAP_OBJ) \
 		$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
-		$(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ)
+		$(LIBADS_SERVER_OBJ) $(SERVER_MUTEX_OBJ) $(LDB_OBJ)
 
 WBINFO_OBJ = nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
 		$(SECRETS_OBJ) $(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) $(RPC_PARSE_OBJ1) $(DOSERR_OBJ)
 
 WINBIND_NSS_OBJ = $(WBCOMMON_OBJ) @LIBREPLACE_OBJS@ @SOCKET_WRAPPER_OBJS@ @WINBIND_NSS_EXTRA_OBJS@
 
+LDB_COMMON_OBJ=lib/ldb/common/ldb.o lib/ldb/common/ldb_ldif.o \
+          lib/ldb/common/ldb_parse.o lib/ldb/common/ldb_msg.o lib/ldb/common/ldb_utf8.o \
+          lib/ldb/common/ldb_debug.o lib/ldb/common/ldb_modules.o \
+          lib/ldb/common/ldb_dn.o lib/ldb/common/ldb_match.o lib/ldb/common/ldb_attributes.o \
+          lib/ldb/common/attrib_handlers.o lib/ldb/common/ldb_controls.o lib/ldb/common/qsort.o
+
+LDB_TDB_OBJ=lib/ldb/ldb_tdb/ldb_tdb.o \
+       lib/ldb/ldb_tdb/ldb_pack.o lib/ldb/ldb_tdb/ldb_search.o lib/ldb/ldb_tdb/ldb_index.o \
+       lib/ldb/ldb_tdb/ldb_cache.o lib/ldb/ldb_tdb/ldb_tdb_wrap.o
+
+LDB_MODULES_OBJ=lib/ldb/modules/operational.o lib/ldb/modules/schema.o lib/ldb/modules/rdn_name.o \
+          lib/ldb/modules/objectclass.o \
+          lib/ldb/modules/paged_results.o lib/ldb/modules/sort.o lib/ldb/modules/asq.o
+
+LDB_LDAP_OBJ=lib/ldb/ldb_ldap/ldb_ldap.o
+
+LDB_OBJ = ${LDB_COMMON_OBJ} ${LDB_TDB_OBJ} ${LDB_LDAP_OBJ} ${LDB_MODULES_OBJ}
+
+LDB_CMDLINE_OBJ = $(PARAM_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
+	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
+	  $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(IDMAP_OBJ) \
+	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
+	  $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
+	  $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
+	  $(LDB_OBJ) lib/ldb/tools/cmdline.o
+
+
+LDBEDIT_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbedit.o
+LDBSEARCH_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbsearch.o
+LDBADD_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbadd.o
+LDBDEL_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbdel.o
+LDBMODIFY_OBJ = $(LDB_CMDLINE_OBJ) lib/ldb/tools/ldbmodify.o
+
 POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
           popt/popthelp.o popt/poptparse.o
 
@@ -794,7 +829,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
 		libads/kerberos_verify.o $(SECRETS_OBJ) $(SERVER_MUTEX_OBJ) \
 		libads/authdata.o $(RPC_PARSE_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 		$(SMBLDAP_OBJ) $(DOSERR_OBJ) rpc_parse/parse_net.o $(LIBNMB_OBJ) \
-		libsmb/errormap.o
+		$(LDB_OBJ) libsmb/errormap.o
 
 ######################################################################
 # now the rules...
@@ -1140,6 +1175,26 @@ bin/smbfilter@EXEEXT@: $(SMBFILTER_OBJ) bin/.dummy
 	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS)
 
 
+bin/ldbedit: $(LDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS)
+
+bin/ldbsearch: $(LDBSEARCH_OBJ) @BUILD_POPT@ bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS)
+
+bin/ldbadd: $(LDBADD_OBJ) @BUILD_POPT@ bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS)
+
+bin/ldbmodify: $(LDBMODIFY_OBJ) @BUILD_POPT@ bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS)
+
+bin/ldbdel: $(LDBDEL_OBJ) @BUILD_POPT@ bin/.dummy
+	@echo Linking $@
+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS)
+
 bin/libaddns.@SHLIBEXT@: $(LIBADDNS_OBJ:.o=.@PICSUFFIX@)
 	@echo Linking libaddns shared library $@
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBADDNS_OBJ:.o=.@PICSUFFIX@) $(LDFLAGS) $(LIBS) \
@@ -1624,7 +1679,7 @@ installpammodules: $(PAM_MODULES)
 
 PYTHON_OBJS = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) $(RPC_PARSE_OBJ) \
 	$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-	$(SECRETS_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ)
+	$(SECRETS_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ) $(LDB_OBJ)
 
 PYTHON_PICOBJS = $(PYTHON_OBJS:.o=.@PICSUFFIX@)
 
diff --git a/source3/aclocal.m4 b/source3/aclocal.m4
index 5b25cfe5c9..185bae0f44 100644
--- a/source3/aclocal.m4
+++ b/source3/aclocal.m4
@@ -819,3 +819,6 @@ fi
 ])
 
 m4_include(lib/replace/libreplace.m4)
+
+dnl not needed yet, might be needed in the future
+dnl m4_include(lib/ldb/libldb.m4)
diff --git a/source3/groupdb/mapping.c b/source3/groupdb/mapping.c
index 1d7934e9bf..ba1a7d1dee 100644
--- a/source3/groupdb/mapping.c
+++ b/source3/groupdb/mapping.c
@@ -22,116 +22,7 @@
  */
 
 #include "includes.h"
-
-static TDB_CONTEXT *tdb; /* used for driver files */
-
-#define DATABASE_VERSION_V1 1 /* native byte format. */
-#define DATABASE_VERSION_V2 2 /* le format. */
-
-#define GROUP_PREFIX "UNIXGROUP/"
-
-/* Alias memberships are stored reverse, as memberships. The performance
- * critical operation is to determine the aliases a SID is member of, not
- * listing alias members. So we store a list of alias SIDs a SID is member of
- * hanging of the member as key.
- */
-#define MEMBEROF_PREFIX "MEMBEROF/"
-
-
-static BOOL enum_group_mapping(const DOM_SID *sid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
-                               size_t *p_num_entries, BOOL unix_only);
-static BOOL group_map_remove(const DOM_SID *sid);
-			
-/****************************************************************************
- Open the group mapping tdb.
-****************************************************************************/
-
-static BOOL init_group_mapping(void)
-{
-	const char *vstring = "INFO/version";
-	int32 vers_id;
-	GROUP_MAP *map_table = NULL;
-	size_t num_entries = 0;
-	
-	if (tdb)
-		return True;
-		
-	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
-	if (!tdb) {
-		DEBUG(0,("Failed to open group mapping database\n"));
-		return False;
-	}
-
-	/* handle a Samba upgrade */
-	tdb_lock_bystring(tdb, vstring);
-
-	/* Cope with byte-reversed older versions of the db. */
-	vers_id = tdb_fetch_int32(tdb, vstring);
-	if ((vers_id == DATABASE_VERSION_V1) || (IREV(vers_id) == DATABASE_VERSION_V1)) {
-		/* Written on a bigendian machine with old fetch_int code. Save as le. */
-		tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
-		vers_id = DATABASE_VERSION_V2;
-	}
-
-	/* if its an unknown version we remove everthing in the db */
-	
-	if (vers_id != DATABASE_VERSION_V2) {
-		tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
-		tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
-	}
-
-	tdb_unlock_bystring(tdb, vstring);
-
-	/* cleanup any map entries with a gid == -1 */
-	
-	if ( enum_group_mapping( NULL, SID_NAME_UNKNOWN, &map_table, &num_entries, False ) ) {
-		int i;
-		
-		for ( i=0; i<num_entries; i++ ) {
-			if ( map_table[i].gid == -1 ) {
-				group_map_remove( &map_table[i].sid );
-			}
-		}
-		
-		SAFE_FREE( map_table );
-	}
-
-
-	return True;
-}
-
-/****************************************************************************
-****************************************************************************/
-static BOOL add_mapping_entry(GROUP_MAP *map, int flag)
-{
-	TDB_DATA kbuf, dbuf;
-	pstring key, buf;
-	fstring string_sid="";
-	int len;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-	
-	sid_to_string(string_sid, &map->sid);
-
-	len = tdb_pack(buf, sizeof(buf), "ddff",
-			map->gid, map->sid_name_use, map->nt_name, map->comment);
-
-	if (len > sizeof(buf))
-		return False;
-
-	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-	dbuf.dsize = len;
-	dbuf.dptr = buf;
-	if (tdb_store(tdb, kbuf, dbuf, flag) != 0) return False;
-
-	return True;
-}
+#include "groupdb/mapping.h"
 
 /****************************************************************************
 initialise first time the mapping list
@@ -216,327 +107,11 @@ NTSTATUS map_unix_group(const struct group *grp, GROUP_MAP *pmap)
 	return status;
 }
 
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
-{
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring string_sid;
-	int ret = 0;
-	
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* the key is the SID, retrieving is direct */
-
-	sid_to_string(string_sid, &sid);
-	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
-
-	kbuf.dptr = key;
-	kbuf.dsize = strlen(key)+1;
-		
-	dbuf = tdb_fetch(tdb, kbuf);
-	if (!dbuf.dptr)
-		return False;
-
-	ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				&map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
-
-	SAFE_FREE(dbuf.dptr);
-	
-	if ( ret == -1 ) {
-		DEBUG(3,("get_group_map_from_sid: tdb_unpack failure\n"));
-		return False;
-	}
-	
-	sid_copy(&map->sid, &sid);
-	
-	return True;
-}
-
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
-{
-	TDB_DATA kbuf, dbuf, newkey;
-	fstring string_sid;
-	int ret;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* we need to enumerate the TDB to find the GID */
-
-	for (kbuf = tdb_firstkey(tdb); 
-	     kbuf.dptr; 
-	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
-
-		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
-		
-		dbuf = tdb_fetch(tdb, kbuf);
-		if (!dbuf.dptr)
-			continue;
-
-		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
-
-		string_to_sid(&map->sid, string_sid);
-		
-		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				 &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
-
-		SAFE_FREE(dbuf.dptr);
-
-		if ( ret == -1 ) {
-			DEBUG(3,("get_group_map_from_gid: tdb_unpack failure\n"));
-			return False;
-		}
-	
-		if (gid==map->gid) {
-			SAFE_FREE(kbuf.dptr);
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/****************************************************************************
- Return the sid and the type of the unix group.
-****************************************************************************/
-
-static BOOL get_group_map_from_ntname(const char *name, GROUP_MAP *map)
-{
-	TDB_DATA kbuf, dbuf, newkey;
-	fstring string_sid;
-	int ret;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("get_group_map_from_ntname:failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* we need to enumerate the TDB to find the name */
 
-	for (kbuf = tdb_firstkey(tdb); 
-	     kbuf.dptr; 
-	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
 
-		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
-		
-		dbuf = tdb_fetch(tdb, kbuf);
-		if (!dbuf.dptr)
-			continue;
 
-		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
 
-		string_to_sid(&map->sid, string_sid);
-		
-		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				 &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
 
-		SAFE_FREE(dbuf.dptr);
-		
-		if ( ret == -1 ) {
-			DEBUG(3,("get_group_map_from_ntname: tdb_unpack failure\n"));
-			return False;
-		}
-
-		if ( strequal(name, map->nt_name) ) {
-			SAFE_FREE(kbuf.dptr);
-			return True;
-		}
-	}
-
-	return False;
-}
-
-/****************************************************************************
- Remove a group mapping entry.
-****************************************************************************/
-
-static BOOL group_map_remove(const DOM_SID *sid)
-{
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring string_sid;
-	
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	/* the key is the SID, retrieving is direct */
-
-	sid_to_string(string_sid, sid);
-	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
-
-	kbuf.dptr = key;
-	kbuf.dsize = strlen(key)+1;
-		
-	dbuf = tdb_fetch(tdb, kbuf);
-	if (!dbuf.dptr)
-		return False;
-	
-	SAFE_FREE(dbuf.dptr);
-
-	if(tdb_delete(tdb, kbuf) != TDB_SUCCESS)
-		return False;
-
-	return True;
-}
-
-/****************************************************************************
- Enumerate the group mapping.
-****************************************************************************/
-
-static BOOL enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
-			size_t *p_num_entries, BOOL unix_only)
-{
-	TDB_DATA kbuf, dbuf, newkey;
-	fstring string_sid;
-	GROUP_MAP map;
-	GROUP_MAP *mapt;
-	int ret;
-	size_t entries=0;
-	DOM_SID grpsid;
-	uint32 rid;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return(False);
-	}
-
-	*p_num_entries=0;
-	*pp_rmap=NULL;
-
-	for (kbuf = tdb_firstkey(tdb); 
-	     kbuf.dptr; 
-	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
-
-		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0)
-			continue;
-
-		dbuf = tdb_fetch(tdb, kbuf);
-		if (!dbuf.dptr)
-			continue;
-
-		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
-				
-		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-				 &map.gid, &map.sid_name_use, &map.nt_name, &map.comment);
-
-		SAFE_FREE(dbuf.dptr);
-
-		if ( ret == -1 ) {
-			DEBUG(3,("enum_group_mapping: tdb_unpack failure\n"));
-			continue;
-		}
-	
-		/* list only the type or everything if UNKNOWN */
-		if (sid_name_use!=SID_NAME_UNKNOWN  && sid_name_use!=map.sid_name_use) {
-			DEBUG(11,("enum_group_mapping: group %s is not of the requested type\n", map.nt_name));
-			continue;
-		}
-
-		if (unix_only==ENUM_ONLY_MAPPED && map.gid==-1) {
-			DEBUG(11,("enum_group_mapping: group %s is non mapped\n", map.nt_name));
-			continue;
-		}
-
-		string_to_sid(&grpsid, string_sid);
-		sid_copy( &map.sid, &grpsid );
-		
-		sid_split_rid( &grpsid, &rid );
-
-		/* Only check the domain if we were given one */
-
-		if ( domsid && !sid_equal( domsid, &grpsid ) ) {
-			DEBUG(11,("enum_group_mapping: group %s is not in domain %s\n", 
-				string_sid, sid_string_static(domsid)));
-			continue;
-		}
-
-		DEBUG(11,("enum_group_mapping: returning group %s of "
-			  "type %s\n", map.nt_name,
-			  sid_type_lookup(map.sid_name_use)));
-
-		(*pp_rmap) = SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1);
-		if (!(*pp_rmap)) {
-			DEBUG(0,("enum_group_mapping: Unable to enlarge group map!\n"));
-			return False;
-		}
-
-		mapt = (*pp_rmap);
-
-		mapt[entries].gid = map.gid;
-		sid_copy( &mapt[entries].sid, &map.sid);
-		mapt[entries].sid_name_use = map.sid_name_use;
-		fstrcpy(mapt[entries].nt_name, map.nt_name);
-		fstrcpy(mapt[entries].comment, map.comment);
-
-		entries++;
-
-	}
-
-	*p_num_entries=entries;
-
-	return True;
-}
-
-/* This operation happens on session setup, so it should better be fast. We
- * store a list of aliases a SID is member of hanging off MEMBEROF/SID. */
-
-static NTSTATUS one_alias_membership(const DOM_SID *member,
-				     DOM_SID **sids, size_t *num)
-{
-	fstring key, string_sid;
-	TDB_DATA kbuf, dbuf;
-	const char *p;
-
-	if (!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	sid_to_string(string_sid, member);
-	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-
-	dbuf = tdb_fetch(tdb, kbuf);
-
-	if (dbuf.dptr == NULL) {
-		return NT_STATUS_OK;
-	}
-
-	p = dbuf.dptr;
-
-	while (next_token(&p, string_sid, " ", sizeof(string_sid))) {
-
-		DOM_SID alias;
-
-		if (!string_to_sid(&alias, string_sid))
-			continue;
-
-		add_sid_to_array_unique(NULL, &alias, sids, num);
-
-		if (sids == NULL)
-			return NT_STATUS_NO_MEMORY;
-	}
-
-	SAFE_FREE(dbuf.dptr);
-	return NT_STATUS_OK;
-}
 
 static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
 				  DOM_SID **sids, size_t *num)
@@ -554,235 +129,13 @@ static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
 	return NT_STATUS_OK;
 }
 
-static BOOL is_aliasmem(const DOM_SID *alias, const DOM_SID *member)
-{
-	DOM_SID *sids;
-	size_t i, num;
-
-	/* This feels the wrong way round, but the on-disk data structure
-	 * dictates it this way. */
-	if (!NT_STATUS_IS_OK(alias_memberships(member, 1, &sids, &num)))
-		return False;
-
-	for (i=0; i<num; i++) {
-		if (sid_compare(alias, &sids[i]) == 0) {
-			SAFE_FREE(sids);
-			return True;
-		}
-	}
-	SAFE_FREE(sids);
-	return False;
-}
-
-static NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
-{
-	GROUP_MAP map;
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring string_sid;
-	char *new_memberstring;
-	int result;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	if (!get_group_map_from_sid(*alias, &map))
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	if ( (map.sid_name_use != SID_NAME_ALIAS) &&
-	     (map.sid_name_use != SID_NAME_WKN_GRP) )
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	if (is_aliasmem(alias, member))
-		return NT_STATUS_MEMBER_IN_ALIAS;
-
-	sid_to_string(string_sid, member);
-	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-
-	dbuf = tdb_fetch(tdb, kbuf);
-
-	sid_to_string(string_sid, alias);
-
-	if (dbuf.dptr != NULL) {
-		asprintf(&new_memberstring, "%s %s", (char *)(dbuf.dptr),
-			 string_sid);
-	} else {
-		new_memberstring = SMB_STRDUP(string_sid);
-	}
-
-	if (new_memberstring == NULL)
-		return NT_STATUS_NO_MEMORY;
-
-	SAFE_FREE(dbuf.dptr);
-	dbuf.dsize = strlen(new_memberstring)+1;
-	dbuf.dptr = new_memberstring;
-
-	result = tdb_store(tdb, kbuf, dbuf, 0);
-
-	SAFE_FREE(new_memberstring);
-
-	return (result == 0 ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED);
-}
-
 struct aliasmem_closure {
 	const DOM_SID *alias;
 	DOM_SID **sids;
 	size_t *num;
 };
 
-static int collect_aliasmem(TDB_CONTEXT *tdb_ctx, TDB_DATA key, TDB_DATA data,
-			    void *state)
-{
-	struct aliasmem_closure *closure = (struct aliasmem_closure *)state;
-	const char *p;
-	fstring alias_string;
-
-	if (strncmp(key.dptr, MEMBEROF_PREFIX,
-		    strlen(MEMBEROF_PREFIX)) != 0)
-		return 0;
-
-	p = data.dptr;
-
-	while (next_token(&p, alias_string, " ", sizeof(alias_string))) {
-
-		DOM_SID alias, member;
-		const char *member_string;
-		
-
-		if (!string_to_sid(&alias, alias_string))
-			continue;
-
-		if (sid_compare(closure->alias, &alias) != 0)
-			continue;
-
-		/* Ok, we found the alias we're looking for in the membership
-		 * list currently scanned. The key represents the alias
-		 * member. Add that. */
-
-		member_string = strchr(key.dptr, '/');
-
-		/* Above we tested for MEMBEROF_PREFIX which includes the
-		 * slash. */
-
-		SMB_ASSERT(member_string != NULL);
-		member_string += 1;
-
-		if (!string_to_sid(&member, member_string))
-			continue;
-		
-		add_sid_to_array(NULL, &member, closure->sids, closure->num);
-	}
-
-	return 0;
-}
-
-static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
-{
-	GROUP_MAP map;
-	struct aliasmem_closure closure;
-
-	if(!init_group_mapping()) {
-		DEBUG(0,("failed to initialize group mapping\n"));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-
-	if (!get_group_map_from_sid(*alias, &map))
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	if ( (map.sid_name_use != SID_NAME_ALIAS) &&
-	     (map.sid_name_use != SID_NAME_WKN_GRP) )
-		return NT_STATUS_NO_SUCH_ALIAS;
-
-	*sids = NULL;
-	*num = 0;
-
-	closure.alias = alias;
-	closure.sids = sids;
-	closure.num = num;
-
-	tdb_traverse(tdb, collect_aliasmem, &closure);
-	return NT_STATUS_OK;
-}
-
-static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
-{
-	NTSTATUS result;
-	DOM_SID *sids;
-	size_t i, num;
-	BOOL found = False;
-	char *member_string;
-	TDB_DATA kbuf, dbuf;
-	pstring key;
-	fstring sid_string;
-
-	result = alias_memberships(member, 1, &sids, &num);
-
-	if (!NT_STATUS_IS_OK(result))
-		return result;
-
-	for (i=0; i<num; i++) {
-		if (sid_compare(&sids[i], alias) == 0) {
-			found = True;
-			break;
-		}
-	}
 
-	if (!found) {
-		SAFE_FREE(sids);
-		return NT_STATUS_MEMBER_NOT_IN_ALIAS;
-	}
-
-	if (i < num)
-		sids[i] = sids[num-1];
-
-	num -= 1;
-
-	sid_to_string(sid_string, member);
-	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, sid_string);
-
-	kbuf.dsize = strlen(key)+1;
-	kbuf.dptr = key;
-
-	if (num == 0)
-		return tdb_delete(tdb, kbuf) == 0 ?
-			NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-
-	member_string = SMB_STRDUP("");
-
-	if (member_string == NULL) {
-		SAFE_FREE(sids);
-		return NT_STATUS_NO_MEMORY;
-	}
-
-	for (i=0; i<num; i++) {
-		char *s = member_string;
-
-		sid_to_string(sid_string, &sids[i]);
-		asprintf(&member_string, "%s %s", s, sid_string);
-
-		SAFE_FREE(s);
-		if (member_string == NULL) {
-			SAFE_FREE(sids);
-			return NT_STATUS_NO_MEMORY;
-		}
-	}
-
-	dbuf.dsize = strlen(member_string)+1;
-	dbuf.dptr = member_string;
-
-	result = tdb_store(tdb, kbuf, dbuf, 0) == 0 ?
-		NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
-
-	SAFE_FREE(sids);
-	SAFE_FREE(member_string);
-
-	return result;
-}
 
 /*
  *
diff --git a/source3/groupdb/mapping.h b/source3/groupdb/mapping.h
new file mode 100644
index 0000000000..9daaa7fdd7
--- /dev/null
+++ b/source3/groupdb/mapping.h
@@ -0,0 +1,26 @@
+#define DATABASE_VERSION_V1 1 /* native byte format. */
+#define DATABASE_VERSION_V2 2 /* le format. */
+
+#define GROUP_PREFIX "UNIXGROUP/"
+
+/* Alias memberships are stored reverse, as memberships. The performance
+ * critical operation is to determine the aliases a SID is member of, not
+ * listing alias members. So we store a list of alias SIDs a SID is member of
+ * hanging of the member as key.
+ */
+#define MEMBEROF_PREFIX "MEMBEROF/"
+
+/* internal prototypes */
+BOOL enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
+			size_t *p_num_entries, BOOL unix_only);
+BOOL group_map_remove(const DOM_SID *sid);
+BOOL init_group_mapping(void);
+NTSTATUS one_alias_membership(const DOM_SID *member,
+			      DOM_SID **sids, size_t *num);
+BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map);
+BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map);
+BOOL get_group_map_from_ntname(const char *name, GROUP_MAP *map);
+BOOL add_mapping_entry(GROUP_MAP *map, int flag);
+NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member);
+NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member);
+NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num);
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
new file mode 100644
index 0000000000..c8824674e1
--- /dev/null
+++ b/source3/groupdb/mapping_ldb.c
@@ -0,0 +1,670 @@
+/* 
+ *  Unix SMB/CIFS implementation.
+ *
+ *  group mapping code on top of ldb
+ *
+ *  Copyright (C) Andrew Tridgell              2006
+ *
+ * based on tdb group mapping code from groupdb/mapping.c
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program 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 General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+#include "groupdb/mapping.h"
+#include "lib/ldb/include/includes.h"
+#include "lib/ldb/include/ldb_errors.h"
+
+static struct ldb_context *ldb;
+
+static BOOL mapping_upgrade(const char *tdb_path);
+
+/*
+  connect to the group mapping ldb
+*/
+ BOOL init_group_mapping(void)
+{
+	BOOL existed;
+	const char *init_ldif[] = 
+		{ "dn: @ATTRIBUTES\n" \
+		  "ntName: CASE_INSENSITIVE\n" \
+		  "\n",
+		  "dn: @INDEXLIST\n" \
+		  "@IDXATTR: gidNumber\n" \
+		  "@IDXATTR: ntName\n" \
+		  "@IDXATTR: memberOf\n" };
+	const char *db_path, *tdb_path;
+	int ret;
+	int flags = 0;
+
+	if (ldb != NULL) {
+		return True;
+	}
+
+	/* this is needed as Samba3 doesn't have the auto init code yet */
+	ldb_tdb_init();
+
+	db_path = lock_path("group_mapping.ldb");
+
+	ldb = ldb_init(NULL);
+	if (ldb == NULL) goto failed;
+
+	existed = file_exist(db_path, NULL);
+
+	if (lp_parm_bool(-1, "groupmap", "nosync", False)) {
+		flags |= LDB_FLG_NOSYNC;
+	}
+
+	ret = ldb_connect(ldb, db_path, flags, NULL);
+	if (ret != LDB_SUCCESS) {
+		goto failed;
+	}
+	
+	if (!existed) {
+		/* initialise the ldb with an index */
+		struct ldb_ldif *ldif;
+		int i;
+		for (i=0;i<ARRAY_SIZE(init_ldif);i++) {
+			ldif = ldb_ldif_read_string(ldb, &init_ldif[i]);
+			if (ldif == NULL) goto failed;
+			ret = ldb_add(ldb, ldif->msg);
+			talloc_free(ldif);
+			if (ret == -1) goto failed;
+		}
+	}
+
+	/* possibly upgrade */
+	tdb_path = lock_path("group_mapping.tdb");
+	if (file_exist(tdb_path, NULL) && !mapping_upgrade(tdb_path)) {
+		unlink(lock_path("group_mapping.ldb"));
+		goto failed;
+	}
+
+	return True;
+
+failed:
+	DEBUG(0,("Failed to open group mapping ldb '%s' - '%s'\n",
+		 db_path, ldb?ldb_errstring(ldb):strerror(errno)));
+	talloc_free(ldb);
+	ldb = NULL;
+	return False;
+}
+
+
+/*
+  form the DN for a mapping entry from a SID
+ */
+static struct ldb_dn *mapping_dn(TALLOC_CTX *mem_ctx, const DOM_SID *sid)
+{
+	fstring string_sid;
+	uint32_t rid;
+	DOM_SID domsid;
+
+	sid_copy(&domsid, sid);
+	if (!sid_split_rid(&domsid, &rid)) {
+		return NULL;
+	}
+      	if (!sid_to_string(string_sid, &domsid)) {
+		return NULL;
+	}
+	/* we split by domain and rid so we can do a subtree search
+	   when we only want one domain */
+	return ldb_dn_string_compose(mem_ctx, NULL, "domain=%s,rid=%u", 
+				     string_sid, rid);
+}
+
+/*
+  add a group mapping entry
+ */
+ BOOL add_mapping_entry(GROUP_MAP *map, int flag)
+{
+	struct ldb_message *msg;	
+	int ret, i;
+	fstring string_sid;
+
+	if (!init_group_mapping()) {
+		return False;
+	}
+	
+	msg = ldb_msg_new(ldb);
+	if (msg == NULL) return False;
+
+	msg->dn = mapping_dn(msg, &map->sid);
+	if (msg->dn == NULL) goto failed;
+
+	if (ldb_msg_add_string(msg, "objectClass", "groupMap") != LDB_SUCCESS ||
+	    ldb_msg_add_string(msg, "sid", 
+			       sid_to_string(string_sid, &map->sid)) != LDB_SUCCESS ||
+	    ldb_msg_add_fmt(msg, "gidNumber", "%u", (unsigned)map->gid) != LDB_SUCCESS ||
+	    ldb_msg_add_fmt(msg, "sidNameUse", "%u", (unsigned)map->sid_name_use) != LDB_SUCCESS ||
+	    ldb_msg_add_string(msg, "ntName", map->nt_name) != LDB_SUCCESS ||
+	    ldb_msg_add_string(msg, "comment", map->comment) != LDB_SUCCESS) {
+		goto failed;
+	}
+
+	ret = ldb_add(ldb, msg);
+
+	/* if it exists we update it. This is a hangover from the semantics the
+	   tdb backend had */
+	if (ret == LDB_ERR_ENTRY_ALREADY_EXISTS) {
+		for (i=0;i<msg->num_elements;i++) {
+			msg->elements[i].flags = LDB_FLAG_MOD_REPLACE;
+		}
+		ret = ldb_modify(ldb, msg);
+	}
+
+	talloc_free(msg);
+
+	return ret == LDB_SUCCESS;
+
+failed:
+	talloc_free(msg);
+	return False;
+}
+
+/*
+  unpack a ldb message into a GROUP_MAP structure
+*/
+static BOOL msg_to_group_map(struct ldb_message *msg, GROUP_MAP *map)
+{
+	const char *sidstr;
+
+	map->gid          = ldb_msg_find_attr_as_int(msg, "gidNumber", -1);
+	map->sid_name_use = ldb_msg_find_attr_as_int(msg, "sidNameUse", -1);
+	fstrcpy(map->nt_name, ldb_msg_find_attr_as_string(msg, "ntName", NULL));
+	fstrcpy(map->comment, ldb_msg_find_attr_as_string(msg, "comment", NULL));
+	sidstr = ldb_msg_find_attr_as_string(msg, "sid", NULL);
+
+	if (!string_to_sid(&map->sid, sidstr) ||
+	    map->gid == (gid_t)-1 ||
+	    map->sid_name_use == (enum lsa_SidType)-1) {
+		DEBUG(0,("Unable to unpack group mapping\n"));
+		return False;
+	}
+
+	return True;
+}
+
+/*
+ return a group map entry for a given sid
+*/
+ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
+{
+	int ret;
+	struct ldb_dn *dn;
+	struct ldb_result *res=NULL;
+	
+	if (!init_group_mapping()) {
+		return False;
+	}
+
+	dn = mapping_dn(ldb, &sid);
+	if (dn == NULL) goto failed;
+
+	ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, NULL, &res);
+	talloc_steal(dn, res);
+	if (ret != LDB_SUCCESS || res->count != 1) {
+		goto failed;
+	}
+
+	if (!msg_to_group_map(res->msgs[0], map)) goto failed;
+
+	talloc_free(dn);
+	return True;
+
+failed:
+	talloc_free(dn);
+	return False;
+}
+
+/*
+ return a group map entry for a given gid
+*/
+ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
+{
+	int ret;
+	char *expr;
+	struct ldb_result *res=NULL;
+
+	if (!init_group_mapping()) {
+		return False;
+	}
+
+	expr = talloc_asprintf(ldb, "(&(gidNumber=%u)(objectClass=groupMap))", 
+			       (unsigned)gid);
+	if (expr == NULL) goto failed;
+
+	ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+	talloc_steal(expr, res);
+	if (ret != LDB_SUCCESS || res->count != 1) goto failed;
+	
+	if (!msg_to_group_map(res->msgs[0], map)) goto failed;
+
+	talloc_free(expr);
+	return True;
+
+failed:
+	talloc_free(expr);
+	return False;
+}
+
+/*
+  Return the sid and the type of the unix group.
+*/
+ BOOL get_group_map_from_ntname(const char *name, GROUP_MAP *map)
+{
+	int ret;
+	char *expr;
+	struct ldb_result *res=NULL;
+
+	if (!init_group_mapping()) {
+		return False;
+	}
+
+	expr = talloc_asprintf(ldb, "(&(ntName=%s)(objectClass=groupMap))", name);
+	if (expr == NULL) goto failed;
+
+	ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+	talloc_steal(expr, res);
+	if (ret != LDB_SUCCESS || res->count != 1) goto failed;
+	
+	if (!msg_to_group_map(res->msgs[0], map)) goto failed;
+
+	talloc_free(expr);
+	return True;
+
+failed:
+	talloc_free(expr);
+	return False;
+}
+
+/*
+ Remove a group mapping entry.
+*/
+ BOOL group_map_remove(const DOM_SID *sid)
+{
+	struct ldb_dn *dn;
+	int ret;
+	
+	if (!init_group_mapping()) {
+		return False;
+	}
+
+	dn = mapping_dn(ldb, sid);
+	ret = ldb_delete(ldb, dn);
+	talloc_free(dn);
+
+	return ret == LDB_SUCCESS;
+}
+
+
+/*
+  Enumerate the group mappings for a domain
+*/
+ BOOL enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_use, 
+			 GROUP_MAP **pp_rmap,
+			 size_t *p_num_entries, BOOL unix_only)
+{
+	int i, ret;
+	char *expr;
+	fstring name;
+	struct ldb_result *res;
+	struct ldb_dn *basedn=NULL;
+	TALLOC_CTX *tmp_ctx;
+
+	if (!init_group_mapping()) {
+		return False;
+	}
+
+	tmp_ctx = talloc_new(ldb);
+	if (tmp_ctx == NULL) goto failed;
+
+	if (sid_name_use == SID_NAME_UNKNOWN) {
+		expr = talloc_asprintf(tmp_ctx, "(&(objectClass=groupMap))");
+	} else {
+		expr = talloc_asprintf(tmp_ctx, "(&(sidNameUse=%u)(objectClass=groupMap))",
+				       sid_name_use);
+	}
+	if (expr == NULL) goto failed;
+
+	/* we do a subtree search on the domain */
+	if (domsid != NULL) {
+		sid_to_string(name, domsid);
+		basedn = ldb_dn_string_compose(tmp_ctx, NULL, "domain=%s", name);
+		if (basedn == NULL) goto failed;
+	}
+
+	ret = ldb_search(ldb, basedn, LDB_SCOPE_SUBTREE, expr, NULL, &res);
+	if (ret != LDB_SUCCESS) goto failed;
+
+	(*pp_rmap) = NULL;
+	*p_num_entries = 0;
+
+	for (i=0;i<res->count;i++) {
+		(*pp_rmap) = SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, 
+					       (*p_num_entries)+1);
+		if (!(*pp_rmap)) goto failed;
+
+		if (!msg_to_group_map(res->msgs[i], &(*pp_rmap)[*p_num_entries])) {
+			goto failed;
+		}
+
+		(*p_num_entries)++;
+	}
+
+	talloc_free(tmp_ctx);
+	return True;
+
+failed:
+	talloc_free(tmp_ctx);
+	return False;	
+}
+
+/* 
+   This operation happens on session setup, so it should better be fast. We
+   store a list of aliases a SID is member of hanging off MEMBEROF/SID. 
+*/
+ NTSTATUS one_alias_membership(const DOM_SID *member,
+			       DOM_SID **sids, size_t *num)
+{
+	const char *attrs[] = {
+		"sid",
+		NULL
+	};
+	DOM_SID alias;
+	char *expr;
+	int ret, i;
+	struct ldb_result *res=NULL;
+	fstring string_sid;
+	NTSTATUS status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+	
+	if (!init_group_mapping()) {
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
+	*sids = NULL;
+	*num = 0;
+
+      	if (!sid_to_string(string_sid, member)) {
+		return NT_STATUS_INVALID_PARAMETER;
+	}
+
+	expr = talloc_asprintf(ldb, "(&(memberOf=%s)(objectClass=groupMap))", 
+			       string_sid);
+	if (expr == NULL) goto failed;
+
+	ret = ldb_search(ldb, NULL, LDB_SCOPE_SUBTREE, expr, attrs, &res);
+	talloc_steal(expr, res);
+	if (ret != LDB_SUCCESS) {
+		goto failed;
+	}
+
+	for (i=0;i<res->count;i++) {
+		struct ldb_message_element *el;
+		el = ldb_msg_find_element(res->msgs[i], "sid");
+		if (el == NULL || el->num_values != 1) {
+			status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+			goto failed;
+		}
+		string_to_sid(&alias, (char *)el->values[0].data);
+		add_sid_to_array_unique(NULL, &alias, sids, num);
+		if (sids == NULL) {
+			status = NT_STATUS_NO_MEMORY;
+			goto failed;
+		}
+	}
+
+	talloc_free(expr);
+	return NT_STATUS_OK;
+
+failed:
+	talloc_free(expr);
+	return status;
+}
+
+/*
+  add/remove a memberOf field
+*/
+static NTSTATUS modify_aliasmem(const DOM_SID *alias, const DOM_SID *member,
+				int operation)
+{
+	fstring string_sid;
+	int ret;
+	struct ldb_message msg;
+	struct ldb_message_element el;
+	struct ldb_val val;
+	TALLOC_CTX *tmp_ctx;
+	GROUP_MAP map;
+
+	if (!init_group_mapping()) {
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
+	if (!get_group_map_from_sid(*alias, &map)) {
+		sid_to_string(string_sid, alias);
+		return NT_STATUS_NO_SUCH_ALIAS;
+	}
+
+	if ((map.sid_name_use != SID_NAME_ALIAS) &&
+	    (map.sid_name_use != SID_NAME_WKN_GRP)) {
+		DEBUG(0,("sid_name_use=%d\n", map.sid_name_use));
+		return NT_STATUS_NO_SUCH_ALIAS;
+	}
+
+	tmp_ctx = talloc_new(NULL);
+	if (tmp_ctx == NULL) {
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	msg.dn = mapping_dn(tmp_ctx, alias);
+	msg.num_elements = 1;
+	msg.elements = &el;
+	el.flags = operation;
+	el.name = talloc_strdup(tmp_ctx, "memberOf");
+	el.num_values = 1;
+	el.values = &val;
+	sid_to_string(string_sid, member);
+	val.data = (uint8_t *)string_sid;
+	val.length = strlen(string_sid);
+
+	ret = ldb_modify(ldb, &msg);
+	talloc_free(tmp_ctx);
+
+	if (ret == LDB_ERR_NO_SUCH_OBJECT) {
+		return NT_STATUS_NO_SUCH_ALIAS;
+	}
+
+	if (operation == LDB_FLAG_MOD_ADD &&
+	    ret == LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS) {
+		return NT_STATUS_MEMBER_IN_ALIAS;
+	}
+
+	return (ret == LDB_SUCCESS ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED);
+}
+
+ NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+{
+	return modify_aliasmem(alias, member, LDB_FLAG_MOD_ADD);
+}
+
+ NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+{
+	return modify_aliasmem(alias, member, LDB_FLAG_MOD_DELETE);
+}
+
+
+/*
+  enumerate sids that have the given alias set in memberOf
+*/
+ NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
+{
+	const char *attrs[] = {
+		"memberOf",
+		NULL
+	};
+	int ret, i;
+	struct ldb_result *res=NULL;
+	struct ldb_dn *dn;
+	struct ldb_message_element *el;
+	
+	if (!init_group_mapping()) {
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
+	*sids = NULL;
+	*num = 0;
+
+	dn = mapping_dn(ldb, alias);
+
+	ret = ldb_search(ldb, dn, LDB_SCOPE_BASE, NULL, attrs, &res);
+	talloc_steal(dn, res);
+	if (ret == LDB_SUCCESS && res->count == 0) {
+		talloc_free(dn);
+		return NT_STATUS_OK;
+	}
+	if (ret != LDB_SUCCESS) {
+		talloc_free(dn);
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
+	}
+
+	el = ldb_msg_find_element(res->msgs[0], "memberOf");
+	if (el == NULL) {
+		talloc_free(dn);
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
+	}
+	
+	for (i=0;i<el->num_values;i++) {
+		DOM_SID sid;
+		string_to_sid(&sid, (const char *)el->values[i].data);
+		add_sid_to_array_unique(NULL, &sid, sids, num);
+		if (sids == NULL) {
+			talloc_free(dn);
+			return NT_STATUS_NO_MEMORY;
+		}
+	}
+	talloc_free(dn);
+
+	return NT_STATUS_OK;
+}
+
+/*
+  upgrade one group mapping record from the old tdb format
+*/
+static int upgrade_map_record(TDB_CONTEXT *tdb_ctx, TDB_DATA key, 
+			      TDB_DATA data, void *state)
+{
+	int ret;
+	GROUP_MAP map;
+
+	if (strncmp(key.dptr, GROUP_PREFIX, 
+		    MIN(key.dsize, strlen(GROUP_PREFIX))) != 0) {
+		return 0;
+	}
+
+	if (!string_to_sid(&map.sid, strlen(GROUP_PREFIX) + (const char *)key.dptr)) {
+		DEBUG(0,("Bad sid key '%s' during upgrade\n", (const char *)key.dptr));
+		*(int *)state = -1;
+		return -1;
+	}
+
+	ret = tdb_unpack(data.dptr, data.dsize, "ddff",
+			 &map.gid, &map.sid_name_use, &map.nt_name, &map.comment);
+	if (ret == -1) {
+		DEBUG(0,("Failed to unpack group map record during upgrade\n"));
+		*(int *)state = -1;
+		return -1;
+	}
+
+	if (!add_mapping_entry(&map, 0)) {
+		DEBUG(0,("Failed to add mapping entry during upgrade\n"));
+		*(int *)state = -1;
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+  upgrade one alias record from the old tdb format
+*/
+static int upgrade_alias_record(TDB_CONTEXT *tdb_ctx, TDB_DATA key, 
+				TDB_DATA data, void *state)
+{
+	const char *p = data.dptr;
+	fstring string_sid;
+	DOM_SID member;
+
+	if (strncmp(key.dptr, MEMBEROF_PREFIX, 
+		    MIN(key.dsize, strlen(MEMBEROF_PREFIX))) != 0) {
+		return 0;
+	}
+
+	if (!string_to_sid(&member, strlen(MEMBEROF_PREFIX) + (const char *)key.dptr)) {
+		DEBUG(0,("Bad alias key %s during upgrade\n",
+			 (const char *)key.dptr));
+		*(int *)state = -1;
+	}
+
+	while (next_token(&p, string_sid, " ", sizeof(string_sid))) {
+		DOM_SID alias;
+		NTSTATUS status;
+		string_to_sid(&alias, string_sid);
+		status = add_aliasmem(&alias, &member);
+		if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_ALIAS)) {
+			DEBUG(0,("Ignoring orphaned alias record '%s'\n", 
+				 string_sid));
+		} else if (!NT_STATUS_IS_OK(status)) {
+			DEBUG(0,("Failed to add alias member during upgrade - %s\n",
+				 nt_errstr(status)));
+			*(int *)state = -1;
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+/*
+  upgrade from a old style tdb
+*/
+static BOOL mapping_upgrade(const char *tdb_path)
+{
+	static TDB_CONTEXT *tdb;
+	int ret, status=0;
+
+	tdb = tdb_open_log(tdb_path, 0, TDB_DEFAULT, O_RDWR, 0600);
+	if (tdb == NULL) goto failed;
+
+	/* we have to do the map records first, as alias records may
+	   reference them */
+	ret = tdb_traverse(tdb, upgrade_map_record, &status);
+	if (ret == -1 || status == -1) goto failed;
+
+	ret = tdb_traverse(tdb, upgrade_alias_record, &status);
+	if (ret == -1 || status == -1) goto failed;
+
+	if (tdb) tdb_close(tdb);
+
+	if (unlink(tdb_path) != 0) {
+		DEBUG(0,("Failed to delete old group mapping database\n"));
+		goto failed;
+	}
+	return True;
+
+failed:
+	DEBUG(0,("Failed to upgrade group mapping database\n"));
+	if (tdb) tdb_close(tdb);
+	return False;
+}
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
new file mode 100644
index 0000000000..12b7c682fb
--- /dev/null
+++ b/source3/groupdb/mapping_tdb.c
@@ -0,0 +1,688 @@
+/* 
+ *  Unix SMB/CIFS implementation.
+ *  RPC Pipe client / server routines
+ *  Copyright (C) Andrew Tridgell              1992-2006,
+ *  Copyright (C) Jean François Micouleau      1998-2001.
+ *  Copyright (C) Volker Lendecke              2006.
+ *  Copyright (C) Gerald Carter                2006.
+ *  
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program 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 General Public License for more details.
+ *  
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "includes.h"
+#include "groupdb/mapping.h"
+
+static TDB_CONTEXT *tdb; /* used for driver files */
+
+/****************************************************************************
+ Open the group mapping tdb.
+****************************************************************************/
+ BOOL init_group_mapping(void)
+{
+	const char *vstring = "INFO/version";
+	int32 vers_id;
+	GROUP_MAP *map_table = NULL;
+	size_t num_entries = 0;
+	
+	if (tdb)
+		return True;
+		
+	tdb = tdb_open_log(lock_path("group_mapping.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+	if (!tdb) {
+		DEBUG(0,("Failed to open group mapping database\n"));
+		return False;
+	}
+
+	/* handle a Samba upgrade */
+	tdb_lock_bystring(tdb, vstring);
+
+	/* Cope with byte-reversed older versions of the db. */
+	vers_id = tdb_fetch_int32(tdb, vstring);
+	if ((vers_id == DATABASE_VERSION_V1) || (IREV(vers_id) == DATABASE_VERSION_V1)) {
+		/* Written on a bigendian machine with old fetch_int code. Save as le. */
+		tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
+		vers_id = DATABASE_VERSION_V2;
+	}
+
+	/* if its an unknown version we remove everthing in the db */
+	
+	if (vers_id != DATABASE_VERSION_V2) {
+		tdb_traverse(tdb, tdb_traverse_delete_fn, NULL);
+		tdb_store_int32(tdb, vstring, DATABASE_VERSION_V2);
+	}
+
+	tdb_unlock_bystring(tdb, vstring);
+
+	/* cleanup any map entries with a gid == -1 */
+	
+	if ( enum_group_mapping( NULL, SID_NAME_UNKNOWN, &map_table, &num_entries, False ) ) {
+		int i;
+		
+		for ( i=0; i<num_entries; i++ ) {
+			if ( map_table[i].gid == -1 ) {
+				group_map_remove( &map_table[i].sid );
+			}
+		}
+		
+		SAFE_FREE( map_table );
+	}
+
+
+	return True;
+}
+
+/****************************************************************************
+****************************************************************************/
+ BOOL add_mapping_entry(GROUP_MAP *map, int flag)
+{
+	TDB_DATA kbuf, dbuf;
+	pstring key, buf;
+	fstring string_sid="";
+	int len;
+
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return(False);
+	}
+	
+	sid_to_string(string_sid, &map->sid);
+
+	len = tdb_pack(buf, sizeof(buf), "ddff",
+			map->gid, map->sid_name_use, map->nt_name, map->comment);
+
+	if (len > sizeof(buf))
+		return False;
+
+	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
+
+	kbuf.dsize = strlen(key)+1;
+	kbuf.dptr = key;
+	dbuf.dsize = len;
+	dbuf.dptr = buf;
+	if (tdb_store(tdb, kbuf, dbuf, flag) != 0) return False;
+
+	return True;
+}
+
+
+/****************************************************************************
+ Return the sid and the type of the unix group.
+****************************************************************************/
+
+ BOOL get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
+{
+	TDB_DATA kbuf, dbuf;
+	pstring key;
+	fstring string_sid;
+	int ret = 0;
+	
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return(False);
+	}
+
+	/* the key is the SID, retrieving is direct */
+
+	sid_to_string(string_sid, &sid);
+	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
+
+	kbuf.dptr = key;
+	kbuf.dsize = strlen(key)+1;
+		
+	dbuf = tdb_fetch(tdb, kbuf);
+	if (!dbuf.dptr)
+		return False;
+
+	ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+				&map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
+
+	SAFE_FREE(dbuf.dptr);
+	
+	if ( ret == -1 ) {
+		DEBUG(3,("get_group_map_from_sid: tdb_unpack failure\n"));
+		return False;
+	}
+
+	sid_copy(&map->sid, &sid);
+	
+	return True;
+}
+
+/****************************************************************************
+ Return the sid and the type of the unix group.
+****************************************************************************/
+
+ BOOL get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
+{
+	TDB_DATA kbuf, dbuf, newkey;
+	fstring string_sid;
+	int ret;
+
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return(False);
+	}
+
+	/* we need to enumerate the TDB to find the GID */
+
+	for (kbuf = tdb_firstkey(tdb); 
+	     kbuf.dptr; 
+	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+
+		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
+		
+		dbuf = tdb_fetch(tdb, kbuf);
+		if (!dbuf.dptr)
+			continue;
+
+		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
+
+		string_to_sid(&map->sid, string_sid);
+		
+		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+				 &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
+
+		SAFE_FREE(dbuf.dptr);
+
+		if ( ret == -1 ) {
+			DEBUG(3,("get_group_map_from_gid: tdb_unpack failure\n"));
+			return False;
+		}
+	
+		if (gid==map->gid) {
+			SAFE_FREE(kbuf.dptr);
+			return True;
+		}
+	}
+
+	return False;
+}
+
+/****************************************************************************
+ Return the sid and the type of the unix group.
+****************************************************************************/
+
+ BOOL get_group_map_from_ntname(const char *name, GROUP_MAP *map)
+{
+	TDB_DATA kbuf, dbuf, newkey;
+	fstring string_sid;
+	int ret;
+
+	if(!init_group_mapping()) {
+		DEBUG(0,("get_group_map_from_ntname:failed to initialize group mapping\n"));
+		return(False);
+	}
+
+	/* we need to enumerate the TDB to find the name */
+
+	for (kbuf = tdb_firstkey(tdb); 
+	     kbuf.dptr; 
+	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+
+		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
+		
+		dbuf = tdb_fetch(tdb, kbuf);
+		if (!dbuf.dptr)
+			continue;
+
+		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
+
+		string_to_sid(&map->sid, string_sid);
+		
+		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+				 &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
+
+		SAFE_FREE(dbuf.dptr);
+		
+		if ( ret == -1 ) {
+			DEBUG(3,("get_group_map_from_ntname: tdb_unpack failure\n"));
+			return False;
+		}
+
+		if ( strequal(name, map->nt_name) ) {
+			SAFE_FREE(kbuf.dptr);
+			return True;
+		}
+	}
+
+	return False;
+}
+
+/****************************************************************************
+ Remove a group mapping entry.
+****************************************************************************/
+
+BOOL group_map_remove(const DOM_SID *sid)
+{
+	TDB_DATA kbuf, dbuf;
+	pstring key;
+	fstring string_sid;
+	
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return(False);
+	}
+
+	/* the key is the SID, retrieving is direct */
+
+	sid_to_string(string_sid, sid);
+	slprintf(key, sizeof(key), "%s%s", GROUP_PREFIX, string_sid);
+
+	kbuf.dptr = key;
+	kbuf.dsize = strlen(key)+1;
+		
+	dbuf = tdb_fetch(tdb, kbuf);
+	if (!dbuf.dptr)
+		return False;
+	
+	SAFE_FREE(dbuf.dptr);
+
+	if(tdb_delete(tdb, kbuf) != TDB_SUCCESS)
+		return False;
+
+	return True;
+}
+
+/****************************************************************************
+ Enumerate the group mapping.
+****************************************************************************/
+
+BOOL enum_group_mapping(const DOM_SID *domsid, enum lsa_SidType sid_name_use, GROUP_MAP **pp_rmap,
+			size_t *p_num_entries, BOOL unix_only)
+{
+	TDB_DATA kbuf, dbuf, newkey;
+	fstring string_sid;
+	GROUP_MAP map;
+	GROUP_MAP *mapt;
+	int ret;
+	size_t entries=0;
+	DOM_SID grpsid;
+	uint32 rid;
+
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return(False);
+	}
+
+	*p_num_entries=0;
+	*pp_rmap=NULL;
+
+	for (kbuf = tdb_firstkey(tdb); 
+	     kbuf.dptr; 
+	     newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+
+		if (strncmp(kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0)
+			continue;
+
+		dbuf = tdb_fetch(tdb, kbuf);
+		if (!dbuf.dptr)
+			continue;
+
+		fstrcpy(string_sid, kbuf.dptr+strlen(GROUP_PREFIX));
+				
+		ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
+				 &map.gid, &map.sid_name_use, &map.nt_name, &map.comment);
+
+		SAFE_FREE(dbuf.dptr);
+
+		if ( ret == -1 ) {
+			DEBUG(3,("enum_group_mapping: tdb_unpack failure\n"));
+			continue;
+		}
+	
+		/* list only the type or everything if UNKNOWN */
+		if (sid_name_use!=SID_NAME_UNKNOWN  && sid_name_use!=map.sid_name_use) {
+			DEBUG(11,("enum_group_mapping: group %s is not of the requested type\n", map.nt_name));
+			continue;
+		}
+
+		if (unix_only==ENUM_ONLY_MAPPED && map.gid==-1) {
+			DEBUG(11,("enum_group_mapping: group %s is non mapped\n", map.nt_name));
+			continue;
+		}
+
+		string_to_sid(&grpsid, string_sid);
+		sid_copy( &map.sid, &grpsid );
+		
+		sid_split_rid( &grpsid, &rid );
+
+		/* Only check the domain if we were given one */
+
+		if ( domsid && !sid_equal( domsid, &grpsid ) ) {
+			DEBUG(11,("enum_group_mapping: group %s is not in domain %s\n", 
+				string_sid, sid_string_static(domsid)));
+			continue;
+		}
+
+		DEBUG(11,("enum_group_mapping: returning group %s of "
+			  "type %s\n", map.nt_name,
+			  sid_type_lookup(map.sid_name_use)));
+
+		(*pp_rmap) = SMB_REALLOC_ARRAY((*pp_rmap), GROUP_MAP, entries+1);
+		if (!(*pp_rmap)) {
+			DEBUG(0,("enum_group_mapping: Unable to enlarge group map!\n"));
+			return False;
+		}
+
+		mapt = (*pp_rmap);
+
+		mapt[entries].gid = map.gid;
+		sid_copy( &mapt[entries].sid, &map.sid);
+		mapt[entries].sid_name_use = map.sid_name_use;
+		fstrcpy(mapt[entries].nt_name, map.nt_name);
+		fstrcpy(mapt[entries].comment, map.comment);
+
+		entries++;
+
+	}
+
+	*p_num_entries=entries;
+
+	return True;
+}
+
+/* This operation happens on session setup, so it should better be fast. We
+ * store a list of aliases a SID is member of hanging off MEMBEROF/SID. */
+
+ NTSTATUS one_alias_membership(const DOM_SID *member,
+			       DOM_SID **sids, size_t *num)
+{
+	fstring key, string_sid;
+	TDB_DATA kbuf, dbuf;
+	const char *p;
+
+	if (!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
+	sid_to_string(string_sid, member);
+	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
+
+	kbuf.dsize = strlen(key)+1;
+	kbuf.dptr = key;
+
+	dbuf = tdb_fetch(tdb, kbuf);
+
+	if (dbuf.dptr == NULL) {
+		return NT_STATUS_OK;
+	}
+
+	p = dbuf.dptr;
+
+	while (next_token(&p, string_sid, " ", sizeof(string_sid))) {
+
+		DOM_SID alias;
+
+		if (!string_to_sid(&alias, string_sid))
+			continue;
+
+		add_sid_to_array_unique(NULL, &alias, sids, num);
+
+		if (sids == NULL)
+			return NT_STATUS_NO_MEMORY;
+	}
+
+	SAFE_FREE(dbuf.dptr);
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
+				  DOM_SID **sids, size_t *num)
+{
+	size_t i;
+
+	*num = 0;
+	*sids = NULL;
+
+	for (i=0; i<num_members; i++) {
+		NTSTATUS status = one_alias_membership(&members[i], sids, num);
+		if (!NT_STATUS_IS_OK(status))
+			return status;
+	}
+	return NT_STATUS_OK;
+}
+
+static BOOL is_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+{
+	DOM_SID *sids;
+	size_t i, num;
+
+	/* This feels the wrong way round, but the on-disk data structure
+	 * dictates it this way. */
+	if (!NT_STATUS_IS_OK(alias_memberships(member, 1, &sids, &num)))
+		return False;
+
+	for (i=0; i<num; i++) {
+		if (sid_compare(alias, &sids[i]) == 0) {
+			SAFE_FREE(sids);
+			return True;
+		}
+	}
+	SAFE_FREE(sids);
+	return False;
+}
+
+
+ NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+{
+	GROUP_MAP map;
+	TDB_DATA kbuf, dbuf;
+	pstring key;
+	fstring string_sid;
+	char *new_memberstring;
+	int result;
+
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
+	if (!get_group_map_from_sid(*alias, &map))
+		return NT_STATUS_NO_SUCH_ALIAS;
+
+	if ( (map.sid_name_use != SID_NAME_ALIAS) &&
+	     (map.sid_name_use != SID_NAME_WKN_GRP) )
+		return NT_STATUS_NO_SUCH_ALIAS;
+
+	if (is_aliasmem(alias, member))
+		return NT_STATUS_MEMBER_IN_ALIAS;
+
+	sid_to_string(string_sid, member);
+	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, string_sid);
+
+	kbuf.dsize = strlen(key)+1;
+	kbuf.dptr = key;
+
+	dbuf = tdb_fetch(tdb, kbuf);
+
+	sid_to_string(string_sid, alias);
+
+	if (dbuf.dptr != NULL) {
+		asprintf(&new_memberstring, "%s %s", (char *)(dbuf.dptr),
+			 string_sid);
+	} else {
+		new_memberstring = SMB_STRDUP(string_sid);
+	}
+
+	if (new_memberstring == NULL)
+		return NT_STATUS_NO_MEMORY;
+
+	SAFE_FREE(dbuf.dptr);
+	dbuf.dsize = strlen(new_memberstring)+1;
+	dbuf.dptr = new_memberstring;
+
+	result = tdb_store(tdb, kbuf, dbuf, 0);
+
+	SAFE_FREE(new_memberstring);
+
+	return (result == 0 ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED);
+}
+
+struct aliasmem_closure {
+	const DOM_SID *alias;
+	DOM_SID **sids;
+	size_t *num;
+};
+
+static int collect_aliasmem(TDB_CONTEXT *tdb_ctx, TDB_DATA key, TDB_DATA data,
+			    void *state)
+{
+	struct aliasmem_closure *closure = (struct aliasmem_closure *)state;
+	const char *p;
+	fstring alias_string;
+
+	if (strncmp(key.dptr, MEMBEROF_PREFIX,
+		    strlen(MEMBEROF_PREFIX)) != 0)
+		return 0;
+
+	p = data.dptr;
+
+	while (next_token(&p, alias_string, " ", sizeof(alias_string))) {
+
+		DOM_SID alias, member;
+		const char *member_string;
+		
+
+		if (!string_to_sid(&alias, alias_string))
+			continue;
+
+		if (sid_compare(closure->alias, &alias) != 0)
+			continue;
+
+		/* Ok, we found the alias we're looking for in the membership
+		 * list currently scanned. The key represents the alias
+		 * member. Add that. */
+
+		member_string = strchr(key.dptr, '/');
+
+		/* Above we tested for MEMBEROF_PREFIX which includes the
+		 * slash. */
+
+		SMB_ASSERT(member_string != NULL);
+		member_string += 1;
+
+		if (!string_to_sid(&member, member_string))
+			continue;
+		
+		add_sid_to_array(NULL, &member, closure->sids, closure->num);
+	}
+
+	return 0;
+}
+
+ NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
+{
+	GROUP_MAP map;
+	struct aliasmem_closure closure;
+
+	if(!init_group_mapping()) {
+		DEBUG(0,("failed to initialize group mapping\n"));
+		return NT_STATUS_ACCESS_DENIED;
+	}
+
+	if (!get_group_map_from_sid(*alias, &map))
+		return NT_STATUS_NO_SUCH_ALIAS;
+
+	if ( (map.sid_name_use != SID_NAME_ALIAS) &&
+	     (map.sid_name_use != SID_NAME_WKN_GRP) )
+		return NT_STATUS_NO_SUCH_ALIAS;
+
+	*sids = NULL;
+	*num = 0;
+
+	closure.alias = alias;
+	closure.sids = sids;
+	closure.num = num;
+
+	tdb_traverse(tdb, collect_aliasmem, &closure);
+	return NT_STATUS_OK;
+}
+
+ NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+{
+	NTSTATUS result;
+	DOM_SID *sids;
+	size_t i, num;
+	BOOL found = False;
+	char *member_string;
+	TDB_DATA kbuf, dbuf;
+	pstring key;
+	fstring sid_string;
+
+	result = alias_memberships(member, 1, &sids, &num);
+
+	if (!NT_STATUS_IS_OK(result))
+		return result;
+
+	for (i=0; i<num; i++) {
+		if (sid_compare(&sids[i], alias) == 0) {
+			found = True;
+			break;
+		}
+	}
+
+	if (!found) {
+		SAFE_FREE(sids);
+		return NT_STATUS_MEMBER_NOT_IN_ALIAS;
+	}
+
+	if (i < num)
+		sids[i] = sids[num-1];
+
+	num -= 1;
+
+	sid_to_string(sid_string, member);
+	slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX, sid_string);
+
+	kbuf.dsize = strlen(key)+1;
+	kbuf.dptr = key;
+
+	if (num == 0)
+		return tdb_delete(tdb, kbuf) == 0 ?
+			NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+
+	member_string = SMB_STRDUP("");
+
+	if (member_string == NULL) {
+		SAFE_FREE(sids);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	for (i=0; i<num; i++) {
+		char *s = member_string;
+
+		sid_to_string(sid_string, &sids[i]);
+		asprintf(&member_string, "%s %s", s, sid_string);
+
+		SAFE_FREE(s);
+		if (member_string == NULL) {
+			SAFE_FREE(sids);
+			return NT_STATUS_NO_MEMORY;
+		}
+	}
+
+	dbuf.dsize = strlen(member_string)+1;
+	dbuf.dptr = member_string;
+
+	result = tdb_store(tdb, kbuf, dbuf, 0) == 0 ?
+		NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
+
+	SAFE_FREE(sids);
+	SAFE_FREE(member_string);
+
+	return result;
+}
+
diff --git a/source3/script/tests/test_groupmap.sh b/source3/script/tests/test_groupmap.sh
new file mode 100755
index 0000000000..46640a9131
--- /dev/null
+++ b/source3/script/tests/test_groupmap.sh
@@ -0,0 +1,214 @@
+#!/bin/sh
+# test groupmap code tridge@samba.org September 2006
+# note that this needs root access to add unix groups,
+# so this cannot be run on the build farm
+
+testone() {
+    echo $*
+    $VALGRIND bin/net groupmap $*
+}
+
+tstart() {
+    TBASE=`date '+%s'`
+}
+
+treport() {
+    TNOW=`date '+%s'`
+    echo "Took `expr $TNOW - $TBASE` seconds"
+    TBASE=$TNOW
+}
+
+rm -f $PREFIX_ABS/var/locks/group_mapping.?db
+
+NLOCAL=12
+NGROUP=11
+NBUILTIN=10
+DOMSID=`bin/net getlocalsid | awk '{print $6}'`
+FORSID="S-1-2-3-4-5"
+
+echo "DOMSID $DOMSID"
+echo "FORSID $FORSID"
+
+tstart
+echo "Creating unix groups"
+for i in `seq 1 1 $NLOCAL`; do
+  unixgroup=testlocal$i;
+  gid=`expr 30000 + $i`;
+  groupdel $unixgroup 2> /dev/null
+  groupadd -g $gid $unixgroup || exit 1
+done
+for i in `seq 1 1 $NGROUP`; do
+  unixgroup=testgrp$i;
+  gid=`expr 40000 + $i`;
+  groupdel $unixgroup 2> /dev/null
+  groupadd -g $gid $unixgroup || exit 1
+done
+for i in `seq 1 1 $NBUILTIN`; do
+  unixgroup=testb$i;
+  gid=`expr 50000 + $i`;
+  groupdel $unixgroup 2> /dev/null
+  groupadd -g $gid $unixgroup || exit 1
+done
+date
+
+treport
+
+echo "Creating local groups"
+for i in `seq 1 1 $NLOCAL`; do
+  unixgroup=testlocal$i;
+  ntgroup=ntlgrp$i;
+  rid=`expr 10000 + $i`;
+  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=local || exit 1
+done
+
+echo "trying a duplicate add"
+testone add rid=10001 unixgroup=testlocal1 ntgroup=foo type=local && exit 1
+
+treport
+
+echo "Creating domain groups"
+for i in `seq 1 1 $NGROUP`; do
+  unixgroup=testgrp$i;
+  ntgroup=ntgrp$i;
+  rid=`expr 20000 + $i`;
+  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=domain || exit 1
+done
+
+treport
+
+echo "Creating builtin groups"
+for i in `seq 1 1 $NBUILTIN`; do
+  unixgroup=testb$i;
+  ntgroup=ntbgrp$i;
+  rid=`expr 30000 + $i`;
+  testone add rid=$rid unixgroup=$unixgroup ntgroup=$ntgroup type=builtin || exit 1
+done
+
+treport
+
+echo "Adding domain groups to local groups"
+for i in `seq 1 1 $NLOCAL`; do
+ for j in `seq 1 1 $i`; do
+
+  lrid=`expr 10000 + $i`;
+  drid=`expr 20000 + $j`;
+
+  testone addmem $DOMSID-$lrid $DOMSID-$drid || exit 1
+  ( testone listmem $DOMSID-$lrid | sort -r ) || exit 1
+ done
+done
+
+echo "trying a duplicate addmem"
+testone addmem $DOMSID-10001 $DOMSID-20001 && exit 1
+
+echo "Adding foreign SIDs to local groups"
+for i in `seq 1 1 $NLOCAL`; do
+ for j in `seq 1 1 $i`; do
+
+  lrid=`expr 10000 + $i`;
+  frid=`expr 70000 + $j`;
+
+  testone addmem $DOMSID-$lrid $FORSID-$frid || exit 1
+  ( testone listmem $DOMSID-$lrid | sort -r ) || exit 1
+ done
+done
+
+echo "trying a duplicate foreign addmem"
+testone addmem $DOMSID-10001 $FORSID-70001 && exit 1
+
+treport
+
+echo "Listing local group memberships of domain groups"
+for i in `seq 1 1 $NGROUP`; do
+  rid=`expr 20000 + $i`;
+  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+done
+
+echo "Trying memberships on bogus sid"
+testone memberships $DOMSID-999999 || exit 1
+
+treport
+
+testone list | sort
+
+echo "Deleting some domain groups"
+for i in `seq 2 2 $NGROUP`; do
+  drid=`expr 20000 + $i`;
+ testone delete sid=$DOMSID-$drid || exit 1
+done
+
+echo "Trying duplicate domain group delete"
+testone delete sid=$DOMSID-20002 && exit 1
+
+treport
+
+echo "Deleting some local groups"
+for i in `seq 2 4 $NLOCAL`; do
+ lrid=`expr 10000 + $i`;
+ testone delete sid=$DOMSID-$lrid || exit 1
+done
+
+echo "Trying duplicate local group delete"
+testone delete sid=$DOMSID-10002 && exit 1
+
+treport
+
+echo "Modifying some domain groups"
+for i in `seq 3 2 $NGROUP`; do
+  drid=`expr 20000 + $i`;
+  testone modify sid=$DOMSID-$drid comment="newcomment-$i" type=domain || exit 1
+done
+
+treport
+
+testone list | sort
+
+echo "Listing local group memberships"
+for i in `seq 1 1 $NLOCAL`; do
+  rid=`expr 20000 + $i`;
+  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+done
+
+treport
+
+echo "Removing some domain groups from local groups"
+for i in `seq 1 2 $NLOCAL`; do
+ for j in `seq 1 3 $i`; do
+
+  lrid=`expr 10000 + $i`;
+  drid=`expr 20000 + $j`;
+
+  testone delmem $DOMSID-$lrid $DOMSID-$drid || exit 1
+ done
+done
+
+echo "Trying duplicate delmem"
+testone delmem $DOMSID-10001 $DOMSID-20001 && exit 1
+
+treport
+
+echo "Listing local group memberships"
+for i in `seq 1 1 $NLOCAL`; do
+  rid=`expr 20000 + $i`;
+  ( testone memberships $DOMSID-$rid | sort -r ) || exit 1
+done
+
+treport
+
+echo "Deleting unix groups"
+for i in `seq 1 1 $NLOCAL`; do
+  unixgroup=testlocal$i;
+  groupdel $unixgroup 2> /dev/null
+done
+for i in `seq 1 1 $NGROUP`; do
+  unixgroup=testgrp$i;
+  groupdel $unixgroup 2> /dev/null
+done
+for i in `seq 1 1 $NBUILTIN`; do
+  unixgroup=testb$i;
+  groupdel $unixgroup 2> /dev/null
+done
+
+treport
+
+echo "ALL DONE"