From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 19 Nov 2019 21:39:54 +0000 (+1300)
Subject: ndrdump: Return a different error code for ndr_pull() failures
X-Git-Tag: ldb-2.1.0~662
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c83ad13e5893889852cbd7d2208bf45c2b72b07c;p=thirdparty%2Fsamba.git

ndrdump: Return a different error code for ndr_pull() failures

This may assist in distinguishing between "runner" and "pull" failures.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/librpc/tools/ndrdump.c b/librpc/tools/ndrdump.c
index 4938111c729..7f46f78d625 100644
--- a/librpc/tools/ndrdump.c
+++ b/librpc/tools/ndrdump.c
@@ -492,7 +492,7 @@ static void ndr_print_dummy(struct ndr_print *ndr, const char *format, ...)
 			printf("pull for context file returned %s\n",
 			       ndr_map_error2string(ndr_err));
 			TALLOC_FREE(mem_ctx);
-			exit(1);
+			exit(2);
 		}
 		memcpy(v_st, st, f->struct_size);
 	}
@@ -584,9 +584,9 @@ static void ndr_print_dummy(struct ndr_print *ndr, const char *format, ...)
 						      ndr_print,
 						      &f->out_pipes);
 		if (!NT_STATUS_IS_OK(status)) {
-			printf("dump FAILED\n");
+			printf("pull and dump of pipes FAILED\n");
 			TALLOC_FREE(mem_ctx);
-			exit(1);
+			exit(2);
 		}
 	}
 
@@ -597,7 +597,7 @@ static void ndr_print_dummy(struct ndr_print *ndr, const char *format, ...)
 	if (stop_on_parse_failure && !NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
 		printf("not printing because --stop-on-parse-failure\n");
 		TALLOC_FREE(mem_ctx);
-		exit(1);
+		exit(2);
 	}
 
 	if (ndr_pull->offset > ndr_pull->relative_highest_offset) {