Attachment 18611 Details for Bug 15823 – Patch for 4.22 and 4.21 cherry-picked from master

[patch] Patch for 4.22 and 4.21 cherry-picked from master

bug15823-v421,v422.patch (text/plain), 1.27 KB, created by Ralph Böhme on 2025-03-17 14:43:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2025-03-17 14:43:23 UTC

Size: 1.27 KB

patch

obsolete

>From f82abb52d0baef6d7aef1a8a002620c3c2642644 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 10 Mar 2025 14:29:23 +0100
>Subject: [PATCH] s3/lib: fix matching interfaces with multiple assigned IPs
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15823
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: BjÃ¶rn Jacke <bjacke@samba.org>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Wed Mar 12 01:32:30 UTC 2025 on atb-devel-224
>
>(cherry picked from commit b85f056e7312ea9839b6fda617132fcc956da3c1)
>---
> source3/lib/interface.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/source3/lib/interface.c b/source3/lib/interface.c
>index 032362b4da38..5f351999e41f 100644
>--- a/source3/lib/interface.c
>+++ b/source3/lib/interface.c
>@@ -624,9 +624,12 @@ static void interpret_interface(char *token)
> 				}
> 				add_interface(&probed_ifaces[i]);
> 				probed_ifaces[i].netmask = saved_mask;
>-				return;
>+				added = true;
> 			}
> 		}
>+		if (added) {
>+			return;
>+		}
> 		DEBUG(2,("interpret_interface: Can't determine ip for "
> 			"broadcast address %s\n",
> 			token));
>-- 
>2.47.0
>

Flags:

martins: review+

Actions: View

Attachments on bug 15823: 18611