From 68f2501a6be8760a1a29e134aba28f0e147d290148d2df454b8270e863ce5553 Mon Sep 17 00:00:00 2001 From: Suresh Jayaraman Date: Wed, 7 Jul 2010 15:19:48 +0000 Subject: [PATCH] - mount.cifs: fix parsing of "cred=" option. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=23 --- cifs-fix-cred-option-parsing | 25 +++++++++++++++++++++++++ cifs-utils.changes | 5 +++++ cifs-utils.spec | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 cifs-fix-cred-option-parsing diff --git a/cifs-fix-cred-option-parsing b/cifs-fix-cred-option-parsing new file mode 100644 index 0000000..841f252 --- /dev/null +++ b/cifs-fix-cred-option-parsing @@ -0,0 +1,25 @@ +commit d3743bbfd82b058b68c1bcf6e3341966a3d9f707 +Author: Jeff Layton +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 + +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) diff --git a/cifs-utils.changes b/cifs-utils.changes index e6999cf..9ee6f2e 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -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 diff --git a/cifs-utils.spec b/cifs-utils.spec index bfaf8aa..82a2773 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -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}}