From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 16 Dec 2008 07:41:22 +0000 (+0100)
Subject: s4:samldb: make use of dom_sid_split_rid()
X-Git-Tag: samba-4.0.0alpha6~462^2~14^2~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1107021f3aa4ad1a3995a018d11aed485aa39c38;p=thirdparty%2Fsamba.git

s4:samldb: make use of dom_sid_split_rid()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 627e15ab93d..7ecc41d2c36 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -1120,6 +1120,7 @@ static int samldb_foreign_notice_sid(struct samldb_ctx *ac)
 {
 	static const char * const attrs[3] = { "nextRid", "name", NULL };
 	struct ldb_request *req;
+	NTSTATUS status;
 	char *filter;
 	int ret;
 
@@ -1127,12 +1128,10 @@ static int samldb_foreign_notice_sid(struct samldb_ctx *ac)
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-	ac->domain_sid = dom_sid_dup(ac, ac->sid);
-	if (!ac->domain_sid) {
+	status = dom_sid_split_rid(ac, ac->sid, &ac->domain_sid, NULL);
+	if (!NT_STATUS_IS_OK(status)) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
-	/* get the domain component part of the provided SID */
-	ac->domain_sid->num_auths--;
 
 	filter = talloc_asprintf(ac, "(&(objectSid=%s)(objectclass=domain))",
 				 ldap_encode_ndr_dom_sid(ac, ac->domain_sid));