fw logger: cosmetic fixes

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/Makefile b/src/Makefile
index 7cea6b56e4fb69c13c801e4d9bed24a95b3efd5e..0f877e894f9a3ce75ff0c7c9256b015c9a3880b0 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -22,14 +22,12 @@ pve-firewall.zsh-completion: PVE/Service/pve_firewall.pm
        perl -I. -T -e "use PVE::Service::pve_firewall; PVE::Service::pve_firewall->generate_zsh_completions();" >$@.tmp
        mv $@.tmp $@
 
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+=$(shell pkg-config libnetfilter_log libnetfilter_conntrack glib-2.0 --libs --cflags)
 LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
 
 pvefw-logger: pvefw-logger.c
-       gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu99 \
-       $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-       $(shell pkg-config libnetfilter_log libnetfilter_conntrack glib-2.0 --libs --cflags)
+       gcc -Wall -Werror pvefw-logger.c -o pvefw-logger -std=gnu99 $(CFLAGS) $(LDFLAGS)
 
 .PHONY: install
 install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pve-firewall.zsh-completion pvefw-logger

diff --git a/src/pvefw-logger.c b/src/pvefw-logger.c
index b082f1e1b67992bde996969e70ab6c38d3d672bf..f76250516b92b61fc650c26f743520f024c74591 100644 (file)
--- a/src/pvefw-logger.c
+++ b/src/pvefw-logger.c
@@ -1,6 +1,6 @@
 /*
 
-  Copyright (C) 2014 Proxmox Server Solutions GmbH
+  Copyright (C) 2014 - 2021 Proxmox Server Solutions GmbH
 
   This software is written by Proxmox Server Solutions GmbH <support@proxmox.com>
 
@@ -65,7 +65,7 @@ gboolean conntrack = FALSE;
 
 LOG FORMAT:
 
-Special care was taken to allow fast parsing (and filer messages for a singl VM).
+Special care was taken to allow fast parsing and filering messages for a single VM.
 
 <VMID> <LOGLEVEL> <CHAIN> <TIME> <TIMEZONE> <MSG>