From: Steve Dickson <steved@redhat.com>
Date: Tue, 18 Mar 2008 13:34:58 +0000 (-0400)
Subject: Make sure showmount fails when rpc.mountd is not registered
X-Git-Tag: nfs-utils-1-1-3~56
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=3899db6d602901523d6db6e2280c3bffd6c9ed63

Make sure showmount fails when rpc.mountd is not registered

Signed-off-by: Steve Dickson <steved@redhat.com>
---

diff --git a/utils/showmount/showmount.c b/utils/showmount/showmount.c
index 4e10a29..76bef19 100644
--- a/utils/showmount/showmount.c
+++ b/utils/showmount/showmount.c
@@ -240,6 +240,8 @@ static unsigned short getport(struct sockaddr_in *addr,
 		rpc_createerr.cf_stat = status;
 		clnt_destroy(client);
 		return 0;
+	} else if (port == 0) {
+		rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED;
 	}
 
 	clnt_destroy(client);
@@ -364,7 +366,7 @@ int main(int argc, char **argv)
 		server_addr.sin_port = getport(&server_addr,
 					 MOUNTPROG, MOUNTVERS, IPPROTO_UDP);
 		if (!server_addr.sin_port) {
-			clnt_pcreateerror("portmap getport");
+			clnt_pcreateerror("showmount");
 			exit(1);
 		}
 		msock = RPC_ANYSOCK;