diff options
| author | Jeff Layton <jlayton@samba.org> | 2010-07-07 10:48:39 -0400 |
|---|---|---|
| committer | Jeff Layton <jlayton@samba.org> | 2010-07-07 10:48:39 -0400 |
| commit | 98b3723c75d295e8718f1440f91a2c678608f658 (patch) | |
| tree | 0dfe8ee3ce0117cba006402b1fee0dcf060b116e | |
| parent | 5e1924a6f79c1b07d9bcb4977b58f94efaaa0301 (diff) | |
| download | cifs-utils-98b3723c75d295e8718f1440f91a2c678608f658.tar.gz cifs-utils-98b3723c75d295e8718f1440f91a2c678608f658.tar.bz2 cifs-utils-98b3723c75d295e8718f1440f91a2c678608f658.zip | |
mount.cifs: switch to using _PATH_MNTTAB and paths.h
The code currently uses fstab.h and _PATH_FSTAB, but uClibc apparently
doesn't have that header. It does have paths.h and _PATH_MNTTAB however
and so does glibc, so use that instead.
Fixes samba bug #7539.
Reported-and-Tested-by: Armin Kuster <linux@kama-aina.net>
Signed-off-by: Jeff Layton <jlayton@samba.org>
| -rw-r--r-- | mount.cifs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mount.cifs.c b/mount.cifs.c index 51fc1a8..c84e72d 100644 --- a/mount.cifs.c +++ b/mount.cifs.c @@ -41,7 +41,7 @@ #include <mntent.h> #include <fcntl.h> #include <limits.h> -#include <fstab.h> +#include <paths.h> #include <sys/mman.h> #include <sys/wait.h> #ifdef HAVE_LIBCAP_NG @@ -212,9 +212,9 @@ check_fstab(const char *progname, const char *mountpoint, const char *devname, struct mntent *mnt; /* make sure this mount is listed in /etc/fstab */ - fstab = setmntent(_PATH_FSTAB, "r"); + fstab = setmntent(_PATH_MNTTAB, "r"); if (!fstab) { - fprintf(stderr, "Couldn't open %s for reading!\n", _PATH_FSTAB); + fprintf(stderr, "Couldn't open %s for reading!\n", _PATH_MNTTAB); return EX_FILEIO; } @@ -226,7 +226,7 @@ check_fstab(const char *progname, const char *mountpoint, const char *devname, if (mnt == NULL || strcmp(mnt->mnt_fsname, devname)) { fprintf(stderr, "%s: permission denied: no match for " - "%s found in %s\n", progname, mountpoint, _PATH_FSTAB); + "%s found in %s\n", progname, mountpoint, _PATH_MNTTAB); return EX_USAGE; } |