mirror of
https://github.com/samba-team/samba.git
synced 2025-03-07 00:58:40 +03:00
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)
This commit is contained in:
parent
9fda18d770
commit
1f14d55f45
@ -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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user