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

Convert to nmount() and remove hardcoded checks for ufs, msdosfs, ntfs,

Browse Source 
and cd9660.

PR:	bin/97642
This commit is contained in:
Craig Rodrigues 2006-05-24 11:49:39 +00:00
parent 996e95d306
commit 9857865b55
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
usr.sbin/mountd/mountd.c
View File

@ -1015,33 +1015,27 @@ get_exportlist()
}
for (i = 0; i < num; i++) {
iov[1].iov_base = fsp->f_fstypename;
iov[1].iov_len = strlen(fsp->f_fstypename) + 1;
iov[3].iov_base = fsp->f_mntonname;
iov[3].iov_len = strlen(fsp->f_mntonname) + 1;
iov[5].iov_base = fsp->f_mntfromname;
iov[5].iov_len = strlen(fsp->f_mntfromname) + 1;
if (!strcmp(fsp->f_fstypename, "ufs") ||
!strcmp(fsp->f_fstypename, "msdosfs") ||
!strcmp(fsp->f_fstypename, "ntfs") ||
!strcmp(fsp->f_fstypename, "cd9660")) {
iov[1].iov_base = fsp->f_fstypename;
iov[1].iov_len = strlen(fsp->f_fstypename) + 1;
iov[3].iov_base = fsp->f_mntonname;
iov[3].iov_len = strlen(fsp->f_mntonname) + 1;
iov[5].iov_base = fsp->f_mntfromname;
iov[5].iov_len = strlen(fsp->f_mntfromname) + 1;
/*
* Kick out MNT_ROOTFS. It should not be passed from
* userland to kernel. It should only be used
* internally in the kernel.
*/
if (fsp->f_flags & MNT_ROOTFS) {
fsp->f_flags &= ~MNT_ROOTFS;
}
/*
* Kick out MNT_ROOTFS. It should not be passed from
* userland to kernel. It should only be used
* internally in the kernel.
*/
if (fsp->f_flags & MNT_ROOTFS) {
fsp->f_flags &= ~MNT_ROOTFS;
}
if (nmount(iov, iovlen, fsp->f_flags) < 0 &&
errno != ENOENT) {
syslog(LOG_ERR,
"can't delete exports for %s: %m %s",
fsp->f_mntonname, errmsg);
}
if (nmount(iov, iovlen, fsp->f_flags) < 0 &&
errno != ENOENT) {
syslog(LOG_ERR,
"can't delete exports for %s: %m %s",
fsp->f_mntonname, errmsg);
}
fsp++;
}