From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@link38.eu>
To: development@lists.ipfire.org
Subject: [PATCH 1/3 v2] allow remote syslog via TCP in syslogdctrl.c
Date: Sun, 19 Nov 2017 15:14:54 +0100
Message-ID: <20171119151454.26778013.peter.mueller@link38.eu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1824303449095338099=="
List-Id: <development.lists.ipfire.org>

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

Make syslogctrl.c use TCP as remote logging file if specified so.
Thanks to Michael for going through the first version of this.

Patches 2 and 3 of this series are still valid.

Signed-off-by: Peter M=C3=BCller <peter.mueller(a)link38.eu>
---
 src/misc-progs/syslogdctrl.c | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index 52719023e..589b6d009 100644
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -27,18 +27,19 @@
 #define ERR_ANY 1
 #define ERR_SETTINGS 2    /* error in settings file */
 #define ERR_ETC 3         /* error with /etc permissions */
-#define ERR_CONFIG 4      /* error updated sshd_config */
+#define ERR_CONFIG 4      /* error updated rsyslogd config */
 #define ERR_SYSLOG 5      /* error restarting syslogd */
=20
 int main(void)
 {
-   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE];
+   char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE]; pr=
otocol[STRING_SIZE];
    char varmessages[STRING_SIZE], asynclog[STRING_SIZE];
    int config_fd,rc,fd,pid;
    struct stat st;
    struct keyvalue *kv =3D NULL;
    memset(buffer, 0, STRING_SIZE);
    memset(hostname, 0, STRING_SIZE);
+   memset(protocol, 0, STRING_SIZE);
    memset(varmessages, 0, STRING_SIZE);
    memset(asynclog, 0, STRING_SIZE);
=20
@@ -67,6 +68,12 @@ int main(void)
       exit(ERR_SETTINGS);
    }
=20
+   if (!findkey(kv, "REMOTELOG_PROTOCOL", protocol))
+   {
+      /* fall back to UDP if no protocol was given */
+      protocol =3D "udp";
+   }
+
    if (strspn(hostname, VALID_FQDN) !=3D strlen(hostname))
    {
       fprintf(stderr, "Bad REMOTELOG_ADDR: %s\n", hostname);
@@ -106,8 +113,19 @@ int main(void)
    }
=20
    if (!strcmp(buffer,"on"))
-      snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:=
blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+      /* check which transmission protocol was given */
+      if (strcmp(protocol, "udp"))
+      {
+         /* write line for UDP */
+         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*=
[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
+      }
+      if (strcmp(protocol, "tcp"))
+      {
+         /* write line for TCP */
+         snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*=
[[:blank:]]\\+@@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd =
);
+      }
    else
+      /* if remote syslog has been disabled */
       snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:=
blank:]]\\+(a).\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
=20
      /* if the return code isn't 0 failsafe */
--=20
2.13.6

--===============1824303449095338099==--