4 files changed, 35 insertions, 9 deletions

diff --git a/readconf.c b/readconf.c
index 9d59493f0..013c19f59 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.270 2017/03/10 04:27:32 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.271 2017/04/28 03:20:27 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -152,7 +152,7 @@ typedef enum {
         oGlobalKnownHostsFile, oUserKnownHostsFile, oConnectionAttempts,
         oBatchMode, oCheckHostIP, oStrictHostKeyChecking, oCompression,
         oCompressionLevel, oTCPKeepAlive, oNumberOfPasswordPrompts,
-        oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs,
+        oUsePrivilegedPort, oLogFacility, oLogLevel, oCiphers, oProtocol, oMacs,
         oPubkeyAuthentication,
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
@@ -265,6 +265,7 @@ static struct {
         { "tcpkeepalive", oTCPKeepAlive },
         { "keepalive", oTCPKeepAlive },                         /* obsolete */
         { "numberofpasswordprompts", oNumberOfPasswordPrompts },
+        { "syslogfacility", oLogFacility },
         { "loglevel", oLogLevel },
         { "dynamicforward", oDynamicForward },
         { "preferredauthentications", oPreferredAuthentications },
@@ -830,6 +831,7 @@ process_config_line_depth(Options *options, struct passwd *pw, const char *host,
         u_int i, *uintptr, max_entries = 0;
         int r, oactive, negated, opcode, *intptr, value, value2, cmdline = 0;
         LogLevel *log_level_ptr;
+        SyslogFacility *log_facility_ptr;
         long long val64;
         size_t len;
         struct Forward fwd;
@@ -1264,6 +1266,17 @@ parse_keytypes:
                         *log_level_ptr = (LogLevel) value;
                 break;
 
+        case oLogFacility:
+                log_facility_ptr = &options->log_facility;
+                arg = strdelim(&s);
+                value = log_facility_number(arg);
+                if (value == SYSLOG_FACILITY_NOT_SET)
+                        fatal("%.200s line %d: unsupported log facility '%s'",
+                            filename, linenum, arg ? arg : "<NONE>");
+                if (*log_facility_ptr == -1)
+                        *log_facility_ptr = (SyslogFacility) value;
+                break;
+
         case oLocalForward:
         case oRemoteForward:
         case oDynamicForward:
@@ -1838,6 +1851,7 @@ initialize_options(Options * options)
         options->num_local_forwards = 0;
         options->remote_forwards = NULL;
         options->num_remote_forwards = 0;
+        options->log_facility = SYSLOG_FACILITY_NOT_SET;
         options->log_level = SYSLOG_LEVEL_NOT_SET;
         options->preferred_authentications = NULL;
         options->bind_address = NULL;
@@ -2014,6 +2028,8 @@ fill_default_options(Options * options)
         }
         if (options->log_level == SYSLOG_LEVEL_NOT_SET)
                 options->log_level = SYSLOG_LEVEL_INFO;
+        if (options->log_facility == SYSLOG_FACILITY_NOT_SET)
+                options->log_facility = SYSLOG_FACILITY_USER;
         if (options->no_host_authentication_for_localhost == - 1)
                 options->no_host_authentication_for_localhost = 0;
         if (options->identities_only == -1)
diff --git a/readconf.h b/readconf.h
index cef55f71c..d62428101 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.117 2016/07/15 00:24:30 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.118 2017/04/28 03:20:27 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -59,6 +59,7 @@ typedef struct {
         int     tcp_keep_alive; /* Set SO_KEEPALIVE. */
         int     ip_qos_interactive;     /* IP ToS/DSCP/class for interactive */
         int     ip_qos_bulk;            /* IP ToS/DSCP/class for bulk traffic */
+        SyslogFacility log_facility;    /* Facility for system logging. */
         LogLevel log_level;     /* Level for logging. */
 
         int     port;           /* Port to connect. */
diff --git a/ssh.c b/ssh.c
index 32b27bbc2..5db6ff25e 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.451 2017/03/10 04:07:20 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.452 2017/04/28 03:20:27 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1007,8 +1007,11 @@ main(int ac, char **av)
         if (logfile != NULL)
                 log_redirect_stderr_to(logfile);
         log_init(argv0,
-            options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
-            SYSLOG_FACILITY_USER, !use_syslog);
+            options.log_level == SYSLOG_LEVEL_NOT_SET ? 
+            SYSLOG_LEVEL_INFO : options.log_level,
+            options.log_facility == SYSLOG_FACILITY_NOT_SET ? 
+            SYSLOG_FACILITY_USER : options.log_facility,
+            !use_syslog);
 
         if (debug_flag)
                 logit("%s, %s", SSH_RELEASE,
@@ -1150,7 +1153,7 @@ main(int ac, char **av)
 #endif
 
         /* reinit */
-        log_init(argv0, options.log_level, SYSLOG_FACILITY_USER, !use_syslog);
+        log_init(argv0, options.log_level, options.log_facility, !use_syslog);
 
         if (options.request_tty == REQUEST_TTY_YES ||
             options.request_tty == REQUEST_TTY_FORCE)
diff --git a/ssh_config.5 b/ssh_config.5
index 532745b2f..dd088c5ad 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.242 2017/02/27 14:30:33 jmc Exp $
-.Dd $Mdocdate: February 27 2017 $
+.\" $OpenBSD: ssh_config.5,v 1.243 2017/04/28 03:20:27 dtucker Exp $
+.Dd $Mdocdate: April 28 2017 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1101,6 +1101,12 @@ indicates that the listening port be bound for local use only, while an
 empty address or
 .Sq *
 indicates that the port should be available from all interfaces.
+.It Cm SyslogFacility
+Gives the facility code that is used when logging messages from
+.Xr ssh 1 .
+The possible values are: DAEMON, USER, AUTH, LOCAL0, LOCAL1, LOCAL2,
+LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7.
+The default is USER.
 .It Cm LogLevel
 Gives the verbosity level that is used when logging messages from
 .Xr ssh 1 .