From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/2] urlfilterctrl: Fix bug#10649 - add option to remove urlfilter from fcron directories Date: Tue, 26 Sep 2023 16:07:00 +0200 Message-ID: <20230926140701.3438340-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4960419480506962277==" List-Id: --===============4960419480506962277== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Currently if the urlfilter update is enabled then autoupdate.pl is renamed = urlfilter and added into either the daily, weekly or monthly fcron directoiries. If the = update is disabled then the urlfilter update script stays in the directory and is no= t removed. - This patch adds in the option of remove to the urlfilterctrl program. The f= irst part of the urlfilterctrl.c code removes any existing symlinks so all that need= s to be done for the remove option is to not add any symlinks to the fcron directories. - Confirmed in a vm testbed that the current approach leaves the symlink in p= lace. Installed the changes from this and the previous patch and confirmed that when the u= rl update is disabled the symlink is removed. Fixes: Bug#10649 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- src/misc-progs/urlfilterctrl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/misc-progs/urlfilterctrl.c b/src/misc-progs/urlfilterctrl.c index 28dc03075..a11d6d041 100644 --- a/src/misc-progs/urlfilterctrl.c +++ b/src/misc-progs/urlfilterctrl.c @@ -24,6 +24,8 @@ int main(int argc, char *argv[]){ safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.wee= kly/urlfilter"); } else if (strcmp(argv[2], "monthly") =3D=3D 0){ safe_system("ln -s /var/ipfire/urlfilter/bin/autoupdate.pl /etc/fcron.mon= thly/urlfilter"); + } else if (strcmp(argv[2], "remove") =3D=3D 0){ + // Don't add urlfilter into any fcron directory }else{ printf("invalid parameter(s)\n"); return(1); --=20 2.42.0 --===============4960419480506962277==--