Attachment 18675 Details for Bug 15663 – patch from master for v4-22-test

[patch] patch from master for v4-22-test

v4-22-test.patch (text/plain), 1.62 KB, created by Guenther Deschner on 2025-07-22 10:30:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guenther Deschner

Created: 2025-07-22 10:30:40 UTC

Size: 1.62 KB

patch

obsolete

>From 4ff6486ba73511c5bbfb43a7192e9eb5011058ec Mon Sep 17 00:00:00 2001
>From: Rabinarayan Panigrahi <rapanigr@redhat.com>
>Date: Tue, 15 Jul 2025 21:15:49 +0530
>Subject: [PATCH] vfs_virsufilter: Fix the invocation of SMB_VFS_NEXT_CONNECT
>
>virusfilter is failing if path is defined for virusfilter:quarantine
>as next module is not initialized by mean time. So rearranged invocation
>of SMB_VFS_NEXT_CONNECT call
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15663
>
>Signed-off-by: Rabinarayan Panigrahi <rapanigr@redhat.com>
>Reviewed-by: Anoop C S <anoopcs@samba.org>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>Reviewed-by: Ralph Boehme <slow@samba.org>
>
>Autobuild-User(master): Anoop C S <anoopcs@samba.org>
>Autobuild-Date(master): Mon Jul 21 11:28:12 UTC 2025 on atb-devel-224
>
>(cherry picked from commit 605d4d065cd5951385a744230cf7f159468c02a2)
>---
> source3/modules/vfs_virusfilter.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/source3/modules/vfs_virusfilter.c b/source3/modules/vfs_virusfilter.c
>index c0cf9ff78db..547dd172b86 100644
>--- a/source3/modules/vfs_virusfilter.c
>+++ b/source3/modules/vfs_virusfilter.c
>@@ -219,6 +219,11 @@ static int virusfilter_vfs_connect(
> 	int ret = -1;
> 	bool ok;
> 
>+	ret = SMB_VFS_NEXT_CONNECT(handle, svc, user);
>+	if (ret < 0) {
>+		return ret;
>+	}
>+
> 	config = talloc_zero(handle, struct virusfilter_config);
> 	if (config == NULL) {
> 		DBG_ERR("talloc_zero failed\n");
>@@ -578,7 +583,7 @@ static int virusfilter_vfs_connect(
> 		}
> 	}
> 
>-	return SMB_VFS_NEXT_CONNECT(handle, svc, user);
>+	return 0;
> }
> 
> static void virusfilter_vfs_disconnect(struct vfs_handle_struct *handle)
>-- 
>2.50.1
>

Flags:

gd: review? (slow)
anoopcs: review+
gd: ci-passed+

Actions: View

Attachments on bug 15663: 18675 | 18676