From: Karel Zak <kzak@redhat.com>
Date: Thu, 2 Jun 2011 12:53:42 +0000 (+0200)
Subject: mount: canonicalize fstab mnt_dir
X-Git-Tag: v2.20-rc1~203
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aab72640daa7ee2db3d42fc8278ab86e3aef2d71;p=thirdparty%2Futil-linux.git

mount: canonicalize fstab mnt_dir

Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=709681
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/fstab.c b/mount/fstab.c
index 8ce733bf8e..4fa26b4468 100644
--- a/mount/fstab.c
+++ b/mount/fstab.c
@@ -455,7 +455,13 @@ getfs_by_dir (const char *dir) {
 
 	cdir = canonicalize(dir);
 	for (mc = mc0->nxt; mc && mc != mc0; mc = mc->nxt) {
-		if (streq(mc->m.mnt_dir, cdir)) {
+		int ok = streq(mc->m.mnt_dir, cdir);
+		if (!ok) {
+			char *dr = canonicalize(mc->m.mnt_dir);
+			ok = dr ? streq(dr, cdir) : 0;
+			free(dr);
+		}
+		if (ok) {
 			free(cdir);
 			return mc;
 		}