Changeset 228 for branches/samba-3.2.x/source/winbindd/idmap_tdb2.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/winbindd/idmap_tdb2.c (modified) (4 diffs)

branches/samba-3.2.x/source/winbindd/idmap_tdb2.c

@@ -236 +236 @@
 
         status = idmap_tdb2_open_perm_db();
-        NT_STATUS_NOT_OK_RETURN(status);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         /* Get current high water mark */
@@ -298 +300 @@
         uint32_t hwm;
         uint32_t high_hwm;
+        NTSTATUS status;
+
+        status = idmap_tdb2_open_perm_db();
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         /* Get current high water mark */
@@ -553 +561 @@
         TDB_DATA data;
         char *keystr;
+        NTSTATUS status;
+
+        status = idmap_tdb2_open_perm_db();
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         if (!ctx || !map) {
@@ -648 +662 @@
         char *keystr;
         unsigned long rec_id = 0;
+        NTSTATUS status;
+
+        status = idmap_tdb2_open_perm_db();
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         if ((keystr = sid_string_talloc(ctx, map->sid)) == NULL) {