The branch, v4-21-test has been updated via 04913d3a42e Add check for the GPO link to have at least two attributes separated by semicolumn. Allows to handle empty links. via f6381830154 WHATSNEW: fix typo via b542e35437c third_party: Update socket_wrapper to version 1.4.4 from 693e4eaf28b VERSION: Bump version up to Samba 4.21.8...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-21-test - Log ----------------------------------------------------------------- commit 04913d3a42e816c8bc735d0e858aa9ddb45a57eb Author: Aleksandr Sharov <asha...@redhat.com> Date: Fri Jul 4 15:32:28 2025 +0200 Add check for the GPO link to have at least two attributes separated by semicolumn. Allows to handle empty links. BUG: https://bugzilla.samba.org/show_bug.cgi?id=15877 RN: Fix handling of empty GPO link Singed-off-by: Alex Sharov (kororl...@gmail.com) Reviewed-by: Douglas Bagnall <douglas.bagn...@catalyst.net.nz> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Jul 10 18:55:33 UTC 2025 on atb-devel-224 (cherry picked from commit 44ee31c0258b0afb3d3f2ce17942cc86e308a690) Autobuild-User(v4-21-test): Stefan Metzmacher <me...@samba.org> Autobuild-Date(v4-21-test): Thu Jul 31 14:51:55 UTC 2025 on atb-devel-224 commit f63818301548c1feade51034be4219a664f4028b Author: Jule Anger <jan...@samba.org> Date: Thu Jul 17 13:13:56 2025 +0200 WHATSNEW: fix typo Found by script/codespell.sh. Signed-off-by: Jule Anger <jan...@samba.org> commit b542e35437c382a4483a72f26b5cdbcf6179bdb9 Author: Andreas Schneider <a...@samba.org> Date: Wed Jan 22 15:37:07 2025 +0100 third_party: Update socket_wrapper to version 1.4.4 Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Thu Jan 23 11:28:32 UTC 2025 on atb-devel-224 (cherry picked from commit 2c44022c512e302e8a3787ca17188213f112e182) ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 2 +- buildtools/wafsamba/samba_third_party.py | 2 +- python/samba/gp/gpclass.py | 4 +++- third_party/socket_wrapper/socket_wrapper.c | 7 +++++++ third_party/socket_wrapper/wscript | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 127fd8a3811..b7733f52750 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -54,7 +54,7 @@ o Stefan Metzmacher <me...@samba.org> o Andreas Schneider <a...@samba.org> * BUG 15680: Trust domains are not created. - * BUG 15869: Startup messages of rpc deamons fills /var/log/messages. + * BUG 15869: Startup messages of rpc daemons fills /var/log/messages. ####################################### diff --git a/buildtools/wafsamba/samba_third_party.py b/buildtools/wafsamba/samba_third_party.py index d6fe609c896..0387328daec 100644 --- a/buildtools/wafsamba/samba_third_party.py +++ b/buildtools/wafsamba/samba_third_party.py @@ -24,7 +24,7 @@ Build.BuildContext.CHECK_CMOCKA = CHECK_CMOCKA @conf def CHECK_SOCKET_WRAPPER(conf): - return conf.CHECK_BUNDLED_SYSTEM_PKG('socket_wrapper', minversion='1.4.3') + return conf.CHECK_BUNDLED_SYSTEM_PKG('socket_wrapper', minversion='1.4.4') Build.BuildContext.CHECK_SOCKET_WRAPPER = CHECK_SOCKET_WRAPPER @conf diff --git a/python/samba/gp/gpclass.py b/python/samba/gp/gpclass.py index d86aacec138..07b4fb3e7bd 100644 --- a/python/samba/gp/gpclass.py +++ b/python/samba/gp/gpclass.py @@ -673,8 +673,10 @@ class GP_LINK: self.gp_opts = int(gPOptions) def gpo_parse_gplink(self, gPLink): + # normally formed link looks like [LDAP://host/path;options] + # empty link looks like [ ] for p in gPLink.decode().split(']'): - if not p: + if not p or ';' not in p: continue log.debug('gpo_parse_gplink: processing link') p = p.lstrip('[') diff --git a/third_party/socket_wrapper/socket_wrapper.c b/third_party/socket_wrapper/socket_wrapper.c index 37799c82419..db20eac4ba2 100644 --- a/third_party/socket_wrapper/socket_wrapper.c +++ b/third_party/socket_wrapper/socket_wrapper.c @@ -5110,6 +5110,13 @@ static int swrap_setsockopt(int s, int level, int optname, } if (level == SOL_SOCKET) { + /* + * SO_REUSEPORT is not supported on a unix socket. glibc 2.40 + * returns ENOTSUPP now. + */ + if (optname == SO_REUSEPORT) { + return 0; + } return libc_setsockopt(s, level, optname, diff --git a/third_party/socket_wrapper/wscript b/third_party/socket_wrapper/wscript index cdd34938ba3..370f6fc3070 100644 --- a/third_party/socket_wrapper/wscript +++ b/third_party/socket_wrapper/wscript @@ -2,7 +2,7 @@ import os -VERSION = "1.4.3" +VERSION = "1.4.4" def configure(conf): -- Samba Shared Repository