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

Revert "Move mount.cifs to /usr/sbin"

Browse Source 
This reverts commit 571ddb022369b5fe8fb2db4e61e432b56dde4e9c.

Moving this to /usr/sbin causes dependency problems for the
resource-agents package, which is hardcoded to look for
/sbin/mount.cifs. I'll just plan to make this change in
f19 and leave the earlier releases alone.

While we at it, add a patch to fix some comments in cifsidmap.h.
This commit is contained in:
Jeff Layton 2013-01-13 06:02:59 -05:00
parent fef67dae06
commit a176bdbc89
2 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
0001-cifsidmap-clean-up-comments-on-API-description.patch Normal file
View File

@ -0,0 +1,49 @@
From 739289ad3ce915e1ee2705ecd7ac4e907cd91405 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@samba.org>
Date: Mon, 7 Jan 2013 10:25:30 -0500
Subject: [PATCH] cifsidmap: clean up comments on API description
...typo and grammatical fixes, mostly.
Signed-off-by: Jeff Layton <jlayton@samba.org>
---
cifsidmap.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/cifsidmap.h b/cifsidmap.h
index 656df86..3c074ae 100644
--- a/cifsidmap.h
+++ b/cifsidmap.h
@@ -129,11 +129,11 @@ struct cifs_uxid {
* This function should map an array of struct cifs_sids to an array of
* struct cifs_uxids.
*
- * Returns 0 if at least one conversion was successful and success and
- * non-zero on error. Any that were not successfully converted will have a
- * cuxid->type of CIFS_UXID_TYPE_UNKNOWN.
+ * Returns 0 if at least one conversion was successful and non-zero on error.
+ * Any that were not successfully converted will have a cuxid->type of
+ * CIFS_UXID_TYPE_UNKNOWN.
*
- * On error, the plugin should reset the errmsg pointer passed to the
+ * On any error, the plugin should reset the errmsg pointer passed to the
* init_plugin function to an error string. The caller will not free the error
* string.
*
@@ -151,10 +151,10 @@ struct cifs_uxid {
*
* This function should map an array of cifs_uxids an array of struct cifs_sids.
* Returns 0 if at least one conversion was successful and non-zero on error.
- * Any sids that were not successfully converted will have a revision number of
- * 0.
+ * Any sids that were not successfully converted should have their revision
+ * number set to 0.
*
- * On error, the plugin should reset the errmsg pointer passed to the
+ * On any error, the plugin should reset the errmsg pointer passed to the
* init_plugin function to an error string. The caller will not free the error
* string.
*
--
1.7.11.7

7
cifs-utils.spec
View File

@ -15,7 +15,8 @@ BuildRequires: libcap-ng-devel libtalloc-devel krb5-devel keyutils-libs-devel a
Requires: keyutils
Source0: ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/%{name}-%{version}%{pre_release}.tar.bz2
Patch1: 0001-mount.cifs-set-parsed_info-got_user-when-a-cred-file.patch
Patch1: 0001-cifsidmap-clean-up-comments-on-API-description.patch
Patch2: 0001-mount.cifs-set-parsed_info-got_user-when-a-cred-file.patch
%description
The SMB/CIFS protocol is a standard file sharing protocol widely deployed
@ -37,6 +38,7 @@ necessary for building ID mapping plugins for cifs-utils.
%prep
%setup -q -n %{name}-%{version}%{pre_release}
%patch1 -p1
%patch2 -p1
%build
%configure --prefix=/usr ROOTSBINDIR=%{_sbindir}
@ -79,6 +81,9 @@ rm -rf %{buildroot}
%{_includedir}/cifsidmap.h
%changelog
* Sun Jan 13 2013 Jeff Layton <jlayton@redhat.com> 5.9-3
- comment fixes in cifsidmap.h
* Sun Jan 13 2013 Jeff Layton <jlayton@redhat.com> 5.9-2
- fix regression in credential file handling