Attachment 18234 Details for Bug 15548 – patch for 4.19

[patch] patch for 4.19

v4-19-samba-fix-gpupdate-site.patch (text/plain), 2.60 KB, created by Andreas Schneider on 2024-01-23 15:09:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2024-01-23 15:09:20 UTC

Size: 2.60 KB

patch

obsolete

>From cd130287c034f29bde23bfee330d1fc8675f64c1 Mon Sep 17 00:00:00 2001
>From: David Mulder <dmulder@samba.org>
>Date: Fri, 5 Jan 2024 08:47:07 -0700
>Subject: [PATCH] gp: Skip site GP list if no site is found
>
>[MS-GPOL] 3.2.5.1.4 Site Search says if the site
>search returns ERROR_NO_SITENAME, the GP site
>search should be skipped.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15548
>
>Signed-off-by: David Mulder <dmulder@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
>Autobuild-Date(master): Tue Jan 23 11:20:35 UTC 2024 on atb-devel-224
>
>(cherry picked from commit f05b61b4991e7f51bd184d76a79f8b50114a0ff3)
>---
> python/samba/gp/gpclass.py | 30 ++++++++++++++++++------------
> 1 file changed, 18 insertions(+), 12 deletions(-)
>
>diff --git a/python/samba/gp/gpclass.py b/python/samba/gp/gpclass.py
>index 617ef79350c..babd8f90748 100644
>--- a/python/samba/gp/gpclass.py
>+++ b/python/samba/gp/gpclass.py
>@@ -866,19 +866,25 @@ def get_gpo_list(dc_hostname, creds, lp, username):
> 
>     # (S)ite
>     if gpo_list_machine:
>-        site_dn = site_dn_for_machine(samdb, dc_hostname, lp, creds, username)
>-
>         try:
>-            log.debug("get_gpo_list: query SITE: [%s] for GPOs" % site_dn)
>-            gp_link = get_gpo_link(samdb, site_dn)
>-        except ldb.LdbError as e:
>-            (enum, estr) = e.args
>-            log.debug(estr)
>-        else:
>-            add_gplink_to_gpo_list(samdb, gpo_list, forced_gpo_list,
>-                                   site_dn, gp_link,
>-                                   gpo.GP_LINK_SITE,
>-                                   add_only_forced_gpos, token)
>+            site_dn = site_dn_for_machine(samdb, dc_hostname, lp, creds, username)
>+
>+            try:
>+                log.debug("get_gpo_list: query SITE: [%s] for GPOs" % site_dn)
>+                gp_link = get_gpo_link(samdb, site_dn)
>+            except ldb.LdbError as e:
>+                (enum, estr) = e.args
>+                log.debug(estr)
>+            else:
>+                add_gplink_to_gpo_list(samdb, gpo_list, forced_gpo_list,
>+                                       site_dn, gp_link,
>+                                       gpo.GP_LINK_SITE,
>+                                       add_only_forced_gpos, token)
>+        except ldb.LdbError:
>+            # [MS-GPOL] 3.2.5.1.4 Site Search: If the method returns
>+            # ERROR_NO_SITENAME, the remainder of this message MUST be skipped
>+            # and the protocol sequence MUST continue at GPO Search
>+            pass
> 
>     # (L)ocal
>     gpo_list.insert(0, gpo.GROUP_POLICY_OBJECT("Local Policy",
>-- 
>2.43.0
>

Flags:

asn: review? (dmulder)
pfilipensky: review+

Actions: View

Attachments on bug 15548: 18219 | 18234