rpms/cifs-utils/F-13 cifs-utils-mount.cifs-strip-leading-delimiter.patch, NONE, 1.1 cifs-utils.spec, 1.7, 1.8

[Jeff Layton]

Author: jlayton

Update of /cvs/pkgs/rpms/cifs-utils/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3911

Modified Files:
	cifs-utils.spec 
Added Files:
	cifs-utils-mount.cifs-strip-leading-delimiter.patch 
Log Message:
mount.cifs: strip leading delimiter from prefixpath


cifs-utils-mount.cifs-strip-leading-delimiter.patch:
 mount.cifs.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE cifs-utils-mount.cifs-strip-leading-delimiter.patch ---
>From 6fb698300a3193bc03b491ff4cfdf281e8fcf605 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton at samba.org>
Date: Thu, 29 Apr 2010 11:04:51 -0400
Subject: [PATCH] mount.cifs: strip leading delimiter off of prefixpath option

...the kernel doesn't expect to see it and it causes a regression
when mounting some UNCs.

Reported-by: Ales Zelinka <azelinka at redhat.com>
Signed-off-by: Jeff Layton <jlayton at samba.org>
---
 mount.cifs.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/mount.cifs.c b/mount.cifs.c
index 1040e8b..6e5afe3 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;
 	}
 
-	prepath = share + sharelen;
+	prepath = share + sharelen + 1;
 	prepathlen = strlen(prepath);
 
 	if (prepathlen + 1 > sizeof(parsed_info->prefix)) {
@@ -1669,6 +1669,7 @@ int main(int argc, char **argv)
 		goto mount_exit;
 	}
 
+	/* lengths of different strings + slashes + trailing \0 */
 	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)
 	strlcat(dev_name, parsed_info->host, dev_len);
 	strlcat(dev_name, "/", dev_len);
 	strlcat(dev_name, parsed_info->share, dev_len);
+	strlcat(dev_name, "/", dev_len);
 	strlcat(dev_name, parsed_info->prefix, dev_len);
 
 	currentaddress = parsed_info->addrlist;
-- 
1.6.6.1



Index: cifs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cifs-utils/F-13/cifs-utils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cifs-utils.spec	28 Apr 2010 11:52:15 -0000	1.7
+++ cifs-utils.spec	29 Apr 2010 19:46:49 -0000	1.8
@@ -3,7 +3,7 @@
 
 Name:           cifs-utils
 Version:        4.4
-Release:        1%{pre_release}%{?dist}
+Release:        2%{pre_release}%{?dist}
 Summary:        Utilities for mounting and managing CIFS mounts
 
 Group:          System Environment/Daemons
@@ -12,6 +12,7 @@ URL:            http://linux-cifs.samba.
 BuildRoot:      %{_tmppath}/%{name}-%{version}%{pre_release}-%{release}-root-%(%{__id_u} -n)
 
 Source0:        ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}%{pre_release}.tar.bz2
+Patch1:		cifs-utils-mount.cifs-strip-leading-delimiter.patch
 
 BuildRequires:  libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel autoconf automake
 Requires:       keyutils
@@ -26,6 +27,7 @@ file system.
 
 %prep
 %setup -q -n %{name}-%{version}%{pre_release}
+%patch1 -p1
 
 %build
 %configure --prefix=/usr
@@ -47,6 +49,9 @@ rm -rf %{buildroot}
 %{_mandir}/man8/mount.cifs.8.gz
 
 %changelog
+* Thu Apr 29 2010 Jeff Layton <jlayton at redhat.com> 4.4-2
+- mount.cifs: strip leading delimiter from prefixpath
+
 * Wed Apr 28 2010 Jeff Layton <jlayton at redhat.com> 4.4-1
 - update to 4.4