From c62b045a3434fa70b1d599b64a749c06f10808b3 Mon Sep 17 00:00:00 2001 From: mux Date: Mon, 22 Apr 2002 23:03:03 +0000 Subject: Do our best to determine if the user is attempting an NFS mount when the filesystem type isn't given in the command line. In the case of an IPv6 address containing ':', one must use the '@' separator for it to be properly parsed (mount_nfs(8) still needs fixing at the moment though). PR: bin/37230 Reviewed by: obrien MFC after: 1 week --- sbin/mount/mount.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'sbin/mount') diff --git a/sbin/mount/mount.c b/sbin/mount/mount.c index 3494d9c..b3ffc3a 100644 --- a/sbin/mount/mount.c +++ b/sbin/mount/mount.c @@ -50,6 +50,7 @@ static const char rcsid[] = #include #include +#include #include #include #include @@ -131,7 +132,7 @@ main(argc, argv) FILE *mountdfp; pid_t pid; int all, ch, i, init_flags, mntsize, rval, have_fstab; - char *options; + char *cp, *ep, *options; all = init_flags = 0; options = NULL; @@ -278,13 +279,25 @@ main(argc, argv) case 2: /* * If -t flag has not been specified, the path cannot be - * found, spec contains either a ':' or a '@', and the - * spec is not a file with those characters, then assume + * found, spec contains either a ':' or a '@', then assume * that an NFS filesystem is being specified ala Sun. + * Check if the hostname contains only allowed characters + * to reduce false positives. IPv6 addresses containing + * ':' will be correctly parsed only if the separator is '@'. + * The definition of a valid hostname is taken from RFC 1034. */ - if (vfslist == NULL && strpbrk(argv[0], ":@") != NULL && - access(argv[0], 0) == -1) - vfstype = "nfs"; + if (vfslist == NULL && ((ep = strchr(argv[0], '@')) != NULL) || + ((ep = strchr(argv[0], ':')) != NULL)) { + cp = argv[0]; + while (cp != ep) { + if (!isdigit(*cp) && !isalpha(*cp) && + *cp != '.' && *cp != '-' && *cp != ':') + break; + cp++; + } + if (cp == ep) + vfstype = "nfs"; + } rval = mountfs(vfstype, argv[0], argv[1], init_flags, options, NULL); break; -- cgit v1.1