From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Sun, 11 Dec 2022 21:28:45 +0000 (+1300)
Subject: s4:torture: Make use of torture_assert_sid_equal()
X-Git-Tag: talloc-2.4.1~1664
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5043bbed9993cc08ee752a3fe44f835aedbbc129;p=thirdparty%2Fsamba.git

s4:torture: Make use of torture_assert_sid_equal()

This macro produces a slightly more useful message if the assertion
fails.

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/source4/torture/winbind/winbind.c b/source4/torture/winbind/winbind.c
index aa47638edec..b09c2c23d31 100644
--- a/source4/torture/winbind/winbind.c
+++ b/source4/torture/winbind/winbind.c
@@ -160,21 +160,21 @@ static bool torture_decode_compare_pac(struct torture_context *tctx,
 		sid_idx++;
 		wbcSidToStringBuf(&info->sids[sid_idx].sid,
 				  sid_str, sizeof(sid_str));
-		torture_assert(tctx,
-			       dom_sid_equal(dom_sid_parse_talloc(tctx, sid_str),
-					     dom_sid_add_rid(tctx, base->domain_sid,
-							     base->groups.rids[i].rid)),
-			       sid_str);
+		torture_assert_sid_equal(tctx,
+					 dom_sid_parse_talloc(tctx, sid_str),
+					 dom_sid_add_rid(tctx, base->domain_sid,
+							 base->groups.rids[i].rid),
+					 "base SID mismatch");
 	}
 
 	for(i = 0; i < info3->sidcount; i++) {
 		sid_idx++;
 		wbcSidToStringBuf(&info->sids[sid_idx].sid,
 				  sid_str, sizeof(sid_str));
-		torture_assert(tctx,
-			       dom_sid_equal(dom_sid_parse_talloc(tctx, sid_str),
-					     info3->sids[i].sid),
-			       sid_str);
+		torture_assert_sid_equal(tctx,
+					 dom_sid_parse_talloc(tctx, sid_str),
+					 info3->sids[i].sid,
+					 "extra SID mismatch");
 	}
 
 	return true;