svn commit: samba r21307 - in branches/SAMBA_4_0/source/libcli/security: .

[metze at samba.org]

Author: metze
Date: 2007-02-13 09:27:56 +0000 (Tue, 13 Feb 2007)
New Revision: 21307

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21307

Log:
make it possible to pass in NULL for domain or rid,
if someone isn't interessted in one of it

metze
Modified:
   branches/SAMBA_4_0/source/libcli/security/dom_sid.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/security/dom_sid.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/security/dom_sid.c	2007-02-13 08:08:23 UTC (rev 21306)
+++ branches/SAMBA_4_0/source/libcli/security/dom_sid.c	2007-02-13 09:27:56 UTC (rev 21307)
@@ -225,12 +225,18 @@
 		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;
 	}
 
-	(*domain)->num_auths -= 1;
-	*rid = (*domain)->sub_auths[(*domain)->num_auths];
+	if (rid) {
+		*rid = sid->sub_auths[sid->num_auths - 1];
+	}
+
 	return NT_STATUS_OK;
 }