From: Miklos Szeredi <miklos@szeredi.hu>
Date: Thu, 7 Oct 2010 14:05:12 +0000 (+0200)
Subject: mount: don't canonicalize "spec" with --no-canonicalize option
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc9186eb9156356b2ced44f59ab0b6ae44069af5;p=util-linux

mount: don't canonicalize "spec" with --no-canonicalize option

"Spec" was still canonicalized despite --no-canonicalize.  This
resulted in a hang during login with pam_encfs (Debian Bug#593336).

Addresses-Debian-Bug: 593336
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: LaMont Jones <lamont@debian.org>
---

diff --git a/mount/devname.c b/mount/devname.c
index 585d259f..05da092f 100644
--- a/mount/devname.c
+++ b/mount/devname.c
@@ -8,7 +8,7 @@ spec_to_devname(const char *spec)
 {
 	if (!spec)
 		return NULL;
-	if (is_pseudo_fs(spec))
+	if (nocanonicalize || is_pseudo_fs(spec))
 		return xstrdup(spec);
 	return fsprobe_get_devname_by_spec(spec);
 }