rpms/cifs-utils/devel cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch, NONE, 1.1 cifs-utils.spec, 1.10, 1.11

[Jeff Layton]

Author: jlayton

Update of /cvs/pkgs/rpms/cifs-utils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19989

Modified Files:
	cifs-utils.spec 
Added Files:
	cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch 
Log Message:
mount.cifs: fix parsing of cred= option
Resolves: 597756


cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch:
 mount.cifs.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch ---
>From d3743bbfd82b058b68c1bcf6e3341966a3d9f707 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton at samba.org>
Date: Sun, 30 May 2010 07:47:26 -0400
Subject: [PATCH] mount.cifs: fix parsing of "cred=" option

When the mount option parsing was cleaned up recently, the detection of
the "cred=" option was dropped.

Signed-off-by: Jeff Layton <jlayton at samba.org>
---
 mount.cifs.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/mount.cifs.c b/mount.cifs.c
index 326b94e..65754c0 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -800,6 +800,8 @@ static int parse_opt_token(const char *token)
 		return OPT_UNC;
 	if (strncmp(token, "dom", 3) == 0 || strncmp(token, "workg", 5) == 0)
 		return OPT_DOM;
+	if (strncmp(token, "cred", 4) == 0)
+		return OPT_CRED;
 	if (strncmp(token, "uid", 3) == 0)
 		return OPT_UID;
 	if (strncmp(token, "gid", 3) == 0)
-- 
1.6.6.1



Index: cifs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cifs-utils/devel/cifs-utils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- cifs-utils.spec	25 May 2010 20:02:37 -0000	1.10
+++ cifs-utils.spec	1 Jun 2010 19:58:47 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:           cifs-utils
 Version:        4.5
-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-4.5-mount.cifs-fix-parsing-of-cred-option.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
+* Tue Jun 01 2010 Jeff Layton <jlayton at redhat.com> 4.5-2
+- mount.cifs: fix parsing of cred= option (BZ#597756)
+
 * Tue May 25 2010 Jeff Layton <jlayton at redhat.com> 4.5-1
 - update to 4.5