r9700: Change DATA_BLOB in ejs back to struct datablob

[kai/samba.git] / source / lib / samba3 / idmap.c

diff --git a/source/lib/samba3/idmap.c b/source/lib/samba3/idmap.c
index 64d6387ed45095346fde9c080888134689ce0780..ad0ef72ef2e81a0c1f6b36cf0b62f8f33f7e47e3 100644 (file)
--- a/source/lib/samba3/idmap.c
+++ b/source/lib/samba3/idmap.c
@@ -39,25 +39,17 @@
  Initialise idmap database. 
 *****************************************************************************/
 
-NTSTATUS samba3_read_idmap( const char *fn, TALLOC_CTX *ctx, struct samba3_idmap *idmap )
+NTSTATUS samba3_read_idmap( const char *fn, TALLOC_CTX *ctx, struct samba3_idmapdb *idmap )
 {
-       int32_t version;
        TDB_CONTEXT *tdb;
        TDB_DATA key, val;
 
        /* Open idmap repository */
        if (!(tdb = tdb_open(fn, 0, TDB_DEFAULT, O_RDONLY, 0644))) {
-               DEBUG(0, ("idmap_init: Unable to open idmap database\n"));
+               DEBUG(0, ("idmap_init: Unable to open idmap database '%s'\n", fn));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
-       /* check against earlier versions */
-       version = tdb_fetch_int32(tdb, "IDMAP_VERSION");
-       if (version != IDMAP_VERSION) {
-               DEBUG(0, ("idmap_init: Unable to open idmap database, it's in an old format!\n"));
-               return NT_STATUS_INTERNAL_DB_ERROR;
-       }
-
        idmap->mapping_count = 0;
        idmap->mappings = NULL;
        idmap->user_hwm = tdb_fetch_int32(tdb, HWM_USER);