From 08de05ce5a4da17403fc8feb2a1760ab21a767fa Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 13 Feb 2007 09:27:56 +0000
Subject: r21307: make it possible to pass in NULL for domain or rid, if
 someone isn't interessted in one of it

metze
(This used to be commit 1fdc71918a430c35af91fa7788e191d381f76d56)
---
 source4/libcli/security/dom_sid.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/source4/libcli/security/dom_sid.c b/source4/libcli/security/dom_sid.c
index 54242eb515..a72588dee1 100644
--- a/source4/libcli/security/dom_sid.c
+++ b/source4/libcli/security/dom_sid.c
@@ -225,12 +225,18 @@ NTSTATUS dom_sid_split_rid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid,
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
-	if (!(*domain = dom_sid_dup(mem_ctx, sid))) {
-		return NT_STATUS_NO_MEMORY;
+	if (domain) {
+		if (!(*domain = dom_sid_dup(mem_ctx, sid))) {
+			return NT_STATUS_NO_MEMORY;
+		}
+
+		(*domain)->num_auths -= 1;
+	}
+
+	if (rid) {
+		*rid = sid->sub_auths[sid->num_auths - 1];
 	}
 
-	(*domain)->num_auths -= 1;
-	*rid = (*domain)->sub_auths[(*domain)->num_auths];
 	return NT_STATUS_OK;
 }
 
-- 
cgit