|
|
f2a5d6 |
From 79b96cd5ed49095ee2b2d7219b5dfa3746505458 Mon Sep 17 00:00:00 2001
|
|
|
f2a5d6 |
From: Guenter Kukkukk <kukks@samba.org>
|
|
|
f2a5d6 |
Date: Tue, 1 Jul 2014 17:43:55 +0200
|
|
|
f2a5d6 |
Subject: [PATCH 2/5] mount.cifs: on 2nd try mount.cifs must also uppercase
|
|
|
f2a5d6 |
"orig_dev"
|
|
|
f2a5d6 |
|
|
|
f2a5d6 |
Recent kernels now ignore "unc=..." mount option. mount.cifs, when
|
|
|
f2a5d6 |
getting errno=ENXIO, retries the mount with uppercased hostname,
|
|
|
f2a5d6 |
sharename and prefixpath in the "unc=..." mount option, which is ignored
|
|
|
f2a5d6 |
now in the kernel. Used e.g. during OS/2 mounts, which fail now.
|
|
|
f2a5d6 |
|
|
|
f2a5d6 |
Also uppercase the now used "orig_dev" parameter.
|
|
|
f2a5d6 |
|
|
|
f2a5d6 |
Signed-off-by: Guenter Kukkukk <kukks@samba.org>
|
|
|
f2a5d6 |
(cherry picked from commit 43fd65ba0fca85a86a79e84bb2bc42b531d858e6)
|
|
|
f2a5d6 |
Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>
|
|
|
f2a5d6 |
---
|
|
|
f2a5d6 |
mount.cifs.c | 3 ++-
|
|
|
f2a5d6 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
f2a5d6 |
|
|
|
f2a5d6 |
diff --git a/mount.cifs.c b/mount.cifs.c
|
|
|
f2a5d6 |
index 497665d..3535096 100644
|
|
|
f2a5d6 |
--- a/mount.cifs.c
|
|
|
f2a5d6 |
+++ b/mount.cifs.c
|
|
|
f2a5d6 |
@@ -2097,7 +2097,8 @@ mount_retry:
|
|
|
f2a5d6 |
if (!already_uppercased &&
|
|
|
f2a5d6 |
uppercase_string(parsed_info->host) &&
|
|
|
f2a5d6 |
uppercase_string(parsed_info->share) &&
|
|
|
f2a5d6 |
- uppercase_string(parsed_info->prefix)) {
|
|
|
f2a5d6 |
+ uppercase_string(parsed_info->prefix) &&
|
|
|
f2a5d6 |
+ uppercase_string(orig_dev)) {
|
|
|
f2a5d6 |
fprintf(stderr,
|
|
|
f2a5d6 |
"Retrying with upper case share name\n");
|
|
|
f2a5d6 |
already_uppercased = 1;
|
|
|
f2a5d6 |
--
|
|
|
f2a5d6 |
2.5.5
|
|
|
f2a5d6 |
|