From 1f14d55f45eee6deacc4091ffe4d5a9b57e28bef Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 8 May 2019 16:51:20 +0200 Subject: [PATCH] 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 Reviewed-by: Jeremy Allison (cherry picked from commit be72dfbc8edc53ed191dc01668a53cafb5cd785d) --- source4/torture/rpc/drsuapi_cracknames.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index c03f6bd1ca9..33917832069 100644 --- 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,