Address an inconsistency: the mount.nfs command uses the glibc routines
to manipulate /etc/mtab (setmntent) but, everything else in nfs-utils
uses a local private version (nfs_setmntent). The local version does
some extra mangling of the mtab entries.
We should check what util-linux does these days to be sure, but for now,
let's make the mount.nfs command use the nfs_ variants of setmntent().
Signed-off-by: Chuck Lever <[email protected]>
---
utils/mount/mount.c | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index db150de..f3400e2 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -36,6 +36,7 @@
#include "nls.h"
#include "mount_constants.h"
#include "nfs_paths.h"
+#include "nfs_mntent.h"
#include "nfs_mount.h"
#include "nfs4_mount.h"
@@ -225,7 +226,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
int flags, char *opts, int freq, int pass)
{
struct mntent ment;
- FILE *mtab;
+ mntFILE *mtab;
int result = EX_FILEIO;
ment.mnt_fsname = spec;
@@ -243,19 +244,20 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
lock_mtab();
- if ((mtab = setmntent(MOUNTED, "a+")) == NULL) {
+ mtab = nfs_setmntent(MOUNTED, "a+");
+ if (mtab == NULL || mtab->mntent_fp == NULL) {
nfs_error(_("Can't open mtab: %s"),
strerror(errno));
goto fail_unlock;
}
- if (addmntent(mtab, &ment) == 1) {
+ if (nfs_addmntent(mtab, &ment) == 1) {
nfs_error(_("Can't write mount entry to mtab: %s"),
strerror(errno));
goto fail_close;
}
- if (fchmod(fileno(mtab), 0644) == -1) {
+ if (fchmod(fileno(mtab->mntent_fp), 0644) == -1) {
nfs_error(_("Can't set permissions on mtab: %s"),
strerror(errno));
goto fail_close;
@@ -264,7 +266,7 @@ static int add_mtab(char *spec, char *mount_point, char *fstype,
result = EX_SUCCESS;
fail_close:
- endmntent(mtab);
+ nfs_endmntent(mtab);
fail_unlock:
unlock_mtab();
free(ment.mnt_opts);
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
NFS maillist - [email protected]
https://lists.sourceforge.net/lists/listinfo/nfs