Update to Samba 4.1.20
This commit is contained in:
parent
d86ae9b8f4
commit
de61eac68d
|
@ -46,3 +46,4 @@ samba-3.6.0pre1.tar.gz
|
|||
/samba-4.1.14.tar.xz
|
||||
/samba-4.1.15.tar.xz
|
||||
/samba-4.1.17.tar.xz
|
||||
/samba-4.1.20.tar.xz
|
||||
|
|
|
@ -1,37 +0,0 @@
|
|||
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
|
||||
|
11
samba.spec
11
samba.spec
|
@ -8,7 +8,7 @@
|
|||
|
||||
%define main_release 1
|
||||
|
||||
%define samba_version 4.1.17
|
||||
%define samba_version 4.1.20
|
||||
%define talloc_version 2.0.8
|
||||
%define ntdb_version 0.9
|
||||
%define tdb_version 1.2.12
|
||||
|
@ -99,8 +99,6 @@ 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
|
||||
|
@ -520,8 +518,6 @@ 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
|
||||
|
@ -1299,6 +1295,7 @@ rm -rf %{buildroot}
|
|||
%if %{with_vfs_glusterfs}
|
||||
%files vfs-glusterfs
|
||||
%{_libdir}/samba/vfs/glusterfs.so
|
||||
%{_mandir}/man8/vfs_glusterfs.8.gz
|
||||
%endif
|
||||
|
||||
### LIBS
|
||||
|
@ -1620,6 +1617,10 @@ rm -rf %{buildroot}
|
|||
%{_mandir}/man8/pam_winbind.8*
|
||||
|
||||
%changelog
|
||||
* Mon Sep 14 2015 Andreas Schneider <asn@redhat.com> - 4.1.20-1
|
||||
- Update to Samba 4.1.20
|
||||
- resolves: #1261080 - Fix memleak in libsmbclient
|
||||
|
||||
* Mon Feb 23 2015 Andreas Schneider <asn@redhat.com> - 4.1.17-1
|
||||
- Update to Samba 4.1.17
|
||||
- Fix CVE-2015-0240 - RCE in netlogon
|
||||
|
|
Loading…
Reference in New Issue