Djam/samba
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/samba.git synced 2025-02-24 01:22:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

upd to 4.18.3

Browse source
This commit is contained in:
Mikhail Novosyolov 2023-07-04 17:52:19 +03:00
parent 60ed90ef17
commit 76f139c760
4 changed files with 43 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
samba-4.17.4.tar.gz: 33efa041e3c2bbc94ca137dc764b6ffd98bc8321
samba-4.18.3.tar.gz: bea14cc5e10f593c4e216b2eabd4e584e954e2c0

39
0001-samba-tool-dbcheck-Avoid-creating-child-DNs-via-ldb.patch
View file

@ -1,4 +1,4 @@
From 63cf6814016d4a68a49773b1cf282bc78f42d5ba Mon Sep 17 00:00:00 2001
From 5149b8a6244ddda1303f6d942ee929721da70407 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 11 Mar 2019 13:29:40 +1300
Subject: [PATCH 1/2] samba-tool dbcheck: Avoid creating child DNs via ldb.Dn()
@ -17,10 +17,11 @@ Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
python/samba/dbchecker.py | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/dbchecker.py
--- samba-4.12.0_orig/python/samba/dbchecker.py 2020-01-31 18:25:36.000000000 +0800
+++ samba-4.12.0/python/samba/dbchecker.py 2020-03-19 15:08:15.433649691 +0800
@@ -114,10 +114,17 @@
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index c9341f6500c..f1debd1abea 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -109,10 +109,17 @@ class dbcheck(object):
self.expired_tombstones = 0
self.reset_all_well_known_acls = False
self.in_transaction = in_transaction
@ -41,7 +42,7 @@ diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/
self.ntds_dsa = ldb.Dn(samdb, samdb.get_dsServiceName())
self.class_schemaIDGUID = {}
self.wellknown_sds = get_wellknown_sds(self.samdb)
@@ -192,7 +199,9 @@
@@ -189,7 +196,9 @@ class dbcheck(object):
if len(forest) == 1:
self.dns_partitions.append((ldb.Dn(self.samdb, domaindns_zone), forest[0]))
@ -52,16 +53,22 @@ diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/
rid_master = get_fsmo_roleowner(self.samdb, fsmo_dn, "rid")
if ldb.Dn(self.samdb, self.samdb.get_dsServiceName()) == rid_master:
self.is_rid_master = True
@@ -2519,8 +2528,9 @@
controls += ["local_oid:%s:1" % dsdb.DSDB_CONTROL_DBCHECK_FIX_LINK_DN_NAME]
if parent_dn is None:
@@ -2623,13 +2632,14 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
parent_dn = obj.dn.parent()
- expected_dn = ldb.Dn(self.samdb, "RDN=RDN,%s" % (parent_dn))
+ expected_dn = ldb.Dn(self.samdb, "RDN=RDN")
expected_dn.set_component(0, obj.dn.get_rdn_name(), name_val)
+ expected_dn.add_base(parent_dn)
if obj.dn == deleted_objects_dn:
expected_dn = obj.dn
try:
- expected_dn = ldb.Dn(self.samdb, "RDN=RDN,%s" % (parent_dn))
+ expected_dn = ldb.Dn(self.samdb, "RDN=RDN")
except ValueError as e:
self.unfixable_errors += 1
self.report(f"ERROR: could not handle parent DN '{parent_dn}': "
"skipping RDN checks")
else:
expected_dn.set_component(0, obj.dn.get_rdn_name(), name_val)
+ expected_dn.add_base(parent_dn)
if obj.dn == deleted_objects_dn:
expected_dn = obj.dn
--
2.20.1
2.35.2

16
0002-samba-tool-dbcheck-Avoid-creating-an-RDN-via-ldb.Dn-.patch
View file

