aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-03-28 10:38:37 -0700
committerRoland McGrath <roland@hack.frob.com>2013-03-28 10:38:37 -0700
commit356b3480232d1a8f689c6c275e45c2a4c68efb30 (patch)
tree98feb76e5ef7b80510dd434c4a32af6f882bfec9
parentb0f1246ab45b6d27e2bba64aa8dfe407ac740537 (diff)
downloadglibc-356b3480232d1a8f689c6c275e45c2a4c68efb30.zip
glibc-356b3480232d1a8f689c6c275e45c2a4c68efb30.tar.gz
glibc-356b3480232d1a8f689c6c275e45c2a4c68efb30.tar.bz2
Never call syslog in __libc_message.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/posix/libc_fatal.c9
2 files changed, 5 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 183bedf..f21bf51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-28 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/posix/libc_fatal.c: Don't include <sys/syslog.h>.
+ (__libc_message): Never call vsyslog.
+
2013-03-28 Alan Modra <amodra@gmail.com>
* sysdeps/powerpc/powerpc32/start.S (cfi_startproc, cfi_endproc):
diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c
index afa1b81..5071df1 100644
--- a/sysdeps/posix/libc_fatal.c
+++ b/sysdeps/posix/libc_fatal.c
@@ -29,7 +29,6 @@
#include <sysdep.h>
#include <unistd.h>
#include <sys/mman.h>
-#include <sys/syslog.h>
#include <sys/uio.h>
#include <not-cancel.h>
@@ -68,11 +67,9 @@ void
__libc_message (int do_abort, const char *fmt, ...)
{
va_list ap;
- va_list ap_copy;
int fd = -1;
va_start (ap, fmt);
- va_copy (ap_copy, ap);
#ifdef FATAL_PREPARE
FATAL_PREPARE;
@@ -170,12 +167,6 @@ __libc_message (int do_abort, const char *fmt, ...)
va_end (ap);
- /* If we had no success writing the message, use syslog. */
- if (! written)
- vsyslog (LOG_ERR, fmt, ap_copy);
-
- va_end (ap_copy);
-
if (do_abort)
{
BEFORE_ABORT (do_abort, written, fd);