|
 |
7cb13c8 |
--- nfs-utils-1.0.10/utils/mount/nfsmount.c.orig 2006-11-14 19:47:45.000000000 -0500
|
|
|
7cb13c8 |
+++ nfs-utils-1.0.10/utils/mount/nfsmount.c 2006-11-14 20:18:01.000000000 -0500
|
|
|
7cb13c8 |
@@ -822,8 +822,7 @@ nfsmnt_check_compat(const struct pmap *n
|
|
|
7cb13c8 |
|
|
|
7cb13c8 |
int
|
|
|
7cb13c8 |
nfsmount(const char *spec, const char *node, int *flags,
|
|
|
7cb13c8 |
- char **extra_opts, char **mount_opts, int *nfs_mount_vers,
|
|
|
7cb13c8 |
- int running_bg)
|
|
|
7cb13c8 |
+ char **extra_opts, char **mount_opts, int running_bg)
|
|
|
7cb13c8 |
{
|
|
|
7cb13c8 |
static char *prev_bg_host;
|
|
|
7cb13c8 |
char hostdir[1024];
|
|
|
7cb13c8 |
@@ -854,9 +853,7 @@ nfsmount(const char *spec, const char *n
|
|
|
7cb13c8 |
|
|
|
7cb13c8 |
/* The version to try is either specified or 0
|
|
|
7cb13c8 |
In case it is 0 we tell the caller what we tried */
|
|
|
7cb13c8 |
- if (!*nfs_mount_vers)
|
|
|
7cb13c8 |
- *nfs_mount_vers = find_kernel_nfs_mount_version();
|
|
|
7cb13c8 |
- nfs_mount_version = *nfs_mount_vers;
|
|
|
7cb13c8 |
+ nfs_mount_version = find_kernel_nfs_mount_version();
|
|
|
7cb13c8 |
|
|
|
7cb13c8 |
retval = EX_FAIL;
|
|
|
7cb13c8 |
fsock = -1;
|
|
|
7cb13c8 |
--- nfs-utils-1.0.10/utils/mount/mount.c.orig 2006-11-14 19:47:45.000000000 -0500
|
|
|
7cb13c8 |
+++ nfs-utils-1.0.10/utils/mount/mount.c 2006-11-14 20:10:18.000000000 -0500
|
|
|
7cb13c8 |
@@ -491,7 +491,7 @@ int main(int argc, char *argv[])
|
|
|
7cb13c8 |
else {
|
|
|
7cb13c8 |
if (!strcmp(progname, "mount.nfs")) {
|
|
|
7cb13c8 |
mnt_err = nfsmount(spec, mount_point, &flags,
|
|
|
7cb13c8 |
- &extra_opts, &mount_opts, &nfs_mount_vers, 0);
|
|
|
7cb13c8 |
+ &extra_opts, &mount_opts, 0);
|
|
|
7cb13c8 |
}
|
|
|
7cb13c8 |
}
|
|
|
7cb13c8 |
if (fake)
|
|
|
7cb13c8 |
--- nfs-utils-1.0.10/utils/mount/nfs_mount.h.orig 2006-11-14 19:47:45.000000000 -0500
|
|
|
7cb13c8 |
+++ nfs-utils-1.0.10/utils/mount/nfs_mount.h 2006-11-14 20:09:01.000000000 -0500
|
|
|
7cb13c8 |
@@ -79,7 +79,7 @@ struct nfs_mount_data {
|
|
|
7cb13c8 |
#define AUTH_GSS_SPKMP 390011
|
|
|
7cb13c8 |
#endif
|
|
|
7cb13c8 |
|
|
|
7cb13c8 |
-int nfsmount(const char *, const char *, int *, char **, char **, int *, int);
|
|
|
7cb13c8 |
+int nfsmount(const char *, const char *, int *, char **, char **, int);
|
|
|
7cb13c8 |
void mount_errors(char *, int, int);
|
|
|
7cb13c8 |
int contains(const char *, const char *);
|
|
|
7cb13c8 |
char *get_value(const char *, const char *);
|