From: Bob Campbell <bobcampbell@catalyst.net.nz>
Date: Fri, 3 Jun 2016 01:56:23 +0000 (+1200)
Subject: samba_dnsupdate: do not interpret failure count as unix error code
X-Git-Tag: tdb-1.3.10~998
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5c008e0216d8fc92d9081781895fbc9c008ce5cc;p=thirdparty%2Fsamba.git

samba_dnsupdate: do not interpret failure count as unix error code

Signed-off-by: Bob Campbell <bobcampbell@catalyst.net.nz>
Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/lib/util/util_runcmd.c b/lib/util/util_runcmd.c
index cc194fc68e9..02de77ee864 100644
--- a/lib/util/util_runcmd.c
+++ b/lib/util/util_runcmd.c
@@ -304,8 +304,8 @@ static void samba_runcmd_io_handler(struct tevent_context *ev,
 				return;
 			}
 			status = WEXITSTATUS(status);
-			DEBUG(3,("Child %s exited with status %d - %s\n",
-				 state->arg0, status, strerror(status)));
+			DEBUG(3,("Child %s exited with status %d\n",
+				 state->arg0, status));
 			if (status != 0) {
 				tevent_req_error(req, status);
 				return;
diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index 292a8250923..0c0e4b4512e 100644
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -284,15 +284,10 @@ static void dnsupdate_nameupdate_done(struct tevent_req *subreq)
 
 	ret = samba_runcmd_recv(subreq, &sys_errno);
 	TALLOC_FREE(subreq);
-	if (ret != 0) {
-		service->nameupdate.status = map_nt_error_from_unix_common(sys_errno);
-	} else {
-		service->nameupdate.status = NT_STATUS_OK;
-	}
 
-	if (!NT_STATUS_IS_OK(service->nameupdate.status)) {
-		DEBUG(0,(__location__ ": Failed DNS update - %s\n",
-			 nt_errstr(service->nameupdate.status)));
+	if (ret != 0) {
+		DEBUG(0,(__location__ ": Failed DNS update - with error code %d\n",
+			 sys_errno));
 	} else {
 		DEBUG(3,("Completed DNS update check OK\n"));
 	}