- millert@cvs.openbsd.org 2001/03/04 17:42:28

[openssh.git] / log-server.c

diff --git a/log-server.c b/log-server.c
index 86fcf2a114db1ed3c6b05ea039a7b3e98c1c841a..3c53d9c596305a43564de2c91efae1aa8b5644c8 100644 (file)
--- a/log-server.c
+++ b/log-server.c
@@ -1,32 +1,47 @@
 /*
- *
- * log-server.c
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- *
- * Created: Mon Mar 20 21:19:30 1995 ylo
- *
  * Server-side versions of debug(), log(), etc.  These normally send the output
  * to the system log.
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ *
+ *
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: log-server.c,v 1.20 2001/01/21 19:05:50 markus Exp $");
 
 #include <syslog.h>
 #include "packet.h"
 #include "xmalloc.h"
-#include "ssh.h"
-
-#ifdef HAVE___PROGNAME
-extern char *__progname;
-#else /* HAVE___PROGNAME */
-static const char *__progname = "sshd";
-#endif /* HAVE___PROGNAME */
+#include "log.h"
 
 static LogLevel log_level = SYSLOG_LEVEL_INFO;
 static int log_on_stderr = 0;
@@ -43,11 +58,13 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
 {
        switch (level) {
        case SYSLOG_LEVEL_QUIET:
-       case SYSLOG_LEVEL_ERROR:
        case SYSLOG_LEVEL_FATAL:
+       case SYSLOG_LEVEL_ERROR:
        case SYSLOG_LEVEL_INFO:
        case SYSLOG_LEVEL_VERBOSE:
-       case SYSLOG_LEVEL_DEBUG:
+       case SYSLOG_LEVEL_DEBUG1:
+       case SYSLOG_LEVEL_DEBUG2:
+       case SYSLOG_LEVEL_DEBUG3:
                log_level = level;
                break;
        default:
@@ -65,6 +82,11 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
        case SYSLOG_FACILITY_AUTH:
                log_facility = LOG_AUTH;
                break;
+#ifdef LOG_AUTHPRIV
+       case SYSLOG_FACILITY_AUTHPRIV:
+               log_facility = LOG_AUTHPRIV;
+               break;
+#endif
        case SYSLOG_FACILITY_LOCAL0:
                log_facility = LOG_LOCAL0;
                break;
@@ -106,24 +128,35 @@ do_log(LogLevel level, const char *fmt, va_list args)
        char fmtbuf[MSGBUFSIZ];
        char *txt = NULL;
        int pri = LOG_INFO;
+       extern char *__progname;
 
        if (level > log_level)
                return;
        switch (level) {
-       case SYSLOG_LEVEL_ERROR:
-               txt = "error";
-               pri = LOG_ERR;
-               break;
        case SYSLOG_LEVEL_FATAL:
                txt = "fatal";
+               pri = LOG_CRIT;
+               break;
+       case SYSLOG_LEVEL_ERROR:
+               txt = "error";
                pri = LOG_ERR;
                break;
        case SYSLOG_LEVEL_INFO:
+               pri = LOG_INFO;
+               break;
        case SYSLOG_LEVEL_VERBOSE:
                pri = LOG_INFO;
                break;
-       case SYSLOG_LEVEL_DEBUG:
-               txt = "debug";
+       case SYSLOG_LEVEL_DEBUG1:
+               txt = "debug1";
+               pri = LOG_DEBUG;
+               break;
+       case SYSLOG_LEVEL_DEBUG2:
+               txt = "debug2";
+               pri = LOG_DEBUG;
+               break;
+       case SYSLOG_LEVEL_DEBUG3:
+               txt = "debug3";
                pri = LOG_DEBUG;
                break;
        default: