+++ /dev/null
---- util-linux-2.11e/mount/nfsmount.c.orig Tue Jun 5 00:20:57 2001
-+++ util-linux-2.11e/mount/nfsmount.c Sun Jun 10 22:07:09 2001
-@@ -135,6 +135,8 @@
- server_addr->sin_port = PMAPPORT;
- pmap = pmap_getmaps(server_addr);
-
-+ if (!pmap)
-+ return NULL;
- if (version > MAX_NFSPROT)
- version = MAX_NFSPROT;
- if (!prog)
-@@ -163,8 +165,6 @@
- }
- if (!p.pm_vers)
- p.pm_vers = MOUNTVERS;
-- if (!p.pm_port)
-- p.pm_port = MOUNTPORT;
- if (!p.pm_prot)
- p.pm_prot = IPPROTO_TCP;
- return &p;
-@@ -563,6 +563,11 @@
- mountport,
- nfs_mount_version);
-
-+ if (pm_mnt == NULL) {
-+ fprintf(stderr, _("mount: cannot access portmapper on %s: %s\n"),
-+ hostname, strerror (errno));
-+ goto fail;
-+ }
- /* contact the mount daemon via TCP */
- mount_server_addr.sin_port = htons(pm_mnt->pm_port);
- msock = RPC_ANYSOCK;
-diff -urN util-linux-2.11b.org/mount/nfsmount.x util-linux-2.11b/mount/nfsmount.x
---- util-linux-2.11b.org/mount/nfsmount.x Wed Mar 21 10:16:36 2001
-+++ util-linux-2.11b/mount/nfsmount.x Wed Mar 21 10:17:01 2001
-@@ -48,7 +48,6 @@
- #endif
- %#include <asm/types.h>
-
--const MOUNTPORT = 635;
- const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */
- const MNTNAMLEN = 255; /* maximum bytes in a name argument */
- const FHSIZE = 32; /* size in bytes of a file handle */
-diff -urN util-linux-2.11b.org/mount/rpcsvc/nfsmount.h util-linux-2.11b/mount/rpcsvc/nfsmount.h
---- util-linux-2.11b.org/mount/rpcsvc/nfsmount.h Wed Mar 21 10:16:36 2001
-+++ util-linux-2.11b/mount/rpcsvc/nfsmount.h Wed Mar 21 10:17:01 2001
-@@ -50,7 +50,6 @@
- #ifndef _rpcsvc_mount_h
- #define _rpcsvc_mount_h
- #include <asm/types.h>
--#define MOUNTPORT 635
- #define MNTPATHLEN 1024
- #define MNTNAMLEN 255
- #define FHSIZE 32
-diff -urN util-linux-2.11b.org/mount/rpcsvc/nfsmount.x util-linux-2.11b/mount/rpcsvc/nfsmount.x
---- util-linux-2.11b.org/mount/rpcsvc/nfsmount.x Wed Mar 21 10:16:36 2001
-+++ util-linux-2.11b/mount/rpcsvc/nfsmount.x Wed Mar 21 10:17:01 2001
-@@ -48,7 +48,6 @@
- #endif
- %#include <asm/types.h>
-
--const MOUNTPORT = 635;
- const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */
- const MNTNAMLEN = 255; /* maximum bytes in a name argument */
- const FHSIZE = 32; /* size in bytes of a file handle */