idmap: Remove "domname" from idmap_uid_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 159aac603073df9f80e2b3e74d1c6665794dd3b7..73161bb3ac7278b71c20703b108106f12cca7a63 100644 (file)
--- a/source3/winbindd/idmap_proto.h
+++ b/source3/winbindd/idmap_proto.h
@@ -50,7 +50,7 @@ NTSTATUS idmap_tdb_init(void);
 
 /* The following definitions come from winbindd/idmap_util.c  */
 
-NTSTATUS idmap_uid_to_sid(const char *domname, struct dom_sid *sid, uid_t uid);
+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);
 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,

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

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 1fe66e155fa03211b6d0e365797e44480ddec12c..47d98856499abb4a73af65855406fa80eace400f 100644 (file)
--- a/source3/winbindd/winbindd_dual_srv.c
+++ b/source3/winbindd/winbindd_dual_srv.c
@@ -223,8 +223,7 @@ nomem:
 
 NTSTATUS _wbint_Uid2Sid(struct pipes_struct *p, struct wbint_Uid2Sid *r)
 {
-       return idmap_uid_to_sid(r->in.dom_name ? r->in.dom_name : "",
-                               r->out.sid, r->in.uid);
+       return idmap_uid_to_sid(r->out.sid, r->in.uid);
 }
 
 NTSTATUS _wbint_Gid2Sid(struct pipes_struct *p, struct wbint_Gid2Sid *r)