Author: jlayton
Update of /cvs/pkgs/rpms/cifs-utils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3670
Modified Files:
cifs-utils-mount.cifs-strip-leading-delimiter.patch
cifs-utils.spec
Log Message:
Fix regression in prefixpath patch
cifs-utils-mount.cifs-strip-leading-delimiter.patch:
mount.cifs.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
Index: cifs-utils-mount.cifs-strip-leading-delimiter.patch
===================================================================
RCS file:
/cvs/pkgs/rpms/cifs-utils/F-13/cifs-utils-mount.cifs-strip-leading-delimiter.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cifs-utils-mount.cifs-strip-leading-delimiter.patch 29 Apr 2010 19:46:49 -0000 1.1
+++ cifs-utils-mount.cifs-strip-leading-delimiter.patch 30 Apr 2010 19:22:35 -0000 1.2
@@ -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(a)samba.org>
-Date: Thu, 29 Apr 2010 11:04:51 -0400
-Subject: [PATCH] mount.cifs: strip leading delimiter off of prefixpath option
+Date: Fri, 30 Apr 2010 07:19:53 -0400
+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
when mounting some UNCs.
@@ -9,23 +9,24 @@ when mounting some UNCs.
Reported-by: Ales Zelinka <azelinka(a)redhat.com>
Signed-off-by: Jeff Layton <jlayton(a)samba.org>
---
- mount.cifs.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
+ mount.cifs.c | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/mount.cifs.c b/mount.cifs.c
-index 1040e8b..6e5afe3 100644
+index 1040e8b..c4eb59a 100644
--- a/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
- return EX_USAGE;
+@@ -1169,6 +1169,9 @@ static int parse_unc(const char *unc_name, struct parsed_mount_info
*parsed_info
}
-- prepath = share + sharelen;
-+ prepath = share + sharelen + 1;
+ prepath = share + sharelen;
++ if (*prepath != '\0')
++ prepath++;
++
prepathlen = strlen(prepath);
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;
}
@@ -33,7 +34,7 @@ index 1040e8b..6e5afe3 100644
dev_len = strnlen(parsed_info->host, sizeof(parsed_info->host)) +
strnlen(parsed_info->share, sizeof(parsed_info->share)) +
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, "/", dev_len);
strlcat(dev_name, parsed_info->share, dev_len);
Index: cifs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cifs-utils/F-13/cifs-utils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- cifs-utils.spec 29 Apr 2010 19:46:49 -0000 1.8
+++ cifs-utils.spec 30 Apr 2010 19:22:35 -0000 1.9
@@ -3,7 +3,7 @@
Name: cifs-utils
Version: 4.4
-Release: 2%{pre_release}%{?dist}
+Release: 3%{pre_release}%{?dist}
Summary: Utilities for mounting and managing CIFS mounts
Group: System Environment/Daemons
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
%{_mandir}/man8/mount.cifs.8.gz
%changelog
+* Thu Apr 29 2010 Jeff Layton <jlayton(a)redhat.com> 4.4-3
+- mount.cifs: fix regression in prefixpath patch
+
* Thu Apr 29 2010 Jeff Layton <jlayton(a)redhat.com> 4.4-2
- mount.cifs: strip leading delimiter from prefixpath