s4:torture: Do not print NULL strings we just checked before

Found by GCC 9.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13937

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit be72dfbc8edc53ed191dc01668a53cafb5cd785d)

diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index c03f6bd1ca919f475126a8996cbd69bb40ade8f6..339178320699dd4980905f5027461be1dbe7e40e 100644 (file)
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -213,13 +213,13 @@ static bool test_DsCrackNamesMatrix(struct torture_context *tctx,
                        } else if (n_matrix[i][j] == NULL && formats[j] == DRSUAPI_DS_NAME_FORMAT_SERVICE_PRINCIPAL) {
                        } else if (n_matrix[i][j] == NULL && n_from[j] != NULL) {
                                err_msg = talloc_asprintf(mem_ctx,
-                                               "dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: %s should be %s",
-                                               formats[i], formats[j], n_matrix[i][j], n_from[j]);
+                                               "dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: should be %s",
+                                               formats[i], formats[j], n_from[j]);
                                torture_fail(tctx, err_msg);
                        } else if (n_matrix[i][j] != NULL && n_from[j] == NULL) {
                                err_msg = talloc_asprintf(mem_ctx,
-                                               "dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: %s should be %s",
-                                               formats[i], formats[j], n_matrix[i][j], n_from[j]);
+                                               "dcerpc_drsuapi_DsCrackNames mismatch - from %d to %d: should be %s",
+                                               formats[i], formats[j], n_matrix[i][j]);
                                torture_fail(tctx, err_msg);
                        } else if (strcmp(n_matrix[i][j], n_from[j]) != 0) {
                                err_msg = talloc_asprintf(mem_ctx,