From 92976d0c0665b193ec98e72dab3323a6718e5817 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 19 Aug 2015 13:34:58 +0200 Subject: idmap: Remove "domname" from idmap_uid_to_sid Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher Bug: https://bugzilla.samba.org/show_bug.cgi?id=11464 (cherry picked from commit 0f8c9b8d7f9a3ca288e42d857d253137e048d4bc) --- source3/winbindd/idmap_proto.h | 2 +- source3/winbindd/idmap_util.c | 5 ++--- source3/winbindd/winbindd_dual_srv.c | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'source3') diff --git a/source3/winbindd/idmap_proto.h b/source3/winbindd/idmap_proto.h index 159aac60307..73161bb3ac7 100644 --- 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 08857ab839a..fd7e6ed6a6f 100644 --- 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 1fe66e155fa..47d98856499 100644 --- 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) -- cgit v1.2.1