From owner-svn-src-head@FreeBSD.ORG  Sat Aug 18 16:14:50 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4FC4106566C;
	Sat, 18 Aug 2012 16:14:50 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C125A8FC14;
	Sat, 18 Aug 2012 16:14:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7IGEoPn049369;
	Sat, 18 Aug 2012 16:14:50 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7IGEoDi049367;
	Sat, 18 Aug 2012 16:14:50 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201208181614.q7IGEoDi049367@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Sat, 18 Aug 2012 16:14:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239373 - head/usr.bin/rpcinfo
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2012 16:14:50 -0000

Author: kevlo
Date: Sat Aug 18 16:14:50 2012
New Revision: 239373
URL: http://svn.freebsd.org/changeset/base/239373

Log:
  Cleanup use of 'host' when running 'rpcinfo -p'.
  
  Obtained from:	NetBSD

Modified:
  head/usr.bin/rpcinfo/rpcinfo.c

Modified: head/usr.bin/rpcinfo/rpcinfo.c
==============================================================================
--- head/usr.bin/rpcinfo/rpcinfo.c	Sat Aug 18 16:13:16 2012	(r239372)
+++ head/usr.bin/rpcinfo/rpcinfo.c	Sat Aug 18 16:14:50 2012	(r239373)
@@ -476,7 +476,7 @@ pmapdump(int argc, char **argv)
 	struct rpcent *rpc;
 	enum clnt_stat clnt_st;
 	struct rpc_err err;
-	char *host;
+	char *host = NULL;
 
 	if (argc > 1)
 		usage();
@@ -513,10 +513,16 @@ pmapdump(int argc, char **argv)
 		if ((clnt_st == RPC_PROGVERSMISMATCH) ||
 		    (clnt_st == RPC_PROGUNAVAIL)) {
 			CLNT_GETERR(client, &err);
-			if (err.re_vers.low > PMAPVERS)
-				warnx(
-		"%s does not support portmapper.  Try rpcinfo %s instead",
-					host, host);
+			if (err.re_vers.low > PMAPVERS) {
+				if (host)
+					warnx("%s does not support portmapper."
+					    "Try rpcinfo %s instead", host,
+					    host);
+				else
+					warnx("local host does not support "
+					    "portmapper.  Try 'rpcinfo' "
+					    "instead");
+			}
 			exit(1);
 		}
 		clnt_perror(client, "rpcinfo: can't contact portmapper");