sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

idmap4: Use sid_check_is_in_unix_groups()

Browse Source 
This avoids the need for the special unix groups sid

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Uri Simchoni <uri@samba.org>

Autobuild-User(master): Uri Simchoni <uri@samba.org>
Autobuild-Date(master): Thu Dec 29 00:05:25 CET 2016 on sn-devel-144
This commit is contained in:
Volker Lendecke 2016-12-27 13:08:58 +00:00 committed by Uri Simchoni
parent e06a342f80
commit 2e1dc952f0
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/winbind/idmap.c
View File

@ -175,12 +175,6 @@ struct idmap_context *idmap_init(TALLOC_CTX *mem_ctx,
goto fail;
}
idmap_ctx->unix_groups_sid = dom_sid_parse_talloc(
idmap_ctx, "S-1-22-2");
if (idmap_ctx->unix_groups_sid == NULL) {
goto fail;
}
idmap_ctx->samdb = samdb_connect(idmap_ctx, ev_ctx, lp_ctx, system_session(lp_ctx), 0);
if (idmap_ctx->samdb == NULL) {
DEBUG(0, ("Failed to load sam.ldb in idmap_init\n"));
@ -423,7 +417,7 @@ static NTSTATUS idmap_sid_to_xid(struct idmap_context *idmap_ctx,
return NT_STATUS_OK;
}
if (dom_sid_in_domain(idmap_ctx->unix_groups_sid, sid)) {
if (sid_check_is_in_unix_groups(sid)) {
uint32_t rid;
DEBUG(6, ("This is a local unix gid, just calculate that.\n"));
status = dom_sid_split_rid(tmp_ctx, sid, NULL, &rid);

1
source4/winbind/idmap.h
View File

@ -27,7 +27,6 @@
struct idmap_context {
struct loadparm_context *lp_ctx;
struct ldb_context *ldb_ctx;
struct dom_sid *unix_groups_sid;
struct ldb_context *samdb;
};