Changeset 30 for trunk/samba/source/nsswitch/idmap_tdb.c

Timestamp:

Apr 25, 2007, 9:44:55 AM (14 years ago)

Author:

Paul Smedley

Message:

Code updated to Samba 3.0.25rc2 level

File:

• trunk/samba/source/nsswitch/idmap_tdb.c (modified) (7 diffs)

trunk/samba/source/nsswitch/idmap_tdb.c

@@ -612 +612 @@
 *****************************/
 
-static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom, const char *compat_params)
+static NTSTATUS idmap_tdb_db_init(struct idmap_domain *dom)
 {
         NTSTATUS ret;
@@ -646 +646 @@
 
         dom->private_data = ctx;
+        dom->initialized = True;
 
         talloc_free(config_option);
@@ -800 +801 @@
         int i;
 
+        /* make sure we initialized */
+        if ( ! dom->initialized) {
+                ret = idmap_tdb_db_init(dom);
+                if ( ! NT_STATUS_IS_OK(ret)) {
+                        return ret;
+                }
+        }
+
         ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
@@ -838 +847 @@
         int i;
 
+        /* make sure we initialized */
+        if ( ! dom->initialized) {
+                ret = idmap_tdb_db_init(dom);
+                if ( ! NT_STATUS_IS_OK(ret)) {
+                        return ret;
+                }
+        }
+
         ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);
 
@@ -875 +892 @@
         NTSTATUS ret;
         TDB_DATA ksid, kid, data;
+
+        /* make sure we initialized */
+        if ( ! dom->initialized) {
+                ret = idmap_tdb_db_init(dom);
+                if ( ! NT_STATUS_IS_OK(ret)) {
+                        return ret;
+                }
+        }
 
         if (!map || !map->sid) {
@@ -979 +1004 @@
         TDB_DATA ksid, kid, data;
 
+        /* make sure we initialized */
+        if ( ! dom->initialized) {
+                ret = idmap_tdb_db_init(dom);
+                if ( ! NT_STATUS_IS_OK(ret)) {
+                        return ret;
+                }
+        }
+
         if (!map || !map->sid) {
                 return NT_STATUS_INVALID_PARAMETER;
@@ -1155 +1188 @@
         struct dump_data *data;
         NTSTATUS ret = NT_STATUS_OK;
+
+        /* make sure we initialized */
+        if ( ! dom->initialized) {
+                ret = idmap_tdb_db_init(dom);
+                if ( ! NT_STATUS_IS_OK(ret)) {
+                        return ret;
+                }
+        }
 
         ctx = talloc_get_type(dom->private_data, struct idmap_tdb_context);