Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Nov 2018 18:10:56 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340686 - head/sbin/dumpon
Message-ID:  <201811201810.wAKIAuc3033568@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: markj
Date: Tue Nov 20 18:10:56 2018
New Revision: 340686
URL: https://svnweb.freebsd.org/changeset/base/340686

Log:
  Avoid clobbering a user-specified -g value after r340547.
  
  CID:		1396919
  MFC with:	r340547

Modified:
  head/sbin/dumpon/dumpon.c

Modified: head/sbin/dumpon/dumpon.c
==============================================================================
--- head/sbin/dumpon/dumpon.c	Tue Nov 20 17:43:24 2018	(r340685)
+++ head/sbin/dumpon/dumpon.c	Tue Nov 20 18:10:56 2018	(r340686)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811201810.wAKIAuc3033568>