rpms
/
samba
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to Samba 4.1.14. 

resolves: #1175710
This commit is contained in:
Andreas Schneider 2015-01-13 18:19:17 +01:00
parent 07799e1070
commit 80a86b9d6f
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
samba-4.1.15-fix_auth_with_long_hostnames.patch Normal file
View File

@ -0,0 +1,37 @@
From 128ab365f7ee075d87640d96c4b6c2170ce9bca7 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 12 Jan 2015 18:12:13 +0100
Subject: [PATCH] s3-util: Fix authentication with long hostnames.
If the hostname is longer than MAX_NETBIOSNAME_LEN we fail to correctly
check the hostname.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=11008
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit da2611adef32107f5a0eec97501c01232ab72efc)
Signed-off-by: Andreas Schneider <asn@samba.org>
---
source3/lib/util.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/source3/lib/util.c b/source3/lib/util.c
index f64e2a3..9e6ac9c 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1192,7 +1192,9 @@ bool is_myname(const char *s)
bool ret = False;
for (n=0; my_netbios_names(n); n++) {
- if (strequal(my_netbios_names(n), s)) {
+ const char *nbt_name = my_netbios_names(n);
+
+ if (strncasecmp_m(nbt_name, s, strlen(nbt_name)) == 0) {
ret=True;
break;
}
--
2.2.1

12
samba.spec
View File

@ -6,9 +6,9 @@
# ctdb is enabled by default, you can disable it with: --without clustering
%bcond_without clustering
%define main_release 2
%define main_release 1
%define samba_version 4.1.14
%define samba_version 4.1.15
%define talloc_version 2.0.8
%define ntdb_version 0.9
%define tdb_version 1.2.12
@ -99,6 +99,8 @@ Source6: samba.pamd
Source200: README.dc
Source201: README.downgrade
Patch0: samba-4.1.15-fix_auth_with_long_hostnames.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(pre): /usr/sbin/groupadd
@ -518,6 +520,8 @@ module necessary to communicate to the Winbind Daemon
%prep
%setup -q -n samba-%{version}%{pre_release}
%patch0 -p1 -b .samba-4.1.15-fix_auth_with_long_hostnames.patch
%build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
%global _tevent_lib ,tevent,pytevent
@ -1616,6 +1620,10 @@ rm -rf %{buildroot}
%{_mandir}/man8/pam_winbind.8*
%changelog
* Tue Jan 13 2015 - Andreas Schneider <asn@redhat.com> - 4.1.15-1
- Update to Samba 4.1.14.
- resolves: #1175710 - Fix auth with long hostnames.
* Wed Jan 07 2015 - Andreas Schneider <asn@redhat.com> - 4.1.14-2
- Add missing requires to libwbclient.