From 79dd8f690a418f9b25cfedbbb075640347e8fbd7 Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 20 Nov 2018 18:10:56 +0000
Subject: [PATCH] Avoid clobbering a user-specified -g value after r340547.

CID:		1396919
MFC with:	r340547
---
 sbin/dumpon/dumpon.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sbin/dumpon/dumpon.c b/sbin/dumpon/dumpon.c
index bafeae171d0e..c9805c47d14c 100644
--- a/sbin/dumpon/dumpon.c
+++ b/sbin/dumpon/dumpon.c
@@ -475,12 +475,15 @@ main(int argc, char *argv[])
 		if (inet_aton(client, &ndconf.ndc_client) == 0)
 			errx(EX_USAGE, "invalid client address '%s'", client);
 
-		gateway = find_gateway(argv[0]);
 		if (gateway == NULL) {
-			if (verbose)
-				printf("failed to look up gateway for %s\n",
-				    server);
-			gateway = server;
+			gateway = find_gateway(argv[0]);
+			if (gateway == NULL) {
+				if (verbose)
+					printf(
+				    "failed to look up gateway for %s\n",
+					    server);
+				gateway = server;
+			}
 		}
 		if (inet_aton(gateway, &ndconf.ndc_gateway) == 0)
 			errx(EX_USAGE, "invalid gateway address '%s'", gateway);