sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

idmap: Remove "domname" from idmap_uid_to_sid

Browse Source 
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 0f8c9b8d7f9a3ca288e42d857d253137e048d4bc)
This commit is contained in:
Volker Lendecke 2015-08-19 13:34:58 +02:00 committed by Stefan Metzmacher
parent 64450da768
commit 92976d0c06
3 changed files with 4 additions and 6 deletions

2
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,

5
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)) {

3
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)