d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the FQDN in the newsyslog log message when RFC 5424 is enabled.

Browse Source 
The RFC 5424 spec mentions that logging FQDNs over short hostnames is
preferred. Alter this code, so that the hostname doesn't get truncated
on startup. Keep track of the length of the short hostname, so that
fprintf() can do the truncation where necessary.

MFC after:	1 month
This commit is contained in:
Ed Schouten 2018-07-08 10:08:24 +00:00
parent 007b82d7ab
commit 30dd2da2a3
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.sbin/newsyslog/newsyslog.c
View File

@ -271,6 +271,7 @@ static char daytime[DAYTIME_LEN];/* The current time in human readable form,
static char daytime_rfc5424[DAYTIME_RFC5424_LEN];
static char hostname[MAXHOSTNAMELEN]; /* hostname */
static size_t hostname_shortlen;
static const char *path_syslogpid = _PATH_SYSLOGPID;
@ -657,10 +658,7 @@ parse_args(int argc, char **argv)
/* Let's get our hostname */
(void)gethostname(hostname, sizeof(hostname));
/* Truncate domain */
if ((p = strchr(hostname, '.')) != NULL)
*p = '\0';
hostname_shortlen = strcspn(hostname, ".");
/* Parse command line options. */
while ((ch = getopt(argc, argv, "a:d:f:nrst:vCD:FNPR:S:")) != -1)
@ -2349,14 +2347,20 @@ log_trim(const char *logname, const struct conf_entry *log_ent)
}
} else {
if (log_ent->firstcreate)
fprintf(f, "%s %s newsyslog[%d]: logfile first created%s\n",
daytime, hostname, getpid(), xtra);
fprintf(f,
"%s %.*s newsyslog[%d]: logfile first created%s\n",
daytime, (int)hostname_shortlen, hostname, getpid(),
xtra);
else if (log_ent->r_reason != NULL)
fprintf(f, "%s %s newsyslog[%d]: logfile turned over%s%s\n",
daytime, hostname, getpid(), log_ent->r_reason, xtra);
fprintf(f,
"%s %.*s newsyslog[%d]: logfile turned over%s%s\n",
daytime, (int)hostname_shortlen, hostname, getpid(),
log_ent->r_reason, xtra);
else
fprintf(f, "%s %s newsyslog[%d]: logfile turned over%s\n",
daytime, hostname, getpid(), xtra);
fprintf(f,
"%s %.*s newsyslog[%d]: logfile turned over%s\n",
daytime, (int)hostname_shortlen, hostname, getpid(),
xtra);
}
if (fclose(f) == EOF)
err(1, "log_trim: fclose");