From patchwork Wed Jan 10 13:30:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7441 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4T9lVp04W1z3wdf for ; Thu, 11 Jan 2024 13:14:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4T9lVh4Trbz2s7; Thu, 11 Jan 2024 13:14:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4T9lVh1rCxz32gv; Thu, 11 Jan 2024 13:14:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4T97w60K0Hz32h0 for ; Wed, 10 Jan 2024 13:30:30 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4T97w520Gcz1FC; Wed, 10 Jan 2024 13:30:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1704893429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RbWnW152A0hB9hBnbF5SZB8960+YmNqn8dKLOijCFGI=; b=XS8ozjii4DxoyYYgdQx2vk8j3ghNs2L6Jts+3d4/zVLXZInC+volQEj6q5RUYQ6ygX70sW aMTCVSCGL2Cl5KDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1704893429; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RbWnW152A0hB9hBnbF5SZB8960+YmNqn8dKLOijCFGI=; b=QGzA4YhycJEF7TSo452EUQxuDHnGX6Nf/LPzJ2GgrdV/2UGbTw/0eagJPc6xmQEjcxawGI xW49NpT03Fd3TqFrob+/D7I+Tfd+5ISC1J4HUtFXQwDFc87nExfR2GRGp+GE/Dkj94/C1p lHQnrqUT7I1/h3jd4NeFcSDRCbc+RvPRFv+mlAqLGZ2yuq8/qm/I/vk1PxmqWtoBr1o0Qk Mp7pyDygnsRUBKzmexiCOP6Ew4laRE4TFkH0dd4Trevn8yCPjosXt3SdlFPT31WN4HUGu+ PWTOMXlEZx68uhnth3GAqi5cwc2S2OhERhuKJ16eia29TESGhmksBFpNSyqkyQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] samba: Add wsdd to lfs and update samba.cgi - fixes bug13445 Date: Wed, 10 Jan 2024 14:30:21 +0100 Message-ID: <20240110133021.6325-2-adolf.belka@ipfire.org> In-Reply-To: <20240110133021.6325-1-adolf.belka@ipfire.org> References: <20240110133021.6325-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: UXXIZSIHT3KAX46ZBKJFKVN4U4LEYIKD X-Message-ID-Hash: UXXIZSIHT3KAX46ZBKJFKVN4U4LEYIKD X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - Added wsdd as dependency to the samba lfs - Previously samba defines both a green0 and blue0 interface even when the system does not have a blue0 interface. Code in samba.cgi modified to identify if blue0 is installed and to add either "green0" or "green0 blue0" to the interfaces line in the samba global and smb.conf files. - Tested out on a vm testbed and confirmed by testing it on a vm with only red and green and another with red, green, blue and orange. In the first the interfaces line only had green0 and in the second it had green0 and blue0 so interfaces is correctly defined now. Fixes: Bug13445 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- html/cgi-bin/samba.cgi | 9 +++++++-- lfs/samba | 10 +++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index c60dca1d4..fe68484fe 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2013 IPFire Team # +# Copyright (C) 2005-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -36,6 +36,7 @@ my %color = (); my %mainsettings = (); my $message = ""; my $errormessage = ""; +my $interfaces = "green0"; my $userentry = ""; my @user = (); @@ -50,6 +51,10 @@ my %shares = &config("${General::swroot}/samba/shares"); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt", \%color); +if ($netsettings{'BLUE_DEV'} ne ''){ + $interfaces = $interfaces . " blue0"; +} + ############################################################################################################################ #################################### Initialisierung von Samba Variablen fr global Settings ############################### @@ -792,7 +797,7 @@ guest account = $sambasettings{'GUESTACCOUNT'} unix password sync = no bind interfaces only = true -interfaces = green0 blue0 127.0.0.0/8 +interfaces = $interfaces 127.0.0.0/8 remote announce = $sambasettings{'REMOTEANNOUNCE'} remote browse sync = $sambasettings{'REMOTESYNC'} diff --git a/lfs/samba b/lfs/samba index 7ebac8ded..c64b5476b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2023 IPFire Team # +# Copyright (C) 2007-2024 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.19.3 +VER = 4.19.2 SUMMARY = A SMB/CIFS File, Print, and Authentication Server THISAPP = samba-$(VER) @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = samba -PAK_VER = 98 +PAK_VER = 99 -DEPS = avahi cups perl-Parse-Yapp perl-JSON +DEPS = avahi cups perl-Parse-Yapp perl-JSON wsdd SERVICES = samba @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = f83af3b50d795bdc4a250fe96040721150acc3b8effddd473e3cfa3ef6eeec99928b1307a18a472be45049e1d0b74650b9f6dd4bf5c434277c94ab88cb493b3b +$(DL_FILE)_BLAKE2 = cb3747f1be6e712c6e68f3720e68aee7db2e4dcc48a9210d002337d6690ed8b027919f333dc4a7c1e74b716ebceeff1d8071463899513edfe51da967d71d8148 install : $(TARGET)