rpms/cifs-utils
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix regression in prefixpath patch

Browse Source
This commit is contained in:
Jeff Layton 2010-04-30 19:16:22 +00:00
parent ea0d74b02d
commit 7e0ecb5c02
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cifs-utils-mount.cifs-strip-leading-delimiter.patch
View File

@ -1,7 +1,7 @@
From 6fb698300a3193bc03b491ff4cfdf281e8fcf605 Mon Sep 17 00:00:00 2001 From df6188fc6b3bcf4749cb76c755fe24241cf9455c Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@samba.org> From: Jeff Layton <jlayton@samba.org>
Date: Thu, 29 Apr 2010 11:04:51 -0400 Date: Fri, 30 Apr 2010 07:19:53 -0400
Subject: [PATCH] mount.cifs: strip leading delimiter off of prefixpath option Subject: [PATCH] mount.cifs: strip leading delimiter off of prefixpath option (try #2)
...the kernel doesn't expect to see it and it causes a regression ...the kernel doesn't expect to see it and it causes a regression
when mounting some UNCs. when mounting some UNCs.
@ -9,23 +9,24 @@ when mounting some UNCs.
Reported-by: Ales Zelinka <azelinka@redhat.com> Reported-by: Ales Zelinka <azelinka@redhat.com>
Signed-off-by: Jeff Layton <jlayton@samba.org> Signed-off-by: Jeff Layton <jlayton@samba.org>
--- ---
mount.cifs.c | 4 +++- mount.cifs.c | 5 +++++
1 files changed, 3 insertions(+), 1 deletions(-) 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/mount.cifs.c b/mount.cifs.c diff --git a/mount.cifs.c b/mount.cifs.c
index 1040e8b..6e5afe3 100644 index 1040e8b..c4eb59a 100644
--- a/mount.cifs.c --- a/mount.cifs.c
+++ b/mount.cifs.c +++ b/mount.cifs.c
@@ -1168,7 +1168,7 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info @@ -1169,6 +1169,9 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info *parsed_info
return EX_USAGE;
} }
- prepath = share + sharelen; prepath = share + sharelen;
+ prepath = share + sharelen + 1; + if (*prepath != '\0')
+ prepath++;
+
prepathlen = strlen(prepath); prepathlen = strlen(prepath);
if (prepathlen + 1 > sizeof(parsed_info->prefix)) { if (prepathlen + 1 > sizeof(parsed_info->prefix)) {
@@ -1669,6 +1669,7 @@ int main(int argc, char **argv) @@ -1669,6 +1672,7 @@ int main(int argc, char **argv)
goto mount_exit; goto mount_exit;
} }
@ -33,7 +34,7 @@ index 1040e8b..6e5afe3 100644
dev_len = strnlen(parsed_info->host, sizeof(parsed_info->host)) + dev_len = strnlen(parsed_info->host, sizeof(parsed_info->host)) +
strnlen(parsed_info->share, sizeof(parsed_info->share)) + strnlen(parsed_info->share, sizeof(parsed_info->share)) +
strnlen(parsed_info->prefix, sizeof(parsed_info->prefix)) + strnlen(parsed_info->prefix, sizeof(parsed_info->prefix)) +
@@ -1684,6 +1685,7 @@ int main(int argc, char **argv) @@ -1684,6 +1688,7 @@ int main(int argc, char **argv)
strlcat(dev_name, parsed_info->host, dev_len); strlcat(dev_name, parsed_info->host, dev_len);
strlcat(dev_name, "/", dev_len); strlcat(dev_name, "/", dev_len);
strlcat(dev_name, parsed_info->share, dev_len); strlcat(dev_name, parsed_info->share, dev_len);

5
cifs-utils.spec
View File

@ -3,7 +3,7 @@
Name: cifs-utils Name: cifs-utils
Version: 4.4 Version: 4.4
Release: 2%{pre_release}%{?dist} Release: 3%{pre_release}%{?dist}
Summary: Utilities for mounting and managing CIFS mounts Summary: Utilities for mounting and managing CIFS mounts
Group: System Environment/Daemons Group: System Environment/Daemons
@ -49,6 +49,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/mount.cifs.8.gz %{_mandir}/man8/mount.cifs.8.gz
%changelog %changelog
* Thu Apr 29 2010 Jeff Layton <jlayton@redhat.com> 4.4-3
- mount.cifs: fix regression in prefixpath patch
* Thu Apr 29 2010 Jeff Layton <jlayton@redhat.com> 4.4-2 * Thu Apr 29 2010 Jeff Layton <jlayton@redhat.com> 4.4-2
- mount.cifs: strip leading delimiter from prefixpath - mount.cifs: strip leading delimiter from prefixpath