]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
s4:torture: Make use of torture_assert_sid_equal()
authorJoseph Sutton <josephsutton@catalyst.net.nz>
Sun, 11 Dec 2022 21:28:45 +0000 (10:28 +1300)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 8 Feb 2023 00:03:39 +0000 (00:03 +0000)
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>
source4/torture/winbind/winbind.c

index aa47638edecbdebad076bdff00d5e9d8c6704c5a..b09c2c23d3159dc5464f38bfab895f38c3e5c04f 100644 (file)
@@ -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;