Attachment 5827 Details for Bug 7539 – switch to using paths.h and _PATH_MNTTAB

[patch] switch to using paths.h and _PATH_MNTTAB

0001-mount.cifs-switch-to-using-_PATH_MNTTAB-and-paths.h.patch (text/plain), 1.65 KB, created by Jeff Layton on 2010-07-05 07:44:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2010-07-05 07:44:00 UTC

Size: 1.65 KB

patch

obsolete

>From a5bfd634ecd0e81eb92b065da311ee4cf6f08757 Mon Sep 17 00:00:00 2001
>From: Jeff Layton <jlayton@samba.org>
>Date: Mon, 5 Jul 2010 08:39:45 -0400
>Subject: [PATCH] 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.
>
>Reported-by: Armin Kuster <linux@kama-aina.net>
>Signed-off-by: Jeff Layton <jlayton@samba.org>
>---
> 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;
> 	}
> 
>-- 
>1.6.6.1
>

Actions: View

Attachments on bug 7539: 5816 | 5827