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

Remove some places where error messages are prefixed with "syslogd".

Browse Source 
Due to using RFC 5424, the application name is stored in a dedicated
field. It can simply be passed as an argument to logmsg() now.
This commit is contained in:
Ed Schouten 2018-04-06 16:26:46 +00:00
parent 10b154332d
commit 228e9d5bd8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=332111
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/syslogd/syslogd.c
View File

@ -1991,7 +1991,7 @@ domark(int signo __unused)
* Print syslogd errors some place.
*/
static void
logerror(const char *type)
logerror(const char *msg)
{
char buf[512];
static int recursed = 0;
@ -2000,15 +2000,15 @@ logerror(const char *type)
if (recursed)
return;
recursed++;
if (errno)
(void)snprintf(buf,
sizeof buf, "syslogd: %s: %s", type, strerror(errno));
else
(void)snprintf(buf, sizeof buf, "syslogd: %s", type);
if (errno != 0) {
(void)snprintf(buf, sizeof(buf), "%s: %s", msg,
strerror(errno));
msg = buf;
}
errno = 0;
dprintf("%s\n", buf);
logmsg(LOG_SYSLOG|LOG_ERR, NULL, LocalHostName, NULL, NULL, NULL,
NULL, buf, 0);
logmsg(LOG_SYSLOG|LOG_ERR, NULL, LocalHostName, "syslogd", NULL, NULL,
NULL, msg, 0);
recursed--;
}
@ -2355,18 +2355,18 @@ init(int signo)
}
}
logmsg(LOG_SYSLOG|LOG_INFO, NULL, LocalHostName, NULL, NULL, NULL,
NULL, "syslogd: restart", 0);
logmsg(LOG_SYSLOG | LOG_INFO, NULL, LocalHostName, "syslogd", NULL,
NULL, NULL, "restart", 0);
dprintf("syslogd: restarted\n");
/*
* Log a change in hostname, but only on a restart.
*/
if (signo != 0 && strcmp(oldLocalHostName, LocalHostName) != 0) {
(void)snprintf(hostMsg, sizeof(hostMsg),
"syslogd: hostname changed, \"%s\" to \"%s\"",
"hostname changed, \"%s\" to \"%s\"",
oldLocalHostName, LocalHostName);
logmsg(LOG_SYSLOG|LOG_INFO, NULL, LocalHostName, NULL, NULL,
NULL, NULL, hostMsg, 0);
logmsg(LOG_SYSLOG | LOG_INFO, NULL, LocalHostName, "syslogd",
NULL, NULL, NULL, hostMsg, 0);
dprintf("%s\n", hostMsg);
}
/*
@ -2375,9 +2375,9 @@ init(int signo)
*/
if (signo == 0 && !use_bootfile) {
(void)snprintf(bootfileMsg, sizeof(bootfileMsg),
"syslogd: kernel boot file is %s", bootfile);
logmsg(LOG_KERN|LOG_INFO, NULL, LocalHostName, NULL, NULL,
NULL, NULL, bootfileMsg, 0);
"kernel boot file is %s", bootfile);
logmsg(LOG_KERN | LOG_INFO, NULL, LocalHostName, "syslogd",
NULL, NULL, NULL, bootfileMsg, 0);
dprintf("%s\n", bootfileMsg);
}
}