From: Joseph Sutton Date: Thu, 13 Jul 2023 02:37:27 +0000 (+1200) Subject: librpc:ndr: Fix error messages X-Git-Tag: talloc-2.4.2~692 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b11978a06cf6204b954ccd23b9818dbb93ddadca;p=thirdparty%2Fsamba.git librpc:ndr: Fix error messages Signed-off-by: Joseph Sutton Reviewed-by: Andrew Bartlett --- diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c index 57a49e34c17..c340e4d2459 100644 --- a/librpc/ndr/ndr_string.c +++ b/librpc/ndr/ndr_string.c @@ -165,7 +165,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, ndr_flags_type converted_size = 0; if (!as) { return ndr_pull_error(ndr, NDR_ERR_ALLOC, - "Failed to talloc_strndup() in zero-length ndr_string_pull()"); + "Failed to talloc_strndup() in zero-length ndr_pull_string()"); } } else { if (!do_convert) { @@ -174,7 +174,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, ndr_flags_type conv_src_len); if (!as) { return ndr_pull_error(ndr, NDR_ERR_ALLOC, - "Failed to talloc_strndup() in RAW8 ndr_string_pull()"); + "Failed to talloc_strndup() in RAW8 ndr_pull_string()"); } converted_size = MIN(strlen(as)+1, conv_src_len); } else if (!convert_string_talloc(ndr->current_mem_ctx, chset, @@ -205,7 +205,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, ndr_flags_type "converted string " "(and therefore source string) " "despite " - "LIBNDR_FLAG_NO_EMBEDDED_NUL\n", + "LIBNDR_FLAG_STR_NO_EMBEDDED_NUL\n", strlen_of_unix_string); } } @@ -222,7 +222,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, ndr_flags_type "converted string " "(and therefore source string) " "despite " - "LIBNDR_FLAG_NO_EMBEDDED_NUL\n", + "LIBNDR_FLAG_STR_NO_EMBEDDED_NUL\n", strlen_of_unix_string); } }