X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=64a2b75fd68cc949f2e98cc6fb4904b91e497309;hp=2dc0aec7ec84249460115c0997c9ab82f3d2db11;hb=a4b10d48a730fbc6ff62197facddccdf7e204610;hpb=28e4224b9bbfc355c83e17df74c47221afacd560 diff --git a/utils/mount/mount.c b/utils/mount/mount.c index 2dc0aec..64a2b75 100644 --- a/utils/mount/mount.c +++ b/utils/mount/mount.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -41,8 +42,10 @@ #include "nfsumount.h" #include "mount.h" #include "error.h" +#include "network.h" char *progname; +int nfs_mount_data_version; int nomtab; int verbose; int sloppy; @@ -61,19 +64,16 @@ static struct option longopts[] = { { NULL, 0, 0, 0 } }; -/* Map from -o and fstab option strings to the flag argument to mount(2). */ +/* + * Map from -o and fstab option strings to the flag argument to mount(2). + */ struct opt_map { - const char *opt; /* option name */ - int skip; /* skip in mtab option string */ - int inv; /* true if flag value should be inverted */ - int mask; /* flag mask value */ + const char *opt; /* option name */ + int skip; /* skip in mtab option string */ + int inv; /* true if flag value should be inverted */ + int mask; /* flag mask value */ }; -/* Custom mount options for our own purposes. */ -#define MS_DUMMY 0x00000000 -#define MS_USERS 0x40000000 -#define MS_USER 0x80000000 - static const struct opt_map opt_map[] = { { "defaults", 0, 0, 0 }, /* default options */ { "ro", 1, 0, MS_RDONLY }, /* read-only */ @@ -128,8 +128,68 @@ static const struct opt_map opt_map[] = { { NULL, 0, 0, 0 } }; -/* Try to build a canonical options string. */ -static char * fix_opts_string (int flags, const char *extra_opts) { +#define MAKE_VERSION(p,q,r) (65536 * (p) + 256 * (q) + (r)) + +int linux_version_code(void) +{ + struct utsname my_utsname; + int p, q, r; + + if (uname(&my_utsname) == 0) { + p = atoi(strtok(my_utsname.release, ".")); + q = atoi(strtok(NULL, ".")); + r = atoi(strtok(NULL, ".")); + return MAKE_VERSION(p,q,r); + } + return 0; +} + +/* + * Choose the version of the nfs_mount_data structure that is appropriate + * for the kernel that is doing the mount. + * + * NFS_MOUNT_VERSION: maximum version supported by these sources + * nfs_mount_data_version: maximum version supported by the running kernel + */ +static void discover_nfs_mount_data_version(void) +{ + int kernel_version = linux_version_code(); + + if (kernel_version) { + if (kernel_version < MAKE_VERSION(2, 1, 32)) + nfs_mount_data_version = 1; + else if (kernel_version < MAKE_VERSION(2, 2, 18)) + nfs_mount_data_version = 3; + else if (kernel_version < MAKE_VERSION(2, 3, 0)) + nfs_mount_data_version = 4; + else if (kernel_version < MAKE_VERSION(2, 3, 99)) + nfs_mount_data_version = 3; + else if (kernel_version < MAKE_VERSION(2, 6, 3)) + nfs_mount_data_version = 4; + else + nfs_mount_data_version = 6; + } + if (nfs_mount_data_version > NFS_MOUNT_VERSION) + nfs_mount_data_version = NFS_MOUNT_VERSION; +} + +static void print_one(char *spec, char *node, char *type, char *opts) +{ + if (verbose) { + printf("%s on %s type %s", spec, node, type); + + if (opts != NULL) + printf(" (%s)", opts); + + printf("\n"); + } +} + +/* + * Build a canonical mount option string for /etc/mtab. + */ +static char *fix_opts_string(int flags, const char *extra_opts) +{ const struct opt_map *om; char *new_opts; @@ -207,12 +267,7 @@ fail_unlock: return result; } -int do_mount_syscall(char *spec, char *node, char *type, int flags, void *data) -{ - return mount(spec, node, type, flags, data); -} - -void mount_usage() +void mount_usage(void) { printf("usage: %s remotetarget dir [-rvVwfnh] [-o nfsoptions]\n", progname); @@ -228,8 +283,8 @@ void mount_usage() printf("\tnfsoptions\tRefer to mount.nfs(8) or nfs(5)\n\n"); } -static inline void -parse_opt(const char *opt, int *mask, char *extra_opts, int len) { +static void parse_opt(const char *opt, int *mask, char *extra_opts, int len) +{ const struct opt_map *om; for (om = opt_map; om->opt != NULL; om++) { @@ -251,30 +306,35 @@ parse_opt(const char *opt, int *mask, char *extra_opts, int len) { strcat(extra_opts, opt); } -/* Take -o options list and compute 4th and 5th args to mount(2). flags - gets the standard options (indicated by bits) and extra_opts all the rest */ -static void parse_opts (const char *options, int *flags, char **extra_opts) +/* + * Convert the provided mount command-line options into the 4th & + * 5th arguments to mount(2). Output parameter "@flags" gets the + * standard options (indicated by MS_ bits), and output parameter + * "@extra_opts" gets all the filesystem-specific options. + */ +static void parse_opts(const char *options, int *flags, char **extra_opts) { if (options != NULL) { char *opts = xstrdup(options); char *opt, *p; - int len = strlen(opts) + 1; /* include room for a null */ + int len = strlen(opts) + 1; /* include room for a null */ int open_quote = 0; *extra_opts = xmalloc(len); **extra_opts = '\0'; - for (p=opts, opt=NULL; p && *p; p++) { + for (p = opts, opt = NULL; p && *p; p++) { if (!opt) - opt = p; /* begin of the option item */ + opt = p; /* begin of the option item */ if (*p == '"') - open_quote ^= 1; /* reverse the status */ + open_quote ^= 1; /* reverse the status */ if (open_quote) - continue; /* still in a quoted block */ + continue; /* still in a quoted block */ if (*p == ',') - *p = '\0'; /* terminate the option item */ + *p = '\0'; /* terminate the option item */ + /* end of option item or last item */ - if (*p == '\0' || *(p+1) == '\0') { + if (*p == '\0' || *(p + 1) == '\0') { parse_opt(opt, flags, *extra_opts, len); opt = NULL; } @@ -303,56 +363,6 @@ static int chk_mountpoint(char *mount_point) return 0; } -extern u_short getport( - struct sockaddr_in *saddr, - u_long prog, - u_long vers, - u_int prot); - -static int probe_statd() -{ - struct sockaddr_in addr; - u_short port; - - memset(&addr, 0, sizeof(addr)); - addr.sin_family = AF_INET; - addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - port = getport(&addr, 100024, 1, IPPROTO_UDP); - - if (port == 0) - return 0; - addr.sin_port = htons(port); - - if (clnt_ping(&addr, 100024, 1, IPPROTO_UDP, NULL) <= 0) - return 0; - - return 1; -} - -static int start_statd() -{ - /* If /var/run/rpc.statd.pid exists and is non-empty, - * assume statd already running. - * If START_STATD not defined, or defined to a non-existent file, - * don't bother, - * else run that file (typically a shell script) - */ - struct stat stb; - - if (probe_statd()) - return 1; -#ifdef START_STATD - if (stat(START_STATD, &stb) ==0 && - S_ISREG(stb.st_mode) && - (stb.st_mode & S_IXUSR)) { - system(START_STATD); - if (probe_statd()) - return 1; - } -#endif - return 0; -} - int main(int argc, char *argv[]) { int c, flags = 0, mnt_err = 1, fake = 0; @@ -362,25 +372,22 @@ int main(int argc, char *argv[]) progname = basename(argv[0]); - if(!strncmp(progname, "umount", strlen("umount"))) { - if(argc < 2) { - umount_usage(); - exit(1); - } + discover_nfs_mount_data_version(); + + if(!strncmp(progname, "umount", strlen("umount"))) exit(nfsumount(argc, argv)); - } - if(argv[1] && argv[1][0] == '-') { + if (argv[1] && argv[1][0] == '-') { if(argv[1][1] == 'V') printf("%s ("PACKAGE_STRING")\n", progname); else mount_usage(); - return 0; + exit(0); } if ((argc < 3)) { mount_usage(); - exit(1); + exit(EX_USAGE); } spec = argv[1]; @@ -420,13 +427,16 @@ int main(int argc, char *argv[]) case 'h': default: mount_usage(); - exit(1); + exit(EX_USAGE); } } - if (optind != argc-2) { - /* Extra non-option words at the end... */ + + /* + * Extra non-option words at the end are bogus... + */ + if (optind != argc - 2) { mount_usage(); - exit(1); + exit(EX_USAGE); } if (strcmp(progname, "mount.nfs4") == 0) @@ -443,9 +453,9 @@ int main(int argc, char *argv[]) if ((mc = getfsfile(mount_point)) == NULL || strcmp(mc->m.mnt_fsname, spec) != 0 || strcmp(mc->m.mnt_type, fs_type) != 0) { - fprintf(stderr, "%s: permission denied: no match for %s " - "found in /etc/fstab\n", progname, mount_point); - exit(1); + nfs_error(_("%s: permission denied: no match for %s " + "found in /etc/fstab"), progname, mount_point); + exit(EX_USAGE); } /* @@ -458,63 +468,48 @@ int main(int argc, char *argv[]) } mount_point = canonicalize(mount_point); - if (mount_point == NULL || - mount_point[0] != '/') { - fprintf(stderr, "%s: unknown mount point %s\n", - progname, mount_point ? : ""); - exit(1); + if (!mount_point) { + nfs_error(_("%s: no mount point provided"), progname); + exit(EX_USAGE); } - + if (mount_point[0] != '/') { + nfs_error(_("%s: unrecognized mount point %s"), + progname, mount_point); + mnt_err = EX_USAGE; + goto out; + } + parse_opts(mount_opts, &flags, &extra_opts); if (uid != 0) { - if (! (flags & (MS_USERS | MS_USER))) { - fprintf(stderr, "%s: permission denied\n", progname); - exit(1); - } + if (!(flags & (MS_USERS|MS_USER))) { + nfs_error(_("%s: permission denied"), progname); + mnt_err = EX_USAGE; + goto out; + } } - if (chk_mountpoint(mount_point)) - exit(EX_FAIL); + if (chk_mountpoint(mount_point)) { + mnt_err = EX_USAGE; + goto out; + } if (strcmp(fs_type, "nfs4") == 0) - mnt_err = nfs4mount(spec, mount_point, &flags, &extra_opts, &mount_opts, 0); - else { - int need_statd = 0; - mnt_err = nfsmount(spec, mount_point, &flags, - &extra_opts, &mount_opts, - 0, &need_statd); - if (!mnt_err && !fake && need_statd) { - if (!start_statd()) { - fprintf(stderr, - "%s: rpc.statd is not running but is " - "required for remote locking\n" - " Either use \"-o nolocks\" to keep " - "locks local, or start statd.\n", - progname); - exit(1); - } - } - } + mnt_err = nfs4mount(spec, mount_point, flags, &extra_opts, fake); + else + mnt_err = nfsmount(spec, mount_point, flags, &extra_opts, fake); if (mnt_err) exit(EX_FAIL); - if (!fake) { - mnt_err = do_mount_syscall(spec, mount_point, fs_type, - flags & ~(MS_USER|MS_USERS) , - mount_opts); - - if (mnt_err) { - mount_error(spec, mount_point, errno); - exit(EX_FAIL); - } - } + if (!fake) + print_one(spec, mount_point, fs_type, mount_opts); if (!nomtab) mnt_err = add_mtab(spec, mount_point, fs_type, flags, extra_opts, 0, 0 /* these are always zero for NFS */ ); +out: + free(mount_point); exit(mnt_err); } -