s3:winbindd: remove unused idmap_sid_to_gid()
authorMichael Adam <obnox@samba.org>
Fri, 23 Nov 2012 16:53:39 +0000 (17:53 +0100)
committerStefan Metzmacher <metze@samba.org>
Mon, 3 Dec 2012 07:48:27 +0000 (08:48 +0100)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/winbindd/idmap_proto.h
source3/winbindd/idmap_util.c

index c6f76bd07579766a57efdd50d8170930383ee59c..6b3d8cfc9f307a4afd9c0ce96da8ebf7c6f515d2 100644 (file)
@@ -55,7 +55,6 @@ NTSTATUS idmap_tdb_init(void);
 
 NTSTATUS idmap_uid_to_sid(const char *domname, struct dom_sid *sid, uid_t uid);
 NTSTATUS idmap_gid_to_sid(const char *domname, struct dom_sid *sid, gid_t gid);
-NTSTATUS idmap_sid_to_gid(const char *domname, struct dom_sid *sid, gid_t *gid);
 bool idmap_unix_id_is_in_range(uint32_t id, struct idmap_domain *dom);
 
 #endif /* _WINBINDD_IDMAP_PROTO_H_ */
index 7acef8dbd148b28be97c656163ec72f760a30961..9d9ada71999142011fe2e83135819a311bdc6e49 100644 (file)
@@ -154,80 +154,6 @@ backend:
        return NT_STATUS_OK;
 }
 
-/*****************************************************************
- Returns the GID mapped to the given SID.
- If mapping is not possible or SID maps to a UID returns an error.
-*****************************************************************/  
-
-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], domain = '%s'\n",
-                 sid_string_dbg(sid), domname));
-
-       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()) {
-                       DEBUG(10, ("revalidating expired entry\n"));
-                       goto backend;
-               }
-               if ((*gid) == -1) {
-                       DEBUG(10, ("Returning negative cache entry\n"));
-                       return NT_STATUS_NONE_MAPPED;
-               }
-               DEBUG(10, ("Returning positive cache entry\n"));
-               return NT_STATUS_OK;
-       }
-
-backend:
-       ZERO_STRUCT(map);
-       map.sid = sid;
-       map.xid.type = ID_TYPE_GID;
-
-       ret = idmap_backends_sid_to_unixid(domname, &map);
-
-       if (!NT_STATUS_IS_OK(ret)) {
-               DEBUG(10, ("idmap_backends_sid_to_unixid failed: %s\n",
-                          nt_errstr(ret)));
-               if (winbindd_use_idmap_cache()) {
-                       idmap_cache_set_sid2gid(sid, -1);
-               }
-               return ret;
-       }
-
-       if (map.status != ID_MAPPED) {
-               DEBUG(10, ("sid [%s] is not mapped\n", sid_string_dbg(sid)));
-               if (winbindd_use_idmap_cache()) {
-                       idmap_cache_set_sid2gid(sid, -1);
-               }
-               return NT_STATUS_NONE_MAPPED;
-       }
-
-       if (map.xid.type != ID_TYPE_GID) {
-               DEBUG(10, ("sid [%s] not mapped to a gid "
-                          "[%u,%u,%u]\n",
-                          sid_string_dbg(sid),
-                          map.status,
-                          map.xid.type,
-                          map.xid.id));
-               if (winbindd_use_idmap_cache()) {
-                       idmap_cache_set_sid2gid(sid, -1);
-               }
-               return NT_STATUS_NONE_MAPPED;
-       }
-
-       *gid = map.xid.id;
-       if (winbindd_use_idmap_cache()) {
-               idmap_cache_set_sid2unixid(sid, &map.xid);
-       }
-       return NT_STATUS_OK;
-}
-
 /**
  * check whether a given unix id is inside the filter range of an idmap domain
  */