webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-05-10 17:28:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

allow remote syslog via TCP in syslogdctrl.c

Browse Source 
Make syslogctrl.c use TCP as remote logging file if specified so.

Thanks to Michael for reviewing this.

Signed-off-by: Peter Müller <peter.mueller@link38.eu>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Peter Müller
2017-11-20 19:40:11 +01:00
committed by Michael Tremer
parent e9a57acd12
commit cbd1f0e719
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/misc-progs/syslogdctrl.c
View File

@@ -27,18 +27,19 @@
#define ERR_ANY 1 #define ERR_ANY 1
#define ERR_SETTINGS 2 /* error in settings file */ #define ERR_SETTINGS 2 /* error in settings file */
#define ERR_ETC 3 /* error with /etc permissions */ #define ERR_ETC 3 /* error with /etc permissions */
#define ERR_CONFIG 4 /* error updated sshd_config */ #define ERR_CONFIG 4 /* error updating syslogd config */
#define ERR_SYSLOG 5 /* error restarting syslogd */ #define ERR_SYSLOG 5 /* error restarting syslogd */
int main(void) int main(void)
{ {
char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE]; char buffer[STRING_SIZE], command[STRING_SIZE], hostname[STRING_SIZE], protocol[STRING_SIZE];
char varmessages[STRING_SIZE], asynclog[STRING_SIZE]; char varmessages[STRING_SIZE], asynclog[STRING_SIZE];
int config_fd,rc,fd,pid; int config_fd,rc,fd,pid;
struct stat st; struct stat st;
struct keyvalue *kv = NULL; struct keyvalue *kv = NULL;
memset(buffer, 0, STRING_SIZE); memset(buffer, 0, STRING_SIZE);
memset(hostname, 0, STRING_SIZE); memset(hostname, 0, STRING_SIZE);
memset(protocol, 0, STRING_SIZE);
memset(varmessages, 0, STRING_SIZE); memset(varmessages, 0, STRING_SIZE);
memset(asynclog, 0, STRING_SIZE); memset(asynclog, 0, STRING_SIZE);
@@ -67,6 +68,12 @@ int main(void)
exit(ERR_SETTINGS); exit(ERR_SETTINGS);
} }
if (!findkey(kv, "REMOTELOG_PROTOCOL", protocol))
{
/* fall back to UDP if no protocol was given */
protocol = "udp";
}
if (strspn(hostname, VALID_FQDN) != strlen(hostname)) if (strspn(hostname, VALID_FQDN) != strlen(hostname))
{ {
fprintf(stderr, "Bad REMOTELOG_ADDR: %s\n", hostname); fprintf(stderr, "Bad REMOTELOG_ADDR: %s\n", hostname);
@@ -106,9 +113,24 @@ int main(void)
} }
if (!strcmp(buffer,"on")) 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, "tcp") == 0)
{
/* write line for TCP */
snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
}
else
{
/* write line for UDP */
snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@\\).\\+$/\\1%s/' /etc/syslog.conf >&%d", hostname, config_fd );
}
}
else else
{
/* if remote syslog has been disabled */
snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd ); snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
}
/* if the return code isn't 0 failsafe */ /* if the return code isn't 0 failsafe */
if ((rc = unpriv_system(buffer,99,99)) != 0) if ((rc = unpriv_system(buffer,99,99)) != 0)