pool/cifs-utils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 42703 from network:samba:STABLE

Browse Source 
Copy from network:samba:STABLE/cifs-utils based on submit request 42703 from user sjayaraman

OBS-URL: https://build.opensuse.org/request/show/42703
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=9
This commit is contained in:
OBS User autobuild 2010-07-19 11:35:46 +00:00 committed by Git OBS Bridge
commit 2d312168b5
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cifs-fix-cred-option-parsing Normal file
View File

@ -0,0 +1,25 @@
commit d3743bbfd82b058b68c1bcf6e3341966a3d9f707
Author: Jeff Layton <jlayton@samba.org>
Date: Sun May 30 07:47:26 2010 -0400
References: bnc#618877
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>
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)

5
cifs-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 7 08:02:22 UTC 2010 - sjayaraman@suse.de
- mount.cifs: fix parsing of "cred=" option.
-------------------------------------------------------------------
Mon May 24 04:19:38 UTC 2010 - sjayaraman@suse.de

4
cifs-utils.spec
View File

@ -20,7 +20,7 @@ Summary: Utilities for doing and managing mounts of the Linux CIFS filesy
Name: cifs-utils
Version: 4.5
Release: 1
Release: 2
License: GPLv3+
Group: System/Filesystems
Url: http://www.samba.org/linux-cifs/cifs-utils/
@ -28,6 +28,7 @@ Source: %{name}-%{version}.tar.bz2
Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh
Patch1: cifs-fix-cred-option-parsing
%if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd
%else
@ -53,6 +54,7 @@ the Linux CIFS filesystem.
%prep
%setup -q
%patch1 -p1
%build
%{?suse_update_config:%{suse_update_config -f}}