idmap: Remove "domname" from idmap_gid_to_sid

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Bug: https://bugzilla.samba.org/show_bug.cgi?id=11464

diff --git a/source3/winbindd/idmap_proto.h b/source3/winbindd/idmap_proto.h
index 73161bb3ac7278b71c20703b108106f12cca7a63..a12e5b48ea60575d17e3ad1c154094e25010345f 100644 (file)
--- a/source3/winbindd/idmap_proto.h
+++ b/source3/winbindd/idmap_proto.h
@@ -51,7 +51,7 @@ NTSTATUS idmap_tdb_init(void);
 /* The following definitions come from winbindd/idmap_util.c  */
 
 NTSTATUS idmap_uid_to_sid(struct dom_sid *sid, uid_t uid);
-NTSTATUS idmap_gid_to_sid(const char *domname, struct dom_sid *sid, gid_t gid);
+NTSTATUS idmap_gid_to_sid(struct dom_sid *sid, gid_t gid);
 bool idmap_unix_id_is_in_range(uint32_t id, struct idmap_domain *dom);
 struct id_map *idmap_find_map_by_id(struct id_map **maps, enum id_type type,
                                    uint32_t id);

diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c
index fd7e6ed6a6f104aef3d11c707c868d3a421443d3..dc7d37c6dc058c8bac608d4f7b354785ad798592 100644 (file)
--- a/source3/winbindd/idmap_util.c
+++ b/source3/winbindd/idmap_util.c
@@ -97,14 +97,13 @@ backend:
  If mapping is not possible returns an error.
 *****************************************************************/  
 
-NTSTATUS idmap_gid_to_sid(const char *domname, struct dom_sid *sid, gid_t gid)
+NTSTATUS idmap_gid_to_sid(struct dom_sid *sid, gid_t gid)
 {
        NTSTATUS ret;
        struct id_map map;
        bool expired;
 
-       DEBUG(10,("idmap_gid_to_sid: gid = [%lu], domain = '%s'\n",
-                 (unsigned long)gid, domname?domname:"NULL"));
+       DEBUG(10, ("idmap_gid_to_sid: gid = [%lu]\n", (unsigned long)gid));
 
        if (winbindd_use_idmap_cache()
            && idmap_cache_find_gid2sid(gid, sid, &expired)) {

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 47d98856499abb4a73af65855406fa80eace400f..44e4842ec22e25a94f2f1c16e48405358d737bb3 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -228,8 +228,7 @@ NTSTATUS _wbint_Uid2Sid(struct pipes_struct *p, struct wbint_Uid2Sid *r)
 
 NTSTATUS _wbint_Gid2Sid(struct pipes_struct *p, struct wbint_Gid2Sid *r)
 {
-       return idmap_gid_to_sid(r->in.dom_name ? r->in.dom_name : "",
-                               r->out.sid, r->in.gid);
+       return idmap_gid_to_sid(r->out.sid, r->in.gid);
 }
 
 NTSTATUS _wbint_AllocateUid(struct pipes_struct *p, struct wbint_AllocateUid *r)