From: Matthieu Patou <mat@matws.net>
Date: Sun, 4 Mar 2012 05:20:59 +0000 (-0800)
Subject: s3: don't replace the error message if already defined
X-Git-Tag: tdb-1.2.10~428
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=679bbd014e03f60cddbcabfe0c6b5b8bae9fea4c;p=thirdparty%2Fsamba.git

s3: don't replace the error message if already defined

Autobuild-User: Matthieu Patou <mat@samba.org>
Autobuild-Date: Sun Mar  4 10:13:24 CET 2012 on sn-devel-104
---

diff --git a/source3/libnet/libnet_dssync.c b/source3/libnet/libnet_dssync.c
index c768226e8ba..a8431066efa 100644
--- a/source3/libnet/libnet_dssync.c
+++ b/source3/libnet/libnet_dssync.c
@@ -652,9 +652,11 @@ static NTSTATUS libnet_dssync_process(TALLOC_CTX *mem_ctx,
 		status = libnet_dssync_getncchanges(mem_ctx, ctx, level, &req,
 						    &pnew_utdv);
 		if (!NT_STATUS_IS_OK(status)) {
-			ctx->error_message = talloc_asprintf(ctx,
-				"Failed to call DsGetNCCHanges: %s",
-				nt_errstr(status));
+			if (!ctx->error_message) {
+				ctx->error_message = talloc_asprintf(ctx,
+					"Failed to call DsGetNCCHanges: %s",
+					nt_errstr(status));
+			}
 			goto out;
 		}
 	}