From 25e0937ad27994ee3da5c9c4520515a6fd7b2358 Mon Sep 17 00:00:00 2001
From: Sumit Bose <sbose@redhat.com>
Date: Sep 06 2012 07:27:18 +0000
Subject: ipasam: replace sid_compose()


---

diff --git a/daemons/ipa-sam/ipa_sam.c b/daemons/ipa-sam/ipa_sam.c
index e7774f5..3f65624 100644
--- a/daemons/ipa-sam/ipa_sam.c
+++ b/daemons/ipa-sam/ipa_sam.c
@@ -87,7 +87,6 @@ bool sid_check_is_builtin(const struct dom_sid *sid); /* available in libpdb.so 
 bool sid_check_is_our_sam(const struct dom_sid *sid);
 bool sid_linearize(char *outbuf, size_t len, const struct dom_sid *sid); /* available in libsmbconf.so */
 bool string_to_sid(struct dom_sid *sidout, const char *sidstr); /* available in libsecurity.so */
-bool sid_compose(struct dom_sid *dst, const struct dom_sid *domain_sid, uint32_t rid); /* available in libsecurity.so */
 int dom_sid_compare_domain(const struct dom_sid *sid1, const struct dom_sid *sid2); /* available in libsecurity.so */
 char *sid_string_talloc(TALLOC_CTX *mem_ctx, const struct dom_sid *sid); /* available in libsmbconf.so */
 char *sid_string_dbg(const struct dom_sid *sid); /* available in libsmbconf.so */
@@ -180,6 +179,20 @@ static void sid_copy(struct dom_sid *dst, const struct dom_sid *src)
 	}
 }
 
+static bool sid_compose(struct dom_sid *dst, const struct dom_sid *dom_sid,
+			uint32_t rid)
+{
+	if (dom_sid->num_auths >= 15) {
+		return false;
+	}
+
+	sid_copy(dst, dom_sid);
+
+	dst->sub_auths[dst->num_auths++] = rid;
+
+	return true;
+}
+
 static bool strnequal(const char *s1, const char *s2, size_t n) {
 	if (s1 == s2) {
 		return true;