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

Accepting request 124713 from network:samba:STABLE

Browse Source 
mount.cifs: set rc to 0 in libcap toggle_dac_capability

OBS-URL: https://build.opensuse.org/request/show/124713
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cifs-utils?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2012-06-25 11:50:06 +00:00 committed by Git OBS Bridge
commit c71080b2dd
3 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cifs-utils.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jun 12 11:54:14 UTC 2012 - lmuelle@suse.com
- mount.cifs: set rc to 0 in libcap toggle_dac_capability
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 1 18:30:07 UTC 2012 - lmuelle@suse.com Fri Jun 1 18:30:07 UTC 2012 - lmuelle@suse.com

4
cifs-utils.spec
View File

@ -27,6 +27,7 @@ Source: %{name}-%{version}.tar.bz2
Source1: cifs.init Source1: cifs.init
Source2: mkinitrd_scripts_boot-cifs.sh Source2: mkinitrd_scripts_boot-cifs.sh
Source3: mkinitrd_scripts_setup-cifs.sh Source3: mkinitrd_scripts_setup-cifs.sh
Patch: set-rc-libcap-toggle_dac_capability.diff
%if 0%{?suse_version} %if 0%{?suse_version}
PreReq: insserv %{?fillup_prereq} mkinitrd PreReq: insserv %{?fillup_prereq} mkinitrd
%else %else
@ -48,7 +49,7 @@ BuildRequires: libcap-ng-devel
%else %else
BuildRequires: libcap-devel BuildRequires: libcap-devel
%endif %endif
#!BuildIgnore: libtalloc #!BuildIgnore: libtalloc
BuildRequires: libtalloc-devel BuildRequires: libtalloc-devel
%if 0%{?suse_version} > 1110 %if 0%{?suse_version} > 1110
BuildRequires: fdupes BuildRequires: fdupes
@ -73,6 +74,7 @@ the Linux CIFS filesystem.
%prep %prep
%setup -q %setup -q
%patch -p1
%build %build
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie" export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -fpie"

38
set-rc-libcap-toggle_dac_capability.diff Normal file
View File

@ -0,0 +1,38 @@
From: Jeff Layton <jlayton@samba.org>
To: linux-cifs@vger.kernel.org
Cc: roderburg@uni-koeln.de
Date: Tue, 12 Jun 2012 06:12:30 -0400
Subject: [PATCH] mount.cifs: set rc to 0 in libcap toggle_dac_capability
Thus spake Jochen:
The mount.cifs program from the cifs-utils package 5.5 did not work on
my Linux system. It just exited without an error message and did not
mount anything.
[...]
I think, when this variable rc is now used in this function, it has also
to be properly initialized there.
Reported-by: Jochen Roderburg <roderburg@uni-koeln.de>
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
mount.cifs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/mount.cifs.c b/mount.cifs.c
index a1b0454..6f3f382 100644
--- a/mount.cifs.c
+++ b/mount.cifs.c
@@ -495,7 +495,7 @@ free_caps:
static int
toggle_dac_capability(int writable, int enable)
{
- int rc;
+ int rc = 0;
cap_t caps;
cap_value_t capability = writable ? CAP_DAC_OVERRIDE : CAP_DAC_READ_SEARCH;
--
1.7.7.6