diff --git a/cifs-utils.changes b/cifs-utils.changes index 1a00f6e..e385a68 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 19 19:03:21 UTC 2012 - lmuelle@suse.com + +- Make use of the stored return code in toggle_dac_capability() of mount.cifs. + ------------------------------------------------------------------- Thu Apr 19 17:29:11 UTC 2012 - lmuelle@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index 91183d7..9e9e9cd 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -30,6 +30,7 @@ Source3: mkinitrd_scripts_setup-cifs.sh Patch: 8c6268cbbd4202631e5c4b30297adc0088a1d568.diff Patch1: bkup-uid-gid-uninitialized.diff Patch2: krb5_auth_con_set_req_cksumtype-implicit-declaration.diff +Patch3: mount.cifs-toggle_dac_capability-return-stored-returncode.diff %if 0%{?suse_version} PreReq: insserv %{?fillup_prereq} mkinitrd %else @@ -81,6 +82,7 @@ the Linux CIFS filesystem. %patch -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf --force --install diff --git a/mount.cifs-toggle_dac_capability-return-stored-returncode.diff b/mount.cifs-toggle_dac_capability-return-stored-returncode.diff new file mode 100644 index 0000000..0253830 --- /dev/null +++ b/mount.cifs-toggle_dac_capability-return-stored-returncode.diff @@ -0,0 +1,19 @@ +Author: Lars Mueller +Subject: cifs-utils don't make use of stored return code +Bugzilla: na +Upstream-Reported: http://permalink.gmane.org/gmane.linux.kernel.cifs/5935 +Upstream-Acknowledged: Yes + +Index: cifs-utils-5.4/mount.cifs.c +=================================================================== +--- cifs-utils-5.4.orig/mount.cifs.c ++++ cifs-utils-5.4/mount.cifs.c +@@ -577,7 +577,7 @@ toggle_dac_capability(int writable, int + } + free_caps: + cap_free(caps); +- return 0; ++ return rc; + } + #else /* HAVE_LIBCAP */ + static int