From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka 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 16:05:49 +0100 Message-ID: <403129ee-2807-41b0-8fc0-06ca504967b8@ipfire.org> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4472306798723941902==" List-Id: --===============4472306798723941902== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Michael, On 12/01/2024 14:16, Michael Tremer wrote: > Hello Adolf, >=20 > Did hard-coding the interfaces cause any problems so that this patch is nec= essary? It has been like that for samba since it was updated to samba-4 and no=20 one has ever complained so I doubt it is an actual problem. When I tested running the wsdd script with both green0 and blue0 on a=20 system that only had red0 and green0 the script still started without=20 any complaints although I could not test if wsdd worked in that mode=20 without any problems from a windows system. The wsdd code now has the checks for which interfaces are actually=20 available so the current code will only use blue0 if it is actually=20 present. So it doesn't get set up based on the interfaces that samba has=20 defined in its config file. So samba.cgi could be left as it is and I would not expect any issues to=20 occur. The only reason I changed it was because it didn't seem right to have=20 samba happily running without any warnings with a config file defining=20 an interface that did not exist. Regards, Adolf. >=20 > It definitely is cleaner, I am just curious if there were any downsides bef= ore=E2=80=A6 >=20 > -Michael >=20 >> On 10 Jan 2024, at 13:30, Adolf Belka wrote: >> >> - 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 interfac= es line only >> had green0 and in the second it had green0 and blue0 so interfaces is c= orrectly >> 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 =3D (); >> my %mainsettings =3D (); >> my $message =3D ""; >> my $errormessage =3D ""; >> +my $interfaces =3D "green0"; >> >> 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); >> >> +if ($netsettings{'BLUE_DEV'} ne ''){ >> + $interfaces =3D $interfaces . " blue0"; >> +} >> + >> ##########################################################################= ################################################## >> #################################### Initialisierung von Samba Variablen f= r global Settings ############################### >> >> @@ -792,7 +797,7 @@ guest account =3D $sambasettings{'GUESTACCOUNT'} >> unix password sync =3D no >> >> 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'} >> >> 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 =3D 4.19.3 >> +VER =3D 4.19.2 >> SUMMARY =3D A SMB/CIFS File, Print, and Authentication Server >> >> 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 >> >> -DEPS =3D avahi cups perl-Parse-Yapp perl-JSON >> +DEPS =3D avahi cups perl-Parse-Yapp perl-JSON wsdd >> >> SERVICES =3D samba >> >> @@ -47,7 +47,7 @@ objects =3D $(DL_FILE) >> >> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> >> -$(DL_FILE)_BLAKE2 =3D f83af3b50d795bdc4a250fe96040721150acc3b8effddd473e3= cfa3ef6eeec99928b1307a18a472be45049e1d0b74650b9f6dd4bf5c434277c94ab88cb493b3b >> +$(DL_FILE)_BLAKE2 =3D cb3747f1be6e712c6e68f3720e68aee7db2e4dcc48a9210d002= 337d6690ed8b027919f333dc4a7c1e74b716ebceeff1d8071463899513edfe51da967d71d8148 >> >> install : $(TARGET) >> >> --=20 >> 2.43.0 >> >=20 --=20 Sent from my laptop --===============4472306798723941902==--