s3-talloc Change TALLOC_ARRAY() to talloc_array()
[samba.git] / source3 / groupdb / mapping_tdb.c
index 21a4f95383bc2f1fe7330ce86a2ee78b55cea96d..cf8857cda541990cff878745933d5ea41b361999 100644 (file)
  */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "passdb.h"
 #include "groupdb/mapping.h"
+#include "dbwrap.h"
+#include "util_tdb.h"
+#include "../libcli/security/security.h"
 
-static TDB_CONTEXT *tdb; /* used for driver files */
+static struct db_context *db; /* used for driver files */
+
+static bool enum_group_mapping(const struct dom_sid *domsid,
+                              enum lsa_SidType sid_name_use,
+                              GROUP_MAP **pp_rmap,
+                              size_t *p_num_entries,
+                              bool unix_only);
+static bool group_map_remove(const struct dom_sid *sid);
+
+static bool mapping_switch(const char *ldb_path);
 
-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);
-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(state_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;
-       }
+       const char *ldb_path;
 
-       /* 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 (db != NULL) {
+               return true;
        }
 
-       /* 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);
+       db = db_open(NULL, state_path("group_mapping.tdb"), 0,
+                          TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+       if (db == NULL) {
+               DEBUG(0, ("Failed to open group mapping database: %s\n",
+                         strerror(errno)));
+               return false;
        }
 
-       tdb_unlock_bystring(tdb, vstring);
+       ldb_path = state_path("group_mapping.ldb");
+       if (file_exist(ldb_path) && !mapping_switch(ldb_path)) {
+               unlink(state_path("group_mapping.tdb"));
+               return false;
+
+       } else {
+               /* handle upgrade from old versions of the database */
+#if 0 /* -- Needs conversion to dbwrap -- */
+               const char *vstring = "INFO/version";
+               int32 vers_id;
+               GROUP_MAP *map_table = NULL;
+               size_t num_entries = 0;
+
+               /* 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_wipe_all(tdb);
+                       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;
 
-       /* 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 );
+                       for ( i=0; i<num_entries; i++ ) {
+                               if ( map_table[i].gid == -1 ) {
+                                       group_map_remove( &map_table[i].sid );
+                               }
                        }
+
+                       SAFE_FREE( map_table );
                }
-               
-               SAFE_FREE( map_table );
+#endif
        }
+       return true;
+}
 
+static char *group_mapping_key(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
+{
+       char *sidstr, *result;
 
-       return True;
+       sidstr = sid_string_talloc(talloc_tos(), sid);
+       if (sidstr == NULL) {
+               return NULL;
+       }
+
+       result = talloc_asprintf(mem_ctx, "%s%s", GROUP_PREFIX, sidstr);
+
+       TALLOC_FREE(sidstr);
+       return result;
 }
 
 /****************************************************************************
 ****************************************************************************/
 static bool add_mapping_entry(GROUP_MAP *map, int flag)
 {
-       TDB_DATA dbuf;
-       char *key = NULL;
-       char *buf = NULL;
-       fstring string_sid="";
+       char *key, *buf;
        int len;
-       bool ret;
+       NTSTATUS status;
 
-       sid_to_fstring(string_sid, &map->sid);
+       key = group_mapping_key(talloc_tos(), &map->sid);
+       if (key == NULL) {
+               return false;
+       }
 
-       len = tdb_pack(NULL, sizeof(buf), "ddff",
+       len = tdb_pack(NULL, 0, "ddff",
                map->gid, map->sid_name_use, map->nt_name, map->comment);
-       if (len) {
-               buf = SMB_MALLOC_ARRAY(char, len);
-               if (!buf) {
-                       return false;
-               }
-               len = tdb_pack((uint8 *)buf, sizeof(buf), "ddff", map->gid,
-                               map->sid_name_use, map->nt_name, map->comment);
-       }
 
-       if (asprintf(&key, "%s%s", GROUP_PREFIX, string_sid) < 0) {
-               SAFE_FREE(buf);
+       buf = talloc_array(key, char, len);
+       if (!buf) {
+               TALLOC_FREE(key);
                return false;
        }
+       len = tdb_pack((uint8 *)buf, len, "ddff", map->gid,
+                      map->sid_name_use, map->nt_name, map->comment);
 
-       dbuf.dsize = len;
-       dbuf.dptr = (uint8 *)buf;
+       status = dbwrap_trans_store(
+               db, string_term_tdb_data(key),
+               make_tdb_data((uint8_t *)buf, len), TDB_REPLACE);
 
-       ret = (tdb_store_bystring(tdb, key, dbuf, flag) == 0);
+       TALLOC_FREE(key);
 
-       SAFE_FREE(key);
-       SAFE_FREE(buf);
-       return ret;
+       return NT_STATUS_IS_OK(status);
 }
 
 
@@ -130,304 +167,272 @@ static bool add_mapping_entry(GROUP_MAP *map, int flag)
  Return the sid and the type of the unix group.
 ****************************************************************************/
 
-static bool get_group_map_from_sid(DOM_SID sid, GROUP_MAP *map)
+static bool get_group_map_from_sid(struct dom_sid sid, GROUP_MAP *map)
 {
        TDB_DATA dbuf;
-       char *key = NULL;
-       fstring string_sid;
+       char *key;
        int ret = 0;
 
        /* the key is the SID, retrieving is direct */
 
-       sid_to_fstring(string_sid, &sid);
-       if (asprintf(&key, "%s%s", GROUP_PREFIX, string_sid) < 0) {
+       key = group_mapping_key(talloc_tos(), &sid);
+       if (key == NULL) {
                return false;
        }
 
-       dbuf = tdb_fetch_bystring(tdb, key);
-       if (!dbuf.dptr) {
-               SAFE_FREE(key);
+       dbuf = dbwrap_fetch_bystring(db, key, key);
+       if (dbuf.dptr == NULL) {
+               TALLOC_FREE(key);
                return false;
        }
 
-       SAFE_FREE(key);
-
        ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
                        &map->gid, &map->sid_name_use,
                        &map->nt_name, &map->comment);
 
-       SAFE_FREE(dbuf.dptr);
+       TALLOC_FREE(key);
 
        if ( ret == -1 ) {
                DEBUG(3,("get_group_map_from_sid: tdb_unpack failure\n"));
-               return False;
+               return false;
        }
 
        sid_copy(&map->sid, &sid);
 
-       return True;
+       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)
+static bool dbrec2map(const struct db_record *rec, GROUP_MAP *map)
 {
-       TDB_DATA kbuf, dbuf, newkey;
-       fstring string_sid;
-       int ret;
-
-       /* 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((const char *)kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
+       if ((rec->key.dsize < strlen(GROUP_PREFIX))
+           || (strncmp((char *)rec->key.dptr, GROUP_PREFIX,
+                       GROUP_PREFIX_LEN) != 0)) {
+               return False;
+       }
 
-               dbuf = tdb_fetch(tdb, kbuf);
-               if (!dbuf.dptr)
-                       continue;
+       if (!string_to_sid(&map->sid, (const char *)rec->key.dptr
+                          + GROUP_PREFIX_LEN)) {
+               return False;
+       }
 
-               fstrcpy(string_sid, (const char *)kbuf.dptr+strlen(GROUP_PREFIX));
+       return tdb_unpack(rec->value.dptr, rec->value.dsize, "ddff",
+                         &map->gid, &map->sid_name_use, &map->nt_name,
+                         &map->comment) != -1;
+}
 
-               string_to_sid(&map->sid, string_sid);
+struct find_map_state {
+       bool found;
+       const char *name;       /* If != NULL, look for name */
+       gid_t gid;              /* valid iff name == NULL */
+       GROUP_MAP *map;
+};
 
-               ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
+static int find_map(struct db_record *rec, void *private_data)
+{
+       struct find_map_state *state = (struct find_map_state *)private_data;
 
-               SAFE_FREE(dbuf.dptr);
+       if (!dbrec2map(rec, state->map)) {
+               DEBUG(10, ("failed to unpack map\n"));
+               return 0;
+       }
 
-               if ( ret == -1 ) {
-                       DEBUG(3,("get_group_map_from_gid: tdb_unpack failure\n"));
-                       return False;
+       if (state->name != NULL) {
+               if (strequal(state->name, state->map->nt_name)) {
+                       state->found = true;
+                       return 1;
                }
-
-               if (gid==map->gid) {
-                       SAFE_FREE(kbuf.dptr);
-                       return True;
+       }
+       else {
+               if (state->map->gid == state->gid) {
+                       state->found = true;
+                       return 1;
                }
        }
 
-       return False;
+       return 0;
 }
 
 /****************************************************************************
  Return the sid and the type of the unix group.
 ****************************************************************************/
 
-static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
+static bool get_group_map_from_gid(gid_t gid, GROUP_MAP *map)
 {
-       TDB_DATA kbuf, dbuf, newkey;
-       fstring string_sid;
-       int ret;
-
-       /* we need to enumerate the TDB to find the name */
+       struct find_map_state state;
 
-       for (kbuf = tdb_firstkey(tdb);
-            kbuf.dptr;
-            newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
+       state.found = false;
+       state.name = NULL;      /* Indicate we're looking for gid */
+       state.gid = gid;
+       state.map = map;
 
-               if (strncmp((const char *)kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0) continue;
+       db->traverse_read(db, find_map, (void *)&state);
 
-               dbuf = tdb_fetch(tdb, kbuf);
-               if (!dbuf.dptr)
-                       continue;
-
-               fstrcpy(string_sid, (const char *)kbuf.dptr+strlen(GROUP_PREFIX));
+       return state.found;
+}
 
-               string_to_sid(&map->sid, string_sid);
+/****************************************************************************
+ Return the sid and the type of the unix group.
+****************************************************************************/
 
-               ret = tdb_unpack(dbuf.dptr, dbuf.dsize, "ddff",
-                                &map->gid, &map->sid_name_use, &map->nt_name, &map->comment);
+static bool get_group_map_from_ntname(const char *name, GROUP_MAP *map)
+{
+       struct find_map_state state;
 
-               SAFE_FREE(dbuf.dptr);
+       state.found = false;
+       state.name = name;
+       state.map = map;
 
-               if ( ret == -1 ) {
-                       DEBUG(3,("get_group_map_from_ntname: tdb_unpack failure\n"));
-                       return False;
-               }
+       db->traverse_read(db, find_map, (void *)&state);
 
-               if ( strequal(name, map->nt_name) ) {
-                       SAFE_FREE(kbuf.dptr);
-                       return True;
-               }
-       }
-
-       return False;
+       return state.found;
 }
 
 /****************************************************************************
  Remove a group mapping entry.
 ****************************************************************************/
 
-static bool group_map_remove(const DOM_SID *sid)
+static bool group_map_remove(const struct dom_sid *sid)
 {
-       TDB_DATA dbuf;
-       char *key = NULL;
-       fstring string_sid;
-       bool ret;
-
-       /* the key is the SID, retrieving is direct */
-
-       sid_to_fstring(string_sid, sid);
-       if (asprintf(&key, "%s%s", GROUP_PREFIX, string_sid) < 0) {
-               return false;
-       }
+       char *key;
+       NTSTATUS status;
 
-       dbuf = tdb_fetch_bystring(tdb, key);
-       if (!dbuf.dptr) {
-               SAFE_FREE(key);
+       key = group_mapping_key(talloc_tos(), sid);
+       if (key == NULL) {
                return false;
        }
 
-       SAFE_FREE(dbuf.dptr);
+       status = dbwrap_trans_delete(db, string_term_tdb_data(key));
 
-       ret = (tdb_delete_bystring(tdb, key) == TDB_SUCCESS);
-       SAFE_FREE(key);
-       return ret;
+       TALLOC_FREE(key);
+       return NT_STATUS_IS_OK(status);
 }
 
 /****************************************************************************
  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;
-
-       *p_num_entries=0;
-       *pp_rmap=NULL;
+struct enum_map_state {
+       const struct dom_sid *domsid;
+       enum lsa_SidType sid_name_use;
+       bool unix_only;
 
-       for (kbuf = tdb_firstkey(tdb); 
-            kbuf.dptr; 
-            newkey = tdb_nextkey(tdb, kbuf), safe_free(kbuf.dptr), kbuf=newkey) {
-
-               if (strncmp((const char *)kbuf.dptr, GROUP_PREFIX, strlen(GROUP_PREFIX)) != 0)
-                       continue;
-
-               dbuf = tdb_fetch(tdb, kbuf);
-               if (!dbuf.dptr)
-                       continue;
-
-               fstrcpy(string_sid, (const char *)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;
-               }
+       size_t num_maps;
+       GROUP_MAP *maps;
+};
 
-               string_to_sid(&grpsid, string_sid);
-               sid_copy( &map.sid, &grpsid );
-               
-               sid_split_rid( &grpsid, &rid );
+static int collect_map(struct db_record *rec, void *private_data)
+{
+       struct enum_map_state *state = (struct enum_map_state *)private_data;
+       GROUP_MAP map;
+       GROUP_MAP *tmp;
 
-               /* Only check the domain if we were given one */
+       if (!dbrec2map(rec, &map)) {
+               return 0;
+       }
+       /* list only the type or everything if UNKNOWN */
+       if (state->sid_name_use != SID_NAME_UNKNOWN
+           && state->sid_name_use != map.sid_name_use) {
+               DEBUG(11,("enum_group_mapping: group %s is not of the "
+                         "requested type\n", map.nt_name));
+               return 0;
+       }
 
-               if ( domsid && !sid_equal( domsid, &grpsid ) ) {
-                       DEBUG(11,("enum_group_mapping: group %s is not in "
-                                 "domain %s\n", string_sid,
-                                 sid_string_dbg(domsid)));
-                       continue;
-               }
+       if ((state->unix_only == ENUM_ONLY_MAPPED) && (map.gid == -1)) {
+               DEBUG(11,("enum_group_mapping: group %s is non mapped\n",
+                         map.nt_name));
+               return 0;
+       }
 
-               DEBUG(11,("enum_group_mapping: returning group %s of "
-                         "type %s\n", map.nt_name,
-                         sid_type_lookup(map.sid_name_use)));
+       if ((state->domsid != NULL) &&
+           (dom_sid_compare_domain(state->domsid, &map.sid) != 0)) {
+               DEBUG(11,("enum_group_mapping: group %s is not in domain\n",
+                         sid_string_dbg(&map.sid)));
+               return 0;
+       }
 
-               (*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;
-               }
+       if (!(tmp = SMB_REALLOC_ARRAY(state->maps, GROUP_MAP,
+                                     state->num_maps+1))) {
+               DEBUG(0,("enum_group_mapping: Unable to enlarge group "
+                        "map!\n"));
+               return 1;
+       }
 
-               mapt = (*pp_rmap);
+       state->maps = tmp;
+       state->maps[state->num_maps] = map;
+       state->num_maps++;
+       return 0;
+}
 
-               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);
+static bool enum_group_mapping(const struct dom_sid *domsid,
+                              enum lsa_SidType sid_name_use,
+                              GROUP_MAP **pp_rmap,
+                              size_t *p_num_entries, bool unix_only)
+{
+       struct enum_map_state state;
 
-               entries++;
+       state.domsid = domsid;
+       state.sid_name_use = sid_name_use;
+       state.unix_only = unix_only;
+       state.num_maps = 0;
+       state.maps = NULL;
 
+       if (db->traverse_read(db, collect_map, (void *)&state) < 0) {
+               return false;
        }
 
-       *p_num_entries=entries;
+       *pp_rmap = state.maps;
+       *p_num_entries = state.num_maps;
 
-       return True;
+       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)
+static NTSTATUS one_alias_membership(const struct dom_sid *member,
+                              struct dom_sid **sids, size_t *num)
 {
        fstring tmp;
        fstring key;
        char *string_sid;
        TDB_DATA dbuf;
        const char *p;
-       NTSTATUS status;
-       TALLOC_CTX *frame;
+       NTSTATUS status = NT_STATUS_OK;
+       TALLOC_CTX *frame = talloc_stackframe();
 
        slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX,
                 sid_to_fstring(tmp, member));
 
-       dbuf = tdb_fetch_bystring(tdb, key);
-
+       dbuf = dbwrap_fetch_bystring(db, frame, key);
        if (dbuf.dptr == NULL) {
+               TALLOC_FREE(frame);
                return NT_STATUS_OK;
        }
 
        p = (const char *)dbuf.dptr;
-       frame = talloc_stackframe();
+
        while (next_token_talloc(frame, &p, &string_sid, " ")) {
-               DOM_SID alias;
+               struct dom_sid alias;
+               uint32_t num_sids;
 
                if (!string_to_sid(&alias, string_sid))
                        continue;
 
-               status= add_sid_to_array_unique(NULL, &alias, sids, num);
+               num_sids = *num;
+               status= add_sid_to_array_unique(NULL, &alias, sids, &num_sids);
                if (!NT_STATUS_IS_OK(status)) {
                        goto done;
                }
+               *num = num_sids;
        }
 
 done:
        TALLOC_FREE(frame);
-       SAFE_FREE(dbuf.dptr);
        return status;
 }
 
-static NTSTATUS alias_memberships(const DOM_SID *members, size_t num_members,
-                                 DOM_SID **sids, size_t *num)
+static NTSTATUS alias_memberships(const struct dom_sid *members, size_t num_members,
+                                 struct dom_sid **sids, size_t *num)
 {
        size_t i;
 
@@ -442,10 +447,11 @@ 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)
+static bool is_aliasmem(const struct dom_sid *alias, const struct dom_sid *member)
 {
-       DOM_SID *sids;
-       size_t i, num;
+       struct dom_sid *sids;
+       size_t i;
+       size_t num;
 
        /* This feels the wrong way round, but the on-disk data structure
         * dictates it this way. */
@@ -453,7 +459,7 @@ static bool is_aliasmem(const DOM_SID *alias, const DOM_SID *member)
                return False;
 
        for (i=0; i<num; i++) {
-               if (sid_compare(alias, &sids[i]) == 0) {
+               if (dom_sid_compare(alias, &sids[i]) == 0) {
                        TALLOC_FREE(sids);
                        return True;
                }
@@ -463,14 +469,14 @@ static bool is_aliasmem(const DOM_SID *alias, const DOM_SID *member)
 }
 
 
-static NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+static NTSTATUS add_aliasmem(const struct dom_sid *alias, const struct dom_sid *member)
 {
        GROUP_MAP map;
-       TDB_DATA dbuf;
-       char *key = NULL;
+       char *key;
        fstring string_sid;
        char *new_memberstring;
-       int result;
+       struct db_record *rec;
+       NTSTATUS status;
 
        if (!get_group_map_from_sid(*alias, &map))
                return NT_STATUS_NO_SUCH_ALIAS;
@@ -483,73 +489,105 @@ static NTSTATUS add_aliasmem(const DOM_SID *alias, const DOM_SID *member)
                return NT_STATUS_MEMBER_IN_ALIAS;
 
        sid_to_fstring(string_sid, member);
-       if (asprintf(&key, "%s%s", MEMBEROF_PREFIX, string_sid) < 0) {
+
+       key = talloc_asprintf(talloc_tos(), "%s%s", MEMBEROF_PREFIX,
+                             string_sid);
+       if (key == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
 
-       dbuf = tdb_fetch_bystring(tdb, key);
+       if (db->transaction_start(db) != 0) {
+               DEBUG(0, ("transaction_start failed\n"));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       rec = db->fetch_locked(db, key, string_term_tdb_data(key));
+
+       if (rec == NULL) {
+               DEBUG(10, ("fetch_lock failed\n"));
+               TALLOC_FREE(key);
+               status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+               goto cancel;
+       }
 
        sid_to_fstring(string_sid, alias);
 
-       if (dbuf.dptr != NULL) {
-               asprintf(&new_memberstring, "%s %s", (char *)(dbuf.dptr),
-                        string_sid);
+       if (rec->value.dptr != NULL) {
+               new_memberstring = talloc_asprintf(
+                       key, "%s %s", (char *)(rec->value.dptr), string_sid);
        } else {
-               new_memberstring = SMB_STRDUP(string_sid);
+               new_memberstring = talloc_strdup(key, string_sid);
        }
 
        if (new_memberstring == NULL) {
-               SAFE_FREE(key);
-               return NT_STATUS_NO_MEMORY;
+               TALLOC_FREE(key);
+               status = NT_STATUS_NO_MEMORY;
+               goto cancel;
        }
 
-       SAFE_FREE(dbuf.dptr);
-       dbuf = string_term_tdb_data(new_memberstring);
+       status = rec->store(rec, string_term_tdb_data(new_memberstring), 0);
+
+       TALLOC_FREE(key);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("Could not store record: %s\n", nt_errstr(status)));
+               goto cancel;
+       }
 
-       result = tdb_store_bystring(tdb, key, dbuf, 0);
+       if (db->transaction_commit(db) != 0) {
+               DEBUG(0, ("transaction_commit failed\n"));
+               status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+               return status;
+       }
 
-       SAFE_FREE(new_memberstring);
-       SAFE_FREE(key);
+       return NT_STATUS_OK;
 
-       return (result == 0 ? NT_STATUS_OK : NT_STATUS_ACCESS_DENIED);
+ cancel:
+       if (db->transaction_cancel(db) != 0) {
+               smb_panic("transaction_cancel failed");
+       }
+
+       return status;
 }
 
-struct aliasmem_closure {
-       const DOM_SID *alias;
-       DOM_SID **sids;
+struct aliasmem_state {
+       TALLOC_CTX *mem_ctx;
+       const struct dom_sid *alias;
+       struct dom_sid **sids;
        size_t *num;
 };
 
-static int collect_aliasmem(TDB_CONTEXT *tdb_ctx, TDB_DATA key, TDB_DATA data,
-                           void *state)
+static int collect_aliasmem(struct db_record *rec, void *priv)
 {
-       struct aliasmem_closure *closure = (struct aliasmem_closure *)state;
+       struct aliasmem_state *state = (struct aliasmem_state *)priv;
        const char *p;
        char *alias_string;
        TALLOC_CTX *frame;
 
-       if (strncmp((const char *)key.dptr, MEMBEROF_PREFIX,
-                   strlen(MEMBEROF_PREFIX)) != 0)
+       if (strncmp((const char *)rec->key.dptr, MEMBEROF_PREFIX,
+                   MEMBEROF_PREFIX_LEN) != 0)
                return 0;
 
-       p = (const char *)data.dptr;
+       p = (const char *)rec->value.dptr;
 
        frame = talloc_stackframe();
+
        while (next_token_talloc(frame, &p, &alias_string, " ")) {
-               DOM_SID alias, member;
+               struct dom_sid alias, member;
                const char *member_string;
+               uint32_t num_sids;
 
                if (!string_to_sid(&alias, alias_string))
                        continue;
 
-               if (sid_compare(closure->alias, &alias) != 0)
+               if (dom_sid_compare(state->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((const char *)key.dptr, '/');
+               member_string = strchr((const char *)rec->key.dptr, '/');
 
                /* Above we tested for MEMBEROF_PREFIX which includes the
                 * slash. */
@@ -560,23 +598,26 @@ static int collect_aliasmem(TDB_CONTEXT *tdb_ctx, TDB_DATA key, TDB_DATA data,
                if (!string_to_sid(&member, member_string))
                        continue;
 
-               if (!NT_STATUS_IS_OK(add_sid_to_array(NULL, &member,
-                                                     closure->sids,
-                                                     closure->num)))
+               num_sids = *state->num;
+               if (!NT_STATUS_IS_OK(add_sid_to_array(state->mem_ctx, &member,
+                                                     state->sids,
+                                                     &num_sids)))
                {
                        /* talloc fail. */
                        break;
                }
+               *state->num = num_sids;
        }
 
        TALLOC_FREE(frame);
        return 0;
 }
 
-static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
+static NTSTATUS enum_aliasmem(const struct dom_sid *alias, TALLOC_CTX *mem_ctx,
+                             struct dom_sid **sids, size_t *num)
 {
        GROUP_MAP map;
-       struct aliasmem_closure closure;
+       struct aliasmem_state state;
 
        if (!get_group_map_from_sid(*alias, &map))
                return NT_STATUS_NO_SUCH_ALIAS;
@@ -588,32 +629,38 @@ static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
        *sids = NULL;
        *num = 0;
 
-       closure.alias = alias;
-       closure.sids = sids;
-       closure.num = num;
+       state.alias = alias;
+       state.sids = sids;
+       state.num = num;
+       state.mem_ctx = mem_ctx;
 
-       tdb_traverse(tdb, collect_aliasmem, &closure);
+       db->traverse_read(db, collect_aliasmem, &state);
        return NT_STATUS_OK;
 }
 
-static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
+static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *member)
 {
-       NTSTATUS result;
-       DOM_SID *sids;
+       NTSTATUS status;
+       struct dom_sid *sids;
        size_t i, num;
        bool found = False;
        char *member_string;
-       TDB_DATA dbuf;
-       char *key = NULL;
+       char *key;
        fstring sid_string;
 
-       result = alias_memberships(member, 1, &sids, &num);
+       if (db->transaction_start(db) != 0) {
+               DEBUG(0, ("transaction_start failed\n"));
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       status = alias_memberships(member, 1, &sids, &num);
 
-       if (!NT_STATUS_IS_OK(result))
-               return result;
+       if (!NT_STATUS_IS_OK(status)) {
+               goto cancel;
+       }
 
        for (i=0; i<num; i++) {
-               if (sid_compare(&sids[i], alias) == 0) {
+               if (dom_sid_compare(&sids[i], alias) == 0) {
                        found = True;
                        break;
                }
@@ -621,7 +668,8 @@ static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
 
        if (!found) {
                TALLOC_FREE(sids);
-               return NT_STATUS_MEMBER_NOT_IN_ALIAS;
+               status = NT_STATUS_MEMBER_NOT_IN_ALIAS;
+               goto cancel;
        }
 
        if (i < num)
@@ -630,53 +678,313 @@ static NTSTATUS del_aliasmem(const DOM_SID *alias, const DOM_SID *member)
        num -= 1;
 
        sid_to_fstring(sid_string, member);
-       if (asprintf(&key, "%s%s", MEMBEROF_PREFIX, sid_string) < 0) {
+
+       key = talloc_asprintf(sids, "%s%s", MEMBEROF_PREFIX, sid_string);
+       if (key == NULL) {
                TALLOC_FREE(sids);
-               return NT_STATUS_NO_MEMORY;
+               status = NT_STATUS_NO_MEMORY;
+               goto cancel;
        }
 
        if (num == 0) {
-               NTSTATUS ret = (tdb_delete_bystring(tdb, key) == 0 ?
-                       NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL);
-               TALLOC_FREE(sids);
-               SAFE_FREE(key);
-               return ret;
+               status = dbwrap_delete_bystring(db, key);
+               goto commit;
        }
 
-       member_string = SMB_STRDUP("");
-
+       member_string = talloc_strdup(sids, "");
        if (member_string == NULL) {
                TALLOC_FREE(sids);
-               SAFE_FREE(key);
-               return NT_STATUS_NO_MEMORY;
+               status = NT_STATUS_NO_MEMORY;
+               goto cancel;
        }
 
        for (i=0; i<num; i++) {
-               char *s = member_string;
 
                sid_to_fstring(sid_string, &sids[i]);
-               asprintf(&member_string, "%s %s", s, sid_string);
 
-               SAFE_FREE(s);
+               member_string = talloc_asprintf_append_buffer(
+                       member_string, " %s", sid_string);
+
                if (member_string == NULL) {
                        TALLOC_FREE(sids);
-                       SAFE_FREE(key);
-                       return NT_STATUS_NO_MEMORY;
+                       status = NT_STATUS_NO_MEMORY;
+                       goto cancel;
                }
        }
 
-       dbuf = string_term_tdb_data(member_string);
+       status = dbwrap_store_bystring(
+               db, key, string_term_tdb_data(member_string), 0);
+ commit:
+       TALLOC_FREE(sids);
+
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("dbwrap_store_bystring failed: %s\n",
+                          nt_errstr(status)));
+               goto cancel;
+       }
 
-       result = tdb_store_bystring(tdb, key, dbuf, 0) == 0 ?
-               NT_STATUS_OK : NT_STATUS_ACCESS_DENIED;
+       if (db->transaction_commit(db) != 0) {
+               DEBUG(0, ("transaction_commit failed\n"));
+               status = NT_STATUS_INTERNAL_DB_CORRUPTION;
+               return status;
+       }
 
-       TALLOC_FREE(sids);
-       SAFE_FREE(member_string);
-       SAFE_FREE(key);
+       return NT_STATUS_OK;
 
-       return result;
+ cancel:
+       if (db->transaction_cancel(db) != 0) {
+               smb_panic("transaction_cancel failed");
+       }
+       return status;
+}
+
+
+/* -- ldb->tdb switching code -------------------------------------------- */
+
+/* change this if the data format ever changes */
+#define LTDB_PACKING_FORMAT 0x26011967
+
+/* old packing formats (not supported for now,
+ * it was never used for group mapping AFAIK) */
+#define LTDB_PACKING_FORMAT_NODN 0x26011966
+
+static unsigned int pull_uint32(uint8_t *p, int ofs)
+{
+       p += ofs;
+       return p[0] | (p[1]<<8) | (p[2]<<16) | (p[3]<<24);
+}
+
+/*
+  unpack a ldb message from a linear buffer in TDB_DATA
+*/
+static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key,
+                             TDB_DATA data, void *ptr)
+{
+       TALLOC_CTX *tmp_ctx = talloc_tos();
+       GROUP_MAP map;
+       uint8_t *p;
+       uint32_t format;
+       uint32_t num_el;
+       unsigned int remaining;
+       unsigned int i, j;
+       size_t len;
+       char *name;
+       char *val;
+       char *q;
+       uint32_t num_mem = 0;
+       struct dom_sid *members = NULL;
+
+       p = (uint8_t *)data.dptr;
+       if (data.dsize < 8) {
+               errno = EIO;
+               goto failed;
+       }
+
+       format = pull_uint32(p, 0);
+       num_el = pull_uint32(p, 4);
+       p += 8;
+
+       remaining = data.dsize - 8;
+
+       switch (format) {
+       case LTDB_PACKING_FORMAT:
+               len = strnlen((char *)p, remaining);
+               if (len == remaining) {
+                       errno = EIO;
+                       goto failed;
+               }
+
+               if (*p == '@') {
+                       /* ignore special LDB attributes */
+                       return 0;
+               }
+
+               if (strncmp((char *)p, "rid=", 4)) {
+                       /* unknown entry, ignore */
+                       DEBUG(3, ("Found unknown entry in group mapping "
+                                 "database named [%s]\n", (char *)p));
+                       return 0;
+               }
+
+               remaining -= len + 1;
+               p += len + 1;
+               break;
+
+       case LTDB_PACKING_FORMAT_NODN:
+       default:
+               errno = EIO;
+               goto failed;
+       }
+
+       if (num_el == 0) {
+               /* bad entry, ignore */
+               return 0;
+       }
+
+       if (num_el > remaining / 6) {
+               errno = EIO;
+               goto failed;
+       }
+
+       ZERO_STRUCT(map);
+
+       for (i = 0; i < num_el; i++) {
+               uint32_t num_vals;
+
+               if (remaining < 10) {
+                       errno = EIO;
+                       goto failed;
+               }
+               len = strnlen((char *)p, remaining - 6);
+               if (len == remaining - 6) {
+                       errno = EIO;
+                       goto failed;
+               }
+               name = talloc_strndup(tmp_ctx, (char *)p, len);
+               if (name == NULL) {
+                       errno = ENOMEM;
+                       goto failed;
+               }
+               remaining -= len + 1;
+               p += len + 1;
+
+               num_vals = pull_uint32(p, 0);
+               if (strcasecmp_m(name, "member") == 0) {
+                       num_mem = num_vals;
+                       members = talloc_array(tmp_ctx, struct dom_sid, num_mem);
+                       if (members == NULL) {
+                               errno = ENOMEM;
+                               goto failed;
+                       }
+               } else if (num_vals != 1) {
+                       errno = EIO;
+                       goto failed;
+               }
+
+               p += 4;
+               remaining -= 4;
+
+               for (j = 0; j < num_vals; j++) {
+                       len = pull_uint32(p, 0);
+                       if (len > remaining-5) {
+                               errno = EIO;
+                               goto failed;
+                       }
+
+                       val = talloc_strndup(tmp_ctx, (char *)(p + 4), len);
+                       if (val == NULL) {
+                               errno = ENOMEM;
+                               goto failed;
+                       }
+
+                       remaining -= len+4+1;
+                       p += len+4+1;
+
+                       /* we ignore unknown or uninteresting attributes
+                        * (objectclass, etc.) */
+                       if (strcasecmp_m(name, "gidNumber") == 0) {
+                               map.gid = strtoul(val, &q, 10);
+                               if (*q) {
+                                       errno = EIO;
+                                       goto failed;
+                               }
+                       } else if (strcasecmp_m(name, "sid") == 0) {
+                               if (!string_to_sid(&map.sid, val)) {
+                                       errno = EIO;
+                                       goto failed;
+                               }
+                       } else if (strcasecmp_m(name, "sidNameUse") == 0) {
+                               map.sid_name_use = strtoul(val, &q, 10);
+                               if (*q) {
+                                       errno = EIO;
+                                       goto failed;
+                               }
+                       } else if (strcasecmp_m(name, "ntname") == 0) {
+                               strlcpy(map.nt_name, val,
+                                       sizeof(map.nt_name));
+                       } else if (strcasecmp_m(name, "comment") == 0) {
+                               strlcpy(map.comment, val,
+                                       sizeof(map.comment));
+                       } else if (strcasecmp_m(name, "member") == 0) {
+                               if (!string_to_sid(&members[j], val)) {
+                                       errno = EIO;
+                                       goto failed;
+                               }
+                       }
+
+                       TALLOC_FREE(val);
+               }
+
+               TALLOC_FREE(name);
+       }
+
+       if (!add_mapping_entry(&map, 0)) {
+               errno = EIO;
+               goto failed;
+       }
+
+       if (num_mem) {
+               for (j = 0; j < num_mem; j++) {
+                       NTSTATUS status;
+                       status = add_aliasmem(&map.sid, &members[j]);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               errno = EIO;
+                               goto failed;
+                       }
+               }
+       }
+
+       if (remaining != 0) {
+               DEBUG(0, ("Errror: %d bytes unread in ltdb_unpack_data\n",
+                         remaining));
+       }
+
+       return 0;
+
+failed:
+       return -1;
 }
 
+static bool mapping_switch(const char *ldb_path)
+{
+       TDB_CONTEXT *ltdb;
+       TALLOC_CTX *frame;
+       char *new_path;
+       int ret;
+
+       frame = talloc_stackframe();
+
+       ltdb = tdb_open_log(ldb_path, 0, TDB_DEFAULT, O_RDONLY, 0600);
+       if (ltdb == NULL) goto failed;
+
+       /* ldb is just a very fancy tdb, read out raw data and perform
+        * conversion */
+       ret = tdb_traverse(ltdb, convert_ldb_record, NULL);
+       if (ret == -1) goto failed;
+
+       if (ltdb) {
+               tdb_close(ltdb);
+               ltdb = NULL;
+       }
+
+       /* now rename the old db out of the way */
+       new_path = state_path("group_mapping.ldb.replaced");
+       if (!new_path) {
+               goto failed;
+       }
+       if (rename(ldb_path, new_path) != 0) {
+               DEBUG(0,("Failed to rename old group mapping database\n"));
+               goto failed;
+       }
+       TALLOC_FREE(frame);
+       return True;
+
+failed:
+       DEBUG(0, ("Failed to switch to tdb group mapping database\n"));
+       if (ltdb) tdb_close(ltdb);
+       TALLOC_FREE(frame);
+       return False;
+}
 
 static const struct mapping_backend tdb_backend = {
        .add_mapping_entry         = add_mapping_entry,