1 files changed, 42 insertions, 11 deletions

diff --git a/log-server.c b/log-server.c
index 9db77d9e0..270a3c698 100644
--- a/log-server.c
+++ b/log-server.c
@@ -1,21 +1,42 @@
 /*
- *
- * 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("$OpenBSD: log-server.c,v 1.15 2000/06/20 01:39:42 markus Exp $");
+RCSID("$OpenBSD: log-server.c,v 1.17 2000/09/12 20:53:10 markus Exp $");
 
 #include <syslog.h>
 #include "packet.h"
@@ -47,7 +68,9 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
         case SYSLOG_LEVEL_FATAL:
         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:
@@ -122,8 +145,16 @@ do_log(LogLevel level, const char *fmt, va_list args)
         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: