d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do our best to determine if the user is attempting an NFS mount when

Browse Source 
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
This commit is contained in:
mux 2002-04-22 23:03:03 +00:00
parent 0b358fe827
commit c62b045a34
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sbin/mount/mount.c
View File

@ -50,6 +50,7 @@ static const char rcsid[] =
#include <sys/stat.h>
#include <sys/wait.h>
#include <ctype.h>
#include <err.h>
#include <errno.h>
#include <fstab.h>
@ -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;