* New upstream release (http://www.openssh.org/txt/release-5.9).

  - Introduce sandboxing of the pre-auth privsep child using an optional
    sshd_config(5) "UsePrivilegeSeparation=sandbox" mode that enables
    mandatory restrictions on the syscalls the privsep child can perform.
  - Add new SHA256-based HMAC transport integrity modes from
    http://www.ietf.org/id/draft-dbider-sha2-mac-for-ssh-02.txt.
  - The pre-authentication sshd(8) privilege separation slave process now
    logs via a socket shared with the master process, avoiding the need to
    maintain /dev/log inside the chroot (closes: #75043, #429243,
    #599240).
  - ssh(1) now warns when a server refuses X11 forwarding (closes:
    #504757).
  - sshd_config(5)'s AuthorizedKeysFile now accepts multiple paths,
    separated by whitespace (closes: #76312).  The authorized_keys2
    fallback is deprecated but documented (closes: #560156).
  - ssh(1) and sshd(8): set IPv6 traffic class from IPQoS, as well as IPv4
    ToS/DSCP (closes: #498297).
  - ssh-add(1) now accepts keys piped from standard input.  E.g. "ssh-add
    - < /path/to/key" (closes: #229124).
  - Clean up lost-passphrase text in ssh-keygen(1) (closes: #444691).
  - Say "required" rather than "recommended" in unprotected-private-key
    warning (LP: #663455).

1 files changed, 32 insertions, 3 deletions

diff --git a/log.c b/log.c
index d8a1f734e..201740893 100644
--- a/log.c
+++ b/log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: log.c,v 1.41 2008/06/10 04:50:25 dtucker Exp $ */
+/* $OpenBSD: log.c,v 1.42 2011/06/17 21:44:30 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -56,6 +56,8 @@ static LogLevel log_level = SYSLOG_LEVEL_INFO;
 static int log_on_stderr = 1;
 static int log_facility = LOG_AUTH;
 static char *argv0;
+static log_handler_fn *log_handler;
+static void *log_handler_ctx;
 
 extern char *__progname;
 
@@ -261,6 +263,9 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
                 exit(1);
         }
 
+        log_handler = NULL;
+        log_handler_ctx = NULL;
+
         log_on_stderr = on_stderr;
         if (on_stderr)
                 return;
@@ -328,6 +333,23 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
 #define MSGBUFSIZ 1024
 
 void
+set_log_handler(log_handler_fn *handler, void *ctx)
+{
+        log_handler = handler;
+        log_handler_ctx = ctx;
+}
+
+void
+do_log2(LogLevel level, const char *fmt,...)
+{
+        va_list args;
+
+        va_start(args, fmt);
+        do_log(level, fmt, args);
+        va_end(args);
+}
+
+void
 do_log(LogLevel level, const char *fmt, va_list args)
 {
 #if defined(HAVE_OPENLOG_R) && defined(SYSLOG_DATA_INIT)
@@ -338,6 +360,7 @@ do_log(LogLevel level, const char *fmt, va_list args)
         char *txt = NULL;
         int pri = LOG_INFO;
         int saved_errno = errno;
+        log_handler_fn *tmp_handler;
 
         if (level > log_level)
                 return;
@@ -376,7 +399,7 @@ do_log(LogLevel level, const char *fmt, va_list args)
                 pri = LOG_ERR;
                 break;
         }
-        if (txt != NULL) {
+        if (txt != NULL && log_handler == NULL) {
                 snprintf(fmtbuf, sizeof(fmtbuf), "%s: %s", txt, fmt);
                 vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
         } else {
@@ -384,7 +407,13 @@ do_log(LogLevel level, const char *fmt, va_list args)
         }
         strnvis(fmtbuf, msgbuf, sizeof(fmtbuf),
             log_on_stderr ? LOG_STDERR_VIS : LOG_SYSLOG_VIS);
-        if (log_on_stderr) {
+        if (log_handler != NULL) {
+                /* Avoid recursion */
+                tmp_handler = log_handler;
+                log_handler = NULL;
+                tmp_handler(level, fmtbuf, log_handler_ctx);
+                log_handler = tmp_handler;
+        } else if (log_on_stderr) {
                 snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
                 write(STDERR_FILENO, msgbuf, strlen(msgbuf));
         } else {