Module Name: src
Committed By: christos
Date: Fri Jan 11 16:15:20 UTC 2019
Modified Files:
src/lib/libwrap: diag.c
Log Message:
let's try one more time: prepare the format to pass to syslog instead
of trying to escape %m.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libwrap/diag.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libwrap/diag.c
diff -u src/lib/libwrap/diag.c:1.14 src/lib/libwrap/diag.c:1.15
--- src/lib/libwrap/diag.c:1.14 Fri Jan 11 08:05:57 2019
+++ src/lib/libwrap/diag.c Fri Jan 11 11:15:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: diag.c,v 1.14 2019/01/11 13:05:57 christos Exp $ */
+/* $NetBSD: diag.c,v 1.15 2019/01/11 16:15:20 christos Exp $ */
/*
* Routines to report various classes of problems. Each report is decorated
@@ -16,7 +16,7 @@
#if 0
static char sccsid[] = "@(#) diag.c 1.1 94/12/28 17:42:20";
#else
-__RCSID("$NetBSD: diag.c,v 1.14 2019/01/11 13:05:57 christos Exp $");
+__RCSID("$NetBSD: diag.c,v 1.15 2019/01/11 16:15:20 christos Exp $");
#endif
#endif
@@ -45,33 +45,25 @@ static void tcpd_diag(int, const char *,
static void
tcpd_diag(int severity, const char *tag, const char *fmt, va_list ap)
{
- char *buf, *buf2, *ptr;
- int oerrno = errno;
-
- if ((ptr = strstr(fmt, "%m")) != NULL) {
- if (asprintf(&buf, "%.*s%%%s", (int)(ptr - fmt), fmt, ptr) == -1)
- buf = __UNCONST(fmt);
- } else {
- buf = __UNCONST(fmt);
- }
+ char *buf;
+ int e, oerrno = errno;
+ /* contruct the tag for the log entry */
+ if (tcpd_context.file)
+ e = asprintf(&buf, "%s: %s, line %d: %s",
+ tag, tcpd_context.file, tcpd_context.line, fmt);
+ else
+ e = asprintf(&buf, "%s: %s", tag, fmt);
- if (vasprintf(&buf2, buf, ap) == -1)
- buf2 = buf;
+ if (e == -1)
+ buf = __UNCONST(fmt);
errno = oerrno;
- /* contruct the tag for the log entry */
- if (tcpd_context.file)
- syslog(severity, "%s: %s, line %d: %s",
- tag, tcpd_context.file, tcpd_context.line, buf2);
- else
- syslog(severity, "%s: %s", tag, buf2);
+ vsyslog(severity, buf, ap);
if (buf != fmt)
free(buf);
- if (buf2 != buf)
- free(buf2);
}
/* tcpd_warn - report problem of some sort and proceed */
