diff options
| author | Volker Lendecke <vl@samba.org> | 2015-08-19 13:34:58 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-08-31 10:18:16 +0200 |
| commit | 7f4b57ebf910d5fc48964e3328d06eaf374750b4 (patch) | |
| tree | d701e05c1f85e79a84cc1debafd70d4be085fa18 | |
| parent | 92976d0c0665b193ec98e72dab3323a6718e5817 (diff) | |
| download | samba-7f4b57ebf910d5fc48964e3328d06eaf374750b4.tar.gz | |
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
(cherry picked from commit 2f4dad52c77c7d0aaad2a4ccc0cb7dff0d129612)
| -rw-r--r-- | source3/winbindd/idmap_proto.h | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_util.c | 5 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_dual_srv.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/source3/winbindd/idmap_proto.h b/source3/winbindd/idmap_proto.h index 73161bb3ac7..a12e5b48ea6 100644 --- 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 fd7e6ed6a6f..dc7d37c6dc0 100644 --- 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 47d98856499..44e4842ec22 100644 --- 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) |