@ -1,4 +1,4 @@
From ea0d7ff3ae64d7eb7608b830920f3b5088b01925 Mon Sep 17 00:00:00 2001
From b1865aa643b7eabff45d7a512fadd222d015efb8 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 11 Mar 2019 13:48:29 +1300
Subject: [PATCH 2/2] samba-tool dbcheck: Avoid creating an RDN via ldb.Dn()
@ -19,10 +19,11 @@ Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
python/samba/dbchecker.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/dbchecker.py
--- samba-4.12.0_orig/python/samba/dbchecker.py 2020-01-31 18:25:36.000000000 +0800
+++ samba-4.12.0/python/samba/dbchecker.py 2020-03-19 15:14:13.881649351 +0800
@@ -892,8 +892,10 @@
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py
index f1debd1abea..da79b9ad8cb 100644
--- a/python/samba/dbchecker.py
+++ b/python/samba/dbchecker.py
@@ -944,8 +944,10 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
try:
nc_root = self.samdb.get_nc_root(obj.dn)
lost_and_found = self.samdb.get_wellknown_dn(nc_root, dsdb.DS_GUID_LOSTANDFOUND_CONTAINER)
@ -35,7 +36,7 @@ diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/
if self.do_rename(obj.dn, new_dn, lost_and_found, ["show_deleted:0", "relax:0"],
"Failed to rename object %s into lostAndFound at %s" % (obj.dn, new_dn + lost_and_found)):
self.report("Renamed object %s into lostAndFound at %s" % (obj.dn, new_dn + lost_and_found))
@@ -918,8 +920,10 @@
@@ -970,8 +972,10 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base)))
def err_wrong_dn(self, obj, new_dn, rdn_attr, rdn_val, name_val, controls):
'''handle a wrong dn'''
@ -49,4 +50,5 @@ diff -ruN samba-4.12.0_orig/python/samba/dbchecker.py samba-4.12.0/python/samba/
attributes = ""
--
2.20.1
2.35.2

12
samba.spec
View file

@ -111,8 +111,8 @@ Conflicts: %{1} < %{2}
Summary: Samba SMB server
Name: samba
Version: 4.17.4
Release: 3
Version: 4.18.3
Release: 1
Epoch: 1
License: GPLv3+
Group: System/Servers
@ -194,6 +194,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: icu-devel
BuildRequires: libtasn1-devel
BuildRequires: libtasn1-tools
BuildRequires: pkgconfig(libnsl)
%description
@ -297,8 +298,12 @@ Samba also features an AD domain capability.
%{_datadir}/samba/setup
%dir %{_datadir}/samba/admx
%{_datadir}/samba/admx/samba.admx
%{_datadir}/samba/admx/GNOME_Settings.admx
%dir %{_datadir}/samba/admx/en-US
%dir %{_datadir}/samba/admx/ru-RU
%{_datadir}/samba/admx/en-US/samba.adml
%{_datadir}/samba/admx/en-US/GNOME_Settings.adml
%{_datadir}/samba/admx/ru-RU/GNOME_Settings.adml
%attr(0755,root,root) %{_datadir}/%{name}/scripts/print-pdf
%{_mandir}/man8/samba.8*
%{_mandir}/man8/samba-gpupdate.8*
@ -445,6 +450,7 @@ Provides libraries for Samba
%{_libdir}/samba/liblibsmb-samba4.so
%{_libdir}/samba/libmessages-dgm-samba4.so
%{_libdir}/samba/libmessages-util-samba4.so
%{_libdir}/samba/libmscat-samba4.so
%{_libdir}/samba/libmsghdr-samba4.so
%{_libdir}/samba/libmsrpc3-samba4.so
%{_libdir}/samba/libndr-samba-samba4.so
@ -482,6 +488,7 @@ Provides libraries for Samba
%{_libdir}/samba/libsmbldaphelper-samba4.so
%{_libdir}/samba/libsmbpasswdparser-samba4.so
%{_libdir}/samba/libsocket-blocking-samba4.so
%{_libdir}/samba/libstable-sort-samba4.so
%{_libdir}/samba/libsys-rw-samba4.so
%{_libdir}/samba/libtalloc-report-samba4.so
%{_libdir}/samba/libtalloc-report-printf-samba4.so
@ -526,6 +533,7 @@ printing to SMB printers.
%files client
%{_bindir}/cifsdd
%{_bindir}/dbwrap_tool
%{_bindir}/dumpmscat
%{_bindir}/mvxattr
%{_bindir}/net
%{_bindir}/nmblookup