syslogd: Add log format and remote port to debug listing of sinks

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-12-09 11:02:31 +01:00
parent ede638e9fd
commit 9262229cc8

View File

@ -2202,13 +2202,16 @@ void init(void)
if (Debug) { if (Debug) {
SIMPLEQ_FOREACH(f, &fhead, f_link) { SIMPLEQ_FOREACH(f, &fhead, f_link) {
if (f->f_type != F_UNUSED) { if (f->f_type == F_UNUSED)
continue;
for (i = 0; i <= LOG_NFACILITIES; i++) for (i = 0; i <= LOG_NFACILITIES; i++)
if (f->f_pmask[i] == INTERNAL_INVPRI) if (f->f_pmask[i] == INTERNAL_INVPRI)
printf(" X "); printf(" X ");
else else
printf("%2X ", f->f_pmask[i]); printf("%2X ", f->f_pmask[i]);
printf("%s: ", TypeNames[f->f_type]); printf("%s: ", TypeNames[f->f_type]);
switch (f->f_type) { switch (f->f_type) {
case F_FILE: case F_FILE:
case F_PIPE: case F_PIPE:
@ -2222,18 +2225,26 @@ void init(void)
case F_FORW: case F_FORW:
case F_FORW_SUSP: case F_FORW_SUSP:
case F_FORW_UNKN: case F_FORW_UNKN:
printf("%s", f->f_un.f_forw.f_hname); printf("%s:%s", f->f_un.f_forw.f_hname, f->f_un.f_forw.f_serv);
break; break;
case F_USERS: case F_USERS:
for (i = 0; i < MAXUNAMES && *f->f_un.f_uname[i]; i++) for (i = 0; i < MAXUNAMES && *f->f_un.f_uname[i]; i++)
printf("%s, ", f->f_un.f_uname[i]); printf("%s%s", i > 0 ? ", " : "", f->f_un.f_uname[i]);
break; break;
} }
if (f->f_flags & RFC5424)
printf("\t;RFC5424");
else if (f->f_flags & RFC3164)
printf("\t;RFC3164");
else
printf("\t;BSD");
if (f->f_rotatesz > 0)
printf(",rotate=%d:%d", f->f_rotatesz, f->f_rotatecount);
printf("\n"); printf("\n");
} }
} }
}
flog(LOG_SYSLOG | LOG_INFO, "syslogd v" VERSION ": restart."); flog(LOG_SYSLOG | LOG_INFO, "syslogd v" VERSION ": restart.");
logit("syslogd: restarted.\n"); logit("syslogd: restarted.\n");