Rebase Samba to 4.16.3
related: rhbz#2077487
This commit is contained in:
parent
7eb74bfea1
commit
c25bedf2c0
2
.gitignore
vendored
2
.gitignore
vendored
@ -261,3 +261,5 @@ samba-3.6.0pre1.tar.gz
|
|||||||
/samba-4.16.1.tar.xz
|
/samba-4.16.1.tar.xz
|
||||||
/samba-4.16.2.tar.asc
|
/samba-4.16.2.tar.asc
|
||||||
/samba-4.16.2.tar.xz
|
/samba-4.16.2.tar.xz
|
||||||
|
/samba-4.16.3.tar.asc
|
||||||
|
/samba-4.16.3.tar.xz
|
||||||
|
@ -1,66 +0,0 @@
|
|||||||
From dfdd5805c1bc4bda8af8ffe40ec0af997aa9b1f9 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Volker Lendecke <vl@samba.org>
|
|
||||||
Date: Fri, 8 Jul 2022 14:14:22 +0200
|
|
||||||
Subject: [PATCH] rpc_server3: Initialize mangle_fns in classic and spoolss
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Bug: https://bugzilla.samba.org/show_bug.cgi?id=15118
|
|
||||||
Signed-off-by: Volker Lendecke <vl@samba.org>
|
|
||||||
Reviewed-by: Pavel Filipenský <pfilipensky@samba.org>
|
|
||||||
|
|
||||||
Autobuild-User(master): Pavel Filipensky <pfilipensky@samba.org>
|
|
||||||
Autobuild-Date(master): Tue Jul 12 13:33:14 UTC 2022 on sn-devel-184
|
|
||||||
|
|
||||||
(cherry picked from commit 11d3d2aeac599ebbedd5332c5520465970319448)
|
|
||||||
---
|
|
||||||
source3/rpc_server/rpcd_classic.c | 3 +++
|
|
||||||
source3/rpc_server/rpcd_spoolss.c | 3 +++
|
|
||||||
2 files changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/source3/rpc_server/rpcd_classic.c b/source3/rpc_server/rpcd_classic.c
|
|
||||||
index d3607d2e19c..4f6164c814c 100644
|
|
||||||
--- a/source3/rpc_server/rpcd_classic.c
|
|
||||||
+++ b/source3/rpc_server/rpcd_classic.c
|
|
||||||
@@ -33,6 +33,7 @@
|
|
||||||
#include "librpc/gen_ndr/ndr_initshutdown_scompat.h"
|
|
||||||
#include "source3/include/secrets.h"
|
|
||||||
#include "locking/share_mode_lock.h"
|
|
||||||
+#include "source3/smbd/proto.h"
|
|
||||||
|
|
||||||
static size_t classic_interfaces(
|
|
||||||
const struct ndr_interface_table ***pifaces,
|
|
||||||
@@ -81,6 +82,8 @@ static size_t classic_servers(
|
|
||||||
|
|
||||||
lp_load_with_shares(get_dyn_CONFIGFILE());
|
|
||||||
|
|
||||||
+ mangle_reset_cache();
|
|
||||||
+
|
|
||||||
*_ep_servers = ep_servers;
|
|
||||||
return ARRAY_SIZE(ep_servers);
|
|
||||||
}
|
|
||||||
diff --git a/source3/rpc_server/rpcd_spoolss.c b/source3/rpc_server/rpcd_spoolss.c
|
|
||||||
index 733e70764a5..16b4667cd02 100644
|
|
||||||
--- a/source3/rpc_server/rpcd_spoolss.c
|
|
||||||
+++ b/source3/rpc_server/rpcd_spoolss.c
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include "source3/printing/queue_process.h"
|
|
||||||
#include "source3/include/messages.h"
|
|
||||||
#include "source3/include/secrets.h"
|
|
||||||
+#include "source3/smbd/proto.h"
|
|
||||||
|
|
||||||
static size_t spoolss_interfaces(
|
|
||||||
const struct ndr_interface_table ***pifaces,
|
|
||||||
@@ -68,6 +69,8 @@ static size_t spoolss_servers(
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ mangle_reset_cache();
|
|
||||||
+
|
|
||||||
*_ep_servers = ep_servers;
|
|
||||||
return ARRAY_SIZE(ep_servers);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.36.1
|
|
||||||
|
|
@ -134,9 +134,9 @@
|
|||||||
|
|
||||||
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
|
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
|
||||||
|
|
||||||
%global baserelease 102
|
%global baserelease 100
|
||||||
|
|
||||||
%global samba_version 4.16.2
|
%global samba_version 4.16.3
|
||||||
%global talloc_version 2.3.3
|
%global talloc_version 2.3.3
|
||||||
%global tdb_version 1.4.6
|
%global tdb_version 1.4.6
|
||||||
%global tevent_version 0.12.0
|
%global tevent_version 0.12.0
|
||||||
@ -207,7 +207,6 @@ Source201: README.downgrade
|
|||||||
Patch0: samba-s4u.patch
|
Patch0: samba-s4u.patch
|
||||||
# https://gitlab.com/samba-team/samba/-/merge_requests/2477
|
# https://gitlab.com/samba-team/samba/-/merge_requests/2477
|
||||||
Patch1: samba-4.16-waf-crypto.patch
|
Patch1: samba-4.16-waf-crypto.patch
|
||||||
Patch2: samba-4.16-rpc_server3-mangle_fns.patch
|
|
||||||
|
|
||||||
Requires(pre): /usr/sbin/groupadd
|
Requires(pre): /usr/sbin/groupadd
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
@ -2104,6 +2103,7 @@ fi
|
|||||||
%{_libdir}/samba/bind9/dlz_bind9_12.so
|
%{_libdir}/samba/bind9/dlz_bind9_12.so
|
||||||
%{_libdir}/samba/bind9/dlz_bind9_14.so
|
%{_libdir}/samba/bind9/dlz_bind9_14.so
|
||||||
%{_libdir}/samba/bind9/dlz_bind9_16.so
|
%{_libdir}/samba/bind9/dlz_bind9_16.so
|
||||||
|
%{_libdir}/samba/bind9/dlz_bind9_18.so
|
||||||
#endif with dc
|
#endif with dc
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -4162,6 +4162,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 18 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.16.3-100
|
||||||
|
- related: rhbz#2077487 - Rebase Samba to 4.16.3
|
||||||
|
|
||||||
* Wed Jul 13 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.16.2-102
|
* Wed Jul 13 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.16.2-102
|
||||||
- resolves: rhbz#2106279 - Fix crash in rpcd_classic
|
- resolves: rhbz#2106279 - Fix crash in rpcd_classic
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (samba-4.16.2.tar.asc) = bb22bb3da89bffdc213ed240204f8f801291db4ee0df73aa814e222355da5f774997a7a4f0a0685743a660bb4540e4b168dc2d3cd00bc22b9735caf140a3bfa0
|
SHA512 (samba-4.16.3.tar.asc) = 98f07c312263e3ff4594fa1204184f15212f0c4771d45b349ab48981caefaa94aa7ae5223922d1cbaac9f423554b7a5c4107cb3a3599041cf38af6f665a9289a
|
||||||
SHA512 (samba-4.16.2.tar.xz) = f29a49b119b55db063bf69a6df57fd29667bb3ee7a22f3af7ea9cafa88b05ce21cae11464de073c1f0c963e46b571c94a5ccaed3f364f851fe8a4b5d5064e794
|
SHA512 (samba-4.16.3.tar.xz) = 1a73c03ad1369e1b3ceaab0592857b3072068de435eecc97a86d5e5e8a5d4613d4fd65f0e62fe20b7ecc3f9fa2ab012ee862b56b6627047e030b5510e3ad3d41
|
||||||
|
Loading…
Reference in New Issue
Block a user