Changeset 222 for branches/samba-3.3.x/source/winbindd/idmap_util.c

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

File:

• branches/samba-3.3.x/source/winbindd/idmap_util.c (modified) (15 diffs)

branches/samba-3.3.x/source/winbindd/idmap_util.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "winbindd.h"
+#include "winbindd_proto.h"
 
 #undef DBGC_CLASS
@@ -37 +39 @@
                   (unsigned long)uid, domname?domname:"NULL"));
 
-        if (idmap_cache_find_uid2sid(uid, sid, &expired)) {
+        if (winbindd_use_idmap_cache()
+            && idmap_cache_find_uid2sid(uid, sid, &expired)) {
                 DEBUG(10, ("idmap_cache_find_uid2sid found %d%s\n", uid,
                            expired ? " (expired)": ""));
@@ -64 +67 @@
 
         if (map.status != ID_MAPPED) {
-                struct dom_sid null_sid;
-                ZERO_STRUCT(null_sid);
-                idmap_cache_set_sid2uid(&null_sid, uid);
+                if (winbindd_use_idmap_cache()) {
+                        struct dom_sid null_sid;
+                        ZERO_STRUCT(null_sid);
+                        idmap_cache_set_sid2uid(&null_sid, uid);
+                }
                 DEBUG(10, ("uid [%lu] not mapped\n", (unsigned long)uid));
                 return NT_STATUS_NONE_MAPPED;
         }
 
-        idmap_cache_set_sid2uid(sid, uid);
+        if (winbindd_use_idmap_cache()) {
+                idmap_cache_set_sid2uid(sid, uid);
+        }
 
         return NT_STATUS_OK;
@@ -90 +97 @@
                   (unsigned long)gid, domname?domname:"NULL"));
 
-        if (idmap_cache_find_gid2sid(gid, sid, &expired)) {
+        if (winbindd_use_idmap_cache()
+            && idmap_cache_find_gid2sid(gid, sid, &expired)) {
                 DEBUG(10, ("idmap_cache_find_gid2sid found %d%s\n", gid,
                            expired ? " (expired)": ""));
@@ -117 +125 @@
 
         if (map.status != ID_MAPPED) {
-                struct dom_sid null_sid;
-                ZERO_STRUCT(null_sid);
-                idmap_cache_set_sid2uid(&null_sid, gid);
+                if (winbindd_use_idmap_cache()) {
+                        struct dom_sid null_sid;
+                        ZERO_STRUCT(null_sid);
+                        idmap_cache_set_sid2uid(&null_sid, gid);
+                }
                 DEBUG(10, ("gid [%lu] not mapped\n", (unsigned long)gid));
                 return NT_STATUS_NONE_MAPPED;
         }
 
-        idmap_cache_set_sid2gid(sid, gid);
+        if (winbindd_use_idmap_cache()) {
+                idmap_cache_set_sid2gid(sid, gid);
+        }
 
         return NT_STATUS_OK;
@@ -143 +155 @@
                   sid_string_dbg(sid), dom_name));
 
-        if (idmap_cache_find_sid2uid(sid, uid, &expired)) {
+        if (winbindd_use_idmap_cache()
+            && idmap_cache_find_sid2uid(sid, uid, &expired)) {
                 DEBUG(10, ("idmap_cache_find_sid2uid found %d%s\n",
                            (int)(*uid), expired ? " (expired)": ""));
@@ -172 +185 @@
                                    map.xid.type,
                                    map.xid.id));
-                        idmap_cache_set_sid2uid(sid, -1);
+                        if (winbindd_use_idmap_cache()) {
+                                idmap_cache_set_sid2uid(sid, -1);
+                        }
                         return NT_STATUS_NONE_MAPPED;
                 }
@@ -183 +198 @@
                  * could not answer our request. Fail.
                  */
-                idmap_cache_set_sid2uid(sid, -1);
+                if (winbindd_use_idmap_cache()) {
+                        idmap_cache_set_sid2uid(sid, -1);
+                }
                 return NT_STATUS_NONE_MAPPED;
         }
@@ -192 +209 @@
                 DEBUG(10, ("idmap_new_mapping failed: %s\n",
                            nt_errstr(ret)));
-                idmap_cache_set_sid2uid(sid, -1);
+                if (winbindd_use_idmap_cache()) {
+                        idmap_cache_set_sid2uid(sid, -1);
+                }
                 return ret;
         }
@@ -198 +217 @@
 done:
         *uid = (uid_t)map.xid.id;
-        idmap_cache_set_sid2uid(sid, *uid);
+        if (winbindd_use_idmap_cache()) {
+                idmap_cache_set_sid2uid(sid, *uid);
+        }
         return NT_STATUS_OK;
 }
@@ -216 +237 @@
                   sid_string_dbg(sid), domname));
 
-        if (idmap_cache_find_sid2gid(sid, gid, &expired)) {
+        if (winbindd_use_idmap_cache()
+            && idmap_cache_find_sid2gid(sid, gid, &expired)) {
                 DEBUG(10, ("idmap_cache_find_sid2gid found %d%s\n",
                            (int)(*gid), expired ? " (expired)": ""));
@@ -244 +266 @@
                                    map.xid.type,
                                    map.xid.id));
-                        idmap_cache_set_sid2gid(sid, -1);
+                        if (winbindd_use_idmap_cache()) {
+                                idmap_cache_set_sid2gid(sid, -1);
+                        }
                         return NT_STATUS_NONE_MAPPED;
                 }
@@ -255 +279 @@
                  * could not answer our request. Fail.
                  */
-                idmap_cache_set_sid2uid(sid, -1);
+                if (winbindd_use_idmap_cache()) {
+                        idmap_cache_set_sid2uid(sid, -1);
+                }
                 return NT_STATUS_NONE_MAPPED;
         }
@@ -264 +290 @@
                 DEBUG(10, ("idmap_new_mapping failed: %s\n",
                            nt_errstr(ret)));
-                idmap_cache_set_sid2gid(sid, -1);
+                if (winbindd_use_idmap_cache()) {
+                        idmap_cache_set_sid2gid(sid, -1);
+                }
                 return ret;
         }
@@ -270 +298 @@
 done:
         *gid = map.xid.id;
-        idmap_cache_set_sid2gid(sid, *gid);
+        if (winbindd_use_idmap_cache()) {
+                idmap_cache_set_sid2gid(sid, *gid);
+        }
         return NT_STATUS_OK;
 }