idmap4: Use sid_check_is_in_unix_groups()
authorVolker Lendecke <vl@samba.org>
Tue, 27 Dec 2016 13:08:58 +0000 (13:08 +0000)
committerUri Simchoni <uri@samba.org>
Wed, 28 Dec 2016 23:05:25 +0000 (00:05 +0100)
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

source4/winbind/idmap.c
source4/winbind/idmap.h

index bcf4587437407a8dae5776b34c4af98ed88c5445..edeb72419bbcac87a083532fd3b3a636a0eb274b 100644 (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);
index bc753b227ab69be2ac422ae3c7d38b7a6b61eec4..04770c308eb7b0dbeb2cacf68c76d3f5157a5513 100644 (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;
 };