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

mount.cifs: fix parsing of cred= option Resolves: 597756

Browse Source
This commit is contained in:
Jeff Layton 2010-06-01 19:58:47 +00:00
parent 643170ba91
commit 6e0162f193
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cifs-utils-4.5-mount.cifs-fix-parsing-of-cred-option.patch Normal file
View File

@ -0,0 +1,29 @@
From d3743bbfd82b058b68c1bcf6e3341966a3d9f707 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@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@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

7
cifs-utils.spec
View File

@ -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.org/cifs-utils/
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@redhat.com> 4.5-2
- mount.cifs: fix parsing of cred= option (BZ#597756)
* Tue May 25 2010 Jeff Layton <jlayton@redhat.com> 4.5-1
- update to 4.5