From: neilbrown <neilbrown>
Date: Mon, 28 Feb 2005 03:19:40 +0000 (+0000)
Subject: Make statd_get_socket actually honour the 'port' parameter.
X-Git-Tag: nfs-utils-1-0-7-post1~20
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f50dd6fa181def466c455a9d019a3aacb1b33267;p=nfs-utils.git

Make statd_get_socket actually honour the 'port' parameter.
---

diff --git a/ChangeLog b/ChangeLog
index 331364a..271b2ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-28  Trond Myklebust <trond.myklebust@fys.uio.no>
+	* utils/statd/rmtcall.c(statd_get_socket): If a port number is
+	explicitly given, make sure to try to bind to that.
+	
 2005-01-11  Chip Salzenberg  <chip@pobox.com>
 
 	* debian/changelog: Version 1.0.7-1.
diff --git a/utils/statd/rmtcall.c b/utils/statd/rmtcall.c
index f6798f9..474bbb4 100644
--- a/utils/statd/rmtcall.c
+++ b/utils/statd/rmtcall.c
@@ -65,7 +65,7 @@ statd_get_socket(int port)
 
 	memset(&sin, 0, sizeof(sin));
 	sin.sin_family = AF_INET;
-	sin.sin_port = port;
+	sin.sin_addr.s_addr = INADDR_ANY;
 	/*
 	 * If a local hostname is given (-n option to statd), bind to the address
 	 * specified. This is required to support clients that ignore the mon_name in
@@ -76,11 +76,18 @@ statd_get_socket(int port)
 		if (hp)
 			sin.sin_addr = *(struct in_addr *) hp->h_addr;
 	}
+	if (port != 0) {
+		sin.sin_port = htons(port);
+		if (bind(sockfd, &sin, sizeof(sin)) == 0)
+			goto out_success;
+		note(N_CRIT, "statd: failed to bind to outgoing port, %d\n"
+				"       falling back on randomly chosen port\n", port);
+	}
 	if (bindresvport(sockfd, &sin) < 0) {
 		dprintf(N_WARNING,
 			"process_hosts: can't bind to reserved port\n");
 	}
-
+out_success:
 	return sockfd;
 }