Update to 6.0 upstream release
This commit is contained in:
Jeff Layton
parent
8a83db9111
commit
f92468acdc
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ cifs-utils-4.6.tar.bz2
|
||||
/cifs-utils-5.7.tar.bz2
|
||||
/cifs-utils-5.8.tar.bz2
|
||||
/cifs-utils-5.9.tar.bz2
|
||||
/cifs-utils-6.0.tar.bz2
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 1a01f7c4b90695211d12291d7a24bec05b1f2922 Mon Sep 17 00:00:00 2001
|
||||
From: Jeff Layton <jlayton@samba.org>
|
||||
Date: Sat, 12 Jan 2013 22:02:01 -0500
|
||||
Subject: [PATCH] mount.cifs: set parsed_info->got_user when a cred file
|
||||
supplies a username
|
||||
|
||||
commit 85d18a1ed introduced a regression when using a credentials file.
|
||||
It set the username in the parsed mount info properly, but didn't set
|
||||
the "got_user" flag in it.
|
||||
|
||||
Also, fix an incorrect strlcpy length specifier in open_cred_file.
|
||||
|
||||
Reported-by: "Mantas M." <grawity@gmail.com>
|
||||
Signed-off-by: Jeff Layton <jlayton@samba.org>
|
||||
---
|
||||
mount.cifs.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mount.cifs.c b/mount.cifs.c
|
||||
index c7c3055..40b77e9 100644
|
||||
--- a/mount.cifs.c
|
||||
+++ b/mount.cifs.c
|
||||
@@ -581,7 +581,8 @@ static int open_cred_file(char *file_name,
|
||||
switch (parse_cred_line(line_buf + i, &temp_val)) {
|
||||
case CRED_USER:
|
||||
strlcpy(parsed_info->username, temp_val,
|
||||
- sizeof(parsed_info->domain));
|
||||
+ sizeof(parsed_info->username));
|
||||
+ parsed_info->got_user = 1;
|
||||
break;
|
||||
case CRED_PASS:
|
||||
i = set_password(parsed_info, temp_val);
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
%define pre_release %nil
|
||||
|
||||
Name: cifs-utils
|
||||
Version: 5.9
|
||||
Release: 4%{pre_release}%{?dist}
|
||||
Version: 6.0
|
||||
Release: 1%{pre_release}%{?dist}
|
||||
Summary: Utilities for mounting and managing CIFS mounts
|
||||
|
||||
Group: System Environment/Daemons
|
||||
@ -15,8 +15,6 @@ 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-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,8 +35,6 @@ 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}
|
||||
@ -81,6 +77,9 @@ rm -rf %{buildroot}
|
||||
%{_includedir}/cifsidmap.h
|
||||
|
||||
%changelog
|
||||
* Mon Mar 25 2013 Jeff Layton <jlayton@redhat.com> 6.0-1
|
||||
- update to 6.0 release
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.9-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user