s3:dom_sid Global replace of DOM_SID with struct dom_sid

[samba.git] / source3 / winbindd / idmap_util.c

diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c
index 9f876618be97aef0aa6c3ed07a0f9039e8120a5d..a8974a902451ac4a7b46075406889528176efd69 100644 (file)
--- a/source3/winbindd/idmap_util.c
+++ b/source3/winbindd/idmap_util.c
@@ -18,6 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 #include "includes.h"
+#include "winbindd.h"
+#include "winbindd_proto.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
@@ -27,16 +29,19 @@
  If mapping is not possible returns an error.
 *****************************************************************/  
 
-NTSTATUS idmap_uid_to_sid(const char *domname, DOM_SID *sid, uid_t uid)
+NTSTATUS idmap_uid_to_sid(const char *domname, struct dom_sid *sid, uid_t uid)
 {
        NTSTATUS ret;
        struct id_map map;
        bool expired;
 
-       DEBUG(10,("uid = [%lu]\n", (unsigned long)uid));
+       DEBUG(10,("idmap_uid_to_sid: uid = [%lu], domain = '%s'\n",
+                 (unsigned long)uid, domname?domname:"NULL"));
 
-       if (idmap_cache_find_uid2sid(uid, sid, &expired)) {
-               DEBUG(10, ("idmap_cache_find_uid2sid found %d%s\n", uid,
+       if (winbindd_use_idmap_cache()
+           && idmap_cache_find_uid2sid(uid, sid, &expired)) {
+               DEBUG(10, ("idmap_cache_find_uid2sid found %u%s\n",
+                       (unsigned int)uid,
                           expired ? " (expired)": ""));
                if (expired && idmap_is_online()) {
                        DEBUG(10, ("revalidating expired entry\n"));
@@ -62,14 +67,18 @@ backend:
        }
 
        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;
 }
@@ -79,16 +88,19 @@ backend:
  If mapping is not possible returns an error.
 *****************************************************************/  
 
-NTSTATUS idmap_gid_to_sid(const char *domname, DOM_SID *sid, gid_t gid)
+NTSTATUS idmap_gid_to_sid(const char *domname, struct dom_sid *sid, gid_t gid)
 {
        NTSTATUS ret;
        struct id_map map;
        bool expired;
 
-       DEBUG(10,("gid = [%lu]\n", (unsigned long)gid));
+       DEBUG(10,("idmap_gid_to_sid: gid = [%lu], domain = '%s'\n",
+                 (unsigned long)gid, domname?domname:"NULL"));
 
-       if (idmap_cache_find_gid2sid(gid, sid, &expired)) {
-               DEBUG(10, ("idmap_cache_find_gid2sid found %d%s\n", gid,
+       if (winbindd_use_idmap_cache()
+           && idmap_cache_find_gid2sid(gid, sid, &expired)) {
+               DEBUG(10, ("idmap_cache_find_gid2sid found %u%s\n",
+                       (unsigned int)gid,
                           expired ? " (expired)": ""));
                if (expired && idmap_is_online()) {
                        DEBUG(10, ("revalidating expired entry\n"));
@@ -114,14 +126,18 @@ backend:
        }
 
        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;
 }
@@ -131,15 +147,17 @@ backend:
  If mapping is not possible or SID maps to a GID returns an error.
 *****************************************************************/  
 
-NTSTATUS idmap_sid_to_uid(const char *dom_name, DOM_SID *sid, uid_t *uid)
+NTSTATUS idmap_sid_to_uid(const char *dom_name, struct dom_sid *sid, uid_t *uid)
 {
        NTSTATUS ret;
        struct id_map map;
        bool expired;
 
-       DEBUG(10,("idmap_sid_to_uid: sid = [%s]\n", sid_string_dbg(sid)));
+       DEBUG(10,("idmap_sid_to_uid: sid = [%s], domain = '%s'\n",
+                 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)": ""));
                if (expired && idmap_is_online()) {
@@ -168,7 +186,9 @@ backend:
                                   map.status,
                                   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;
                }
                goto done;
@@ -179,7 +199,9 @@ backend:
                 * We had the task to go to a specific domain which
                 * 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;
        }
 
@@ -188,13 +210,17 @@ backend:
        if (!NT_STATUS_IS_OK(ret)) {
                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;
        }
 
 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;
 }
 
@@ -203,15 +229,17 @@ done:
  If mapping is not possible or SID maps to a UID returns an error.
 *****************************************************************/  
 
-NTSTATUS idmap_sid_to_gid(const char *domname, DOM_SID *sid, gid_t *gid)
+NTSTATUS idmap_sid_to_gid(const char *domname, struct dom_sid *sid, gid_t *gid)
 {
        NTSTATUS ret;
        struct id_map map;
        bool expired;
 
-       DEBUG(10,("idmap_sid_to_gid: sid = [%s]\n", sid_string_dbg(sid)));
+       DEBUG(10,("idmap_sid_to_gid: sid = [%s], domain = '%s'\n",
+                 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)": ""));
                if (expired && idmap_is_online()) {
@@ -239,7 +267,9 @@ backend:
                                   map.status,
                                   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;
                }
                goto done;
@@ -250,7 +280,9 @@ backend:
                 * We had the task to go to a specific domain which
                 * 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;
        }
 
@@ -259,12 +291,16 @@ backend:
        if (!NT_STATUS_IS_OK(ret)) {
                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;
        }
 
 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;
 }