projects / packages / util-linux.git / blame
| Commit | Line | Data |
|---|---|---|
| 619d7652 | 1 | --- util-linux-2.11e/mount/nfsmount.c.orig Tue Jun 5 00:20:57 2001 |
| 2 | +++ util-linux-2.11e/mount/nfsmount.c Sun Jun 10 22:07:09 2001 | |
| 3 | @@ -135,6 +135,8 @@ | |
| 10d247d4 AM |
4 | server_addr->sin_port = PMAPPORT; |
| 5 | pmap = pmap_getmaps(server_addr); | |
| 6 | ||
| 7 | + if (!pmap) | |
| 8 | + return NULL; | |
| 9 | if (version > MAX_NFSPROT) | |
| 10 | version = MAX_NFSPROT; | |
| 11 | if (!prog) | |
| 619d7652 | 12 | @@ -163,8 +165,6 @@ |
| 10d247d4 AM |
13 | } |
| 14 | if (!p.pm_vers) | |
| 15 | p.pm_vers = MOUNTVERS; | |
| 16 | - if (!p.pm_port) | |
| 17 | - p.pm_port = MOUNTPORT; | |
| 18 | if (!p.pm_prot) | |
| 19 | p.pm_prot = IPPROTO_TCP; | |
| 20 | return &p; | |
| 619d7652 | 21 | @@ -563,6 +563,11 @@ |
| 22 | mountport, | |
| 23 | nfs_mount_version); | |
| 24 | ||
| 10d247d4 AM |
25 | + if (pm_mnt == NULL) { |
| 26 | + fprintf(stderr, _("mount: cannot access portmapper on %s: %s\n"), | |
| 27 | + hostname, strerror (errno)); | |
| 28 | + goto fail; | |
| 29 | + } | |
| 10d247d4 AM |
30 | /* contact the mount daemon via TCP */ |
| 31 | mount_server_addr.sin_port = htons(pm_mnt->pm_port); | |
| 619d7652 | 32 | msock = RPC_ANYSOCK; |
| 10d247d4 AM |
33 | diff -urN util-linux-2.11b.org/mount/nfsmount.x util-linux-2.11b/mount/nfsmount.x |
| 34 | --- util-linux-2.11b.org/mount/nfsmount.x Wed Mar 21 10:16:36 2001 | |
| 35 | +++ util-linux-2.11b/mount/nfsmount.x Wed Mar 21 10:17:01 2001 | |
| 36 | @@ -48,7 +48,6 @@ | |
| 37 | #endif | |
| 38 | %#include <asm/types.h> | |
| 39 | ||
| 40 | -const MOUNTPORT = 635; | |
| 41 | const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ | |
| 42 | const MNTNAMLEN = 255; /* maximum bytes in a name argument */ | |
| 43 | const FHSIZE = 32; /* size in bytes of a file handle */ | |
| 44 | diff -urN util-linux-2.11b.org/mount/rpcsvc/nfsmount.h util-linux-2.11b/mount/rpcsvc/nfsmount.h | |
| 45 | --- util-linux-2.11b.org/mount/rpcsvc/nfsmount.h Wed Mar 21 10:16:36 2001 | |
| 46 | +++ util-linux-2.11b/mount/rpcsvc/nfsmount.h Wed Mar 21 10:17:01 2001 | |
| 47 | @@ -50,7 +50,6 @@ | |
| 48 | #ifndef _rpcsvc_mount_h | |
| 49 | #define _rpcsvc_mount_h | |
| 50 | #include <asm/types.h> | |
| 51 | -#define MOUNTPORT 635 | |
| 52 | #define MNTPATHLEN 1024 | |
| 53 | #define MNTNAMLEN 255 | |
| 54 | #define FHSIZE 32 | |
| 55 | diff -urN util-linux-2.11b.org/mount/rpcsvc/nfsmount.x util-linux-2.11b/mount/rpcsvc/nfsmount.x | |
| 56 | --- util-linux-2.11b.org/mount/rpcsvc/nfsmount.x Wed Mar 21 10:16:36 2001 | |
| 57 | +++ util-linux-2.11b/mount/rpcsvc/nfsmount.x Wed Mar 21 10:17:01 2001 | |
| 58 | @@ -48,7 +48,6 @@ | |
| 59 | #endif | |
| 60 | %#include <asm/types.h> | |
| 61 | ||
| 62 | -const MOUNTPORT = 635; | |
| 63 | const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ | |
| 64 | const MNTNAMLEN = 255; /* maximum bytes in a name argument */ | |
| 65 | const FHSIZE = 32; /* size in bytes of a file handle */ |