diff --git a/.gitea/workflows/arch.yaml b/.gitea/workflows/arch.yaml index dd304de..3ee3697 100644 --- a/.gitea/workflows/arch.yaml +++ b/.gitea/workflows/arch.yaml @@ -68,7 +68,7 @@ jobs: - name: Installing archlinux package run: | ls -la - pacman --noconfirm -v -U bforce-r*.pkg.tar.zst + pacman --noconfirm -v -U bforce-*.pkg.tar.zst cd ${{ github.workspace }}/tests echo '-----------------------------------------' ls -la diff --git a/contrib/systemd/bforce.service b/contrib/systemd/bforce.service index 9b2463a..83bee07 100644 --- a/contrib/systemd/bforce.service +++ b/contrib/systemd/bforce.service @@ -6,7 +6,7 @@ Type=forking PIDFile=/tmp/bforce.pid User=fido Group=fido -ExecStart=/usr/bin/bforce -d -C /opt/fidonms/etc/bforce.conf +ExecStart=/usr/bin/bforce -d -C /etc/bforce/bforce.conf ExecStop=/usr/bin/bforce -q [Install] diff --git a/contrib/xinetd.d/bforce-binkp b/contrib/xinetd.d/bforce-binkp index fcddb5f..2f2c118 100644 --- a/contrib/xinetd.d/bforce-binkp +++ b/contrib/xinetd.d/bforce-binkp @@ -9,5 +9,5 @@ service binkp wait = no user = fido server = /usr/bin/bforce - server_args = -C /opt/fidonms/etc/bforce.conf -i binkp + server_args = -C /etc/bforce/bforce.conf -i binkp } diff --git a/contrib/xinetd.d/bforce-ifcico b/contrib/xinetd.d/bforce-ifcico index 2d47a70..407d362 100644 --- a/contrib/xinetd.d/bforce-ifcico +++ b/contrib/xinetd.d/bforce-ifcico @@ -9,5 +9,5 @@ service ifc wait = no user = fido server = /usr/bin/bforce - server_args = -C /opt/fidonms/etc/bforce.conf -i auto -} \ No newline at end of file + server_args = -C /etc/bforce/bforce.conf -i auto +} diff --git a/source/bforce/expression.tab.c b/source/bforce/expression.tab.c index 36ead6c..72eb1eb 100644 --- a/source/bforce/expression.tab.c +++ b/source/bforce/expression.tab.c @@ -1780,7 +1780,14 @@ static int expr_check_mailer(const char *str) static int expr_check_addr(const char *str) { - s_faddr addr; + s_faddr addr = { + .inetform = false, + .zone = 0, + .net = 0, + .node = 0, + .point = 0, + .domain = '\0' }; + #ifdef DEBUG char abuf1[BF_MAXADDRSTR+1]; char abuf2[BF_MAXADDRSTR+1]; diff --git a/source/bforce/expression.y b/source/bforce/expression.y index 0dd88b7..0c60416 100644 --- a/source/bforce/expression.y +++ b/source/bforce/expression.y @@ -360,7 +360,13 @@ static int expr_check_mailer(const char *str) static int expr_check_addr(const char *str) { - s_faddr addr = { 0, 0, 0, 0, 0, '\0' }; + s_faddr addr = { + .inetform = false, + .zone = 0, + .net = 0, + .node = 0, + .point = 0, + .domain = '\0' }; #ifdef DEBUG char abuf1[BF_MAXADDRSTR+1]; diff --git a/source/bforce/os_unix.c b/source/bforce/os_unix.c index 36317d2..8bb9f38 100644 --- a/source/bforce/os_unix.c +++ b/source/bforce/os_unix.c @@ -155,7 +155,7 @@ int exec_redirect_descriptor(int desc, const char *fname, int flags) close(fd); return -1; } - +//cppcheck-suppress resourceLeak return 0; }