From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject:
 Re: [PATCH 2/2] samba: Add wsdd to lfs and update samba.cgi - fixes bug13445
Date: Fri, 12 Jan 2024 13:16:11 +0000
Message-ID: <AA4DD8FA-AD03-4C99-842A-2B490BAFA6FE@ipfire.org>
In-Reply-To: <20240110133021.6325-2-adolf.belka@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3098683020910883306=="
List-Id: <development.lists.ipfire.org>

--===============3098683020910883306==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Hello Adolf,

Did hard-coding the interfaces cause any problems so that this patch is neces=
sary?

It definitely is cleaner, I am just curious if there were any downsides befor=
e=E2=80=A6

-Michael

> On 10 Jan 2024, at 13:30, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>=20
> - 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 i=
s installed
>   and to add either "green0" or "green0 blue0" to the interfaces line in th=
e 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 cor=
rectly
>   defined now.
>=20
> Fixes: Bug13445
> Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> html/cgi-bin/samba.cgi |  9 +++++++--
> lfs/samba              | 10 +++++-----
> 2 files changed, 12 insertions(+), 7 deletions(-)
>=20
> 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  <info(a)ipfire.org>               =
      #
> +# Copyright (C) 2005-2024  IPFire Team  <info(a)ipfire.org>               =
      #
> #                                                                          =
   #
> # 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 =3D ();
> my %mainsettings =3D ();
> my $message =3D "";
> my $errormessage =3D "";
> +my $interfaces =3D "green0";
>=20
> my $userentry =3D "";
> my @user =3D ();
> @@ -50,6 +51,10 @@ my %shares =3D &config("${General::swroot}/samba/shares"=
);
> &General::readhash("${General::swroot}/main/settings", \%mainsettings);
> &General::readhash("/srv/web/ipfire/html/themes/ipfire/include/colors.txt",=
 \%color);
>=20
> +if ($netsettings{'BLUE_DEV'} ne ''){
> + $interfaces =3D $interfaces . " blue0";
> +}
> +
> ###########################################################################=
#################################################
> #################################### Initialisierung von Samba Variablen fr=
 global Settings ###############################
>=20
> @@ -792,7 +797,7 @@ guest account =3D $sambasettings{'GUESTACCOUNT'}
> unix password sync =3D no
>=20
> bind interfaces only =3D true
> -interfaces =3D green0 blue0 127.0.0.0/8
> +interfaces =3D $interfaces 127.0.0.0/8
> remote announce =3D $sambasettings{'REMOTEANNOUNCE'}
> remote browse sync =3D $sambasettings{'REMOTESYNC'}
>=20
> 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  <info(a)ipfire.org>               =
      #
> +# Copyright (C) 2007-2024  IPFire Team  <info(a)ipfire.org>               =
      #
> #                                                                          =
   #
> # 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 @@
>=20
> include Config
>=20
> -VER        =3D 4.19.3
> +VER        =3D 4.19.2
> SUMMARY    =3D A SMB/CIFS File, Print, and Authentication Server
>=20
> THISAPP    =3D samba-$(VER)
> @@ -33,9 +33,9 @@ DL_FROM    =3D $(URL_IPFIRE)
> DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
> TARGET     =3D $(DIR_INFO)/$(THISAPP)
> PROG       =3D samba
> -PAK_VER    =3D 98
> +PAK_VER    =3D 99
>=20
> -DEPS       =3D avahi cups perl-Parse-Yapp perl-JSON
> +DEPS       =3D avahi cups perl-Parse-Yapp perl-JSON wsdd
>=20
> SERVICES   =3D samba
>=20
> @@ -47,7 +47,7 @@ objects =3D $(DL_FILE)
>=20
> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
>=20
> -$(DL_FILE)_BLAKE2 =3D f83af3b50d795bdc4a250fe96040721150acc3b8effddd473e3c=
fa3ef6eeec99928b1307a18a472be45049e1d0b74650b9f6dd4bf5c434277c94ab88cb493b3b
> +$(DL_FILE)_BLAKE2 =3D cb3747f1be6e712c6e68f3720e68aee7db2e4dcc48a9210d0023=
37d6690ed8b027919f333dc4a7c1e74b716ebceeff1d8071463899513edfe51da967d71d8148
>=20
> install : $(TARGET)
>=20
> --=20
> 2.43.0
>=20


--===============3098683020910883306==--