From: Chuck Lever Date: Fri, 3 Aug 2007 17:23:54 +0000 (-0400) Subject: mount.nfs: Always close the socket at the end of getport() X-Git-Tag: nfs-utils-1-1-1~96 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ac3611f10500d2942d0295c65b3d7b47621609d4;p=nfs-utils.git mount.nfs: Always close the socket at the end of getport() These days, none of get_socket()'s callers pass an RPC_ANYSOCK on to the RPC code. Signed-off-by: Chuck Lever Signed-off-by: Neil Brown --- diff --git a/utils/mount/network.c b/utils/mount/network.c index 89cb976..132ff1e 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -210,9 +210,9 @@ out: } /* - * Create a socket that is locally bound to a reserved or non-reserved - * port. For any failures, RPC_ANYSOCK is returned which will cause - * the RPC code to create the socket instead. + * Create a socket that is locally bound to a reserved or non-reserved port. + * + * The caller should check rpc_createerr to determine the cause of any error. */ static int get_socket(struct sockaddr_in *saddr, unsigned int p_prot, unsigned int timeout, int resvp, int conn) @@ -360,8 +360,7 @@ static unsigned short getport(struct sockaddr_in *saddr, else if (port == 0) rpc_createerr.cf_stat = RPC_PROGNOTREGISTERED; } - if (socket != 1) - close(socket); + close(socket); return port; }