]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
mount: canonicalize fstab mnt_dir
authorKarel Zak <kzak@redhat.com>
Thu, 2 Jun 2011 12:53:42 +0000 (14:53 +0200)
committerKarel Zak <kzak@redhat.com>
Thu, 2 Jun 2011 12:53:42 +0000 (14:53 +0200)
Addresses: http://bugzilla.redhat.com/show_bug.cgi?id=709681
Signed-off-by: Karel Zak <kzak@redhat.com>
mount/fstab.c

index 8ce733bf8ed9280cd655ded757296d73af534b4f..4fa26b4468e3e746528ce4010f3b6163eae7304c 100644 (file)
@@ -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;
                }