Blame SOURCES/autofs-5.0.8-get_nfs_info-should-query-portmapper-if-port-is-not-given.patch
|
 |
4d476f |
autofs-5.0.8 - get_nfs_info() should query portmapper if port is not given
|
|
|
4d476f |
|
|
|
4d476f |
From: Scott Mayhew <smayhew@redhat.com>
|
|
|
4d476f |
|
|
|
4d476f |
It shouldn't just assume it can use port 2049.
|
|
|
4d476f |
|
|
|
4d476f |
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
|
|
|
4d476f |
---
|
|
|
4d476f |
CHANGELOG | 1 +
|
|
|
4d476f |
modules/replicated.c | 9 ++++++---
|
|
|
4d476f |
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
4d476f |
|
|
|
4d476f |
--- autofs-5.0.7.orig/CHANGELOG
|
|
|
4d476f |
+++ autofs-5.0.7/CHANGELOG
|
|
|
4d476f |
@@ -67,6 +67,7 @@
|
|
|
4d476f |
- fix ipv6 libtirpc getport.
|
|
|
4d476f |
- improve timeout option description.
|
|
|
4d476f |
- fix fix ipv6 libtirpc getport.
|
|
|
4d476f |
+- get_nfs_info() should query portmapper if port is not given.
|
|
|
4d476f |
|
|
|
4d476f |
25/07/2012 autofs-5.0.7
|
|
|
4d476f |
=======================
|
|
|
4d476f |
--- autofs-5.0.7.orig/modules/replicated.c
|
|
|
4d476f |
+++ autofs-5.0.7/modules/replicated.c
|
|
|
4d476f |
@@ -444,9 +444,12 @@ static unsigned int get_nfs_info(unsigne
|
|
|
4d476f |
host->name, proto, version);
|
|
|
4d476f |
|
|
|
4d476f |
rpc_info->proto = proto;
|
|
|
4d476f |
- if (port < 0)
|
|
|
4d476f |
- rpc_info->port = NFS_PORT;
|
|
|
4d476f |
- else if (port > 0)
|
|
|
4d476f |
+ if (port < 0) {
|
|
|
4d476f |
+ if (version & NFS4_REQUESTED)
|
|
|
4d476f |
+ rpc_info->port = NFS_PORT;
|
|
|
4d476f |
+ else
|
|
|
4d476f |
+ port = 0;
|
|
|
4d476f |
+ } else if (port > 0)
|
|
|
4d476f |
rpc_info->port = port;
|
|
|
4d476f |
|
|
|
4d476f |
memset(&parms, 0, sizeof(struct pmap));
|