From b918e603515bfce20ce5f2ff56fc87295b6459bf Mon Sep 17 00:00:00 2001 From: Kevin Lo Date: Sat, 18 Aug 2012 16:14:50 +0000 Subject: [PATCH] Cleanup use of 'host' when running 'rpcinfo -p'. Obtained from: NetBSD --- usr.bin/rpcinfo/rpcinfo.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c index ed21cd7b4057..884f80dc52d9 100644 --- a/usr.bin/rpcinfo/rpcinfo.c +++ b/usr.bin/rpcinfo/rpcinfo.c @@ -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");