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

[openssh.git] / log-client.c

diff --git a/log-client.c b/log-client.c
index 7e9fd61e78cc676a66d44ca860a75e612f6d85eb..b35f77bc9b6b75ea2f88ccb476c76ee80cb3209a 100644 (file)
--- a/log-client.c
+++ b/log-client.c
@@ -1,24 +1,45 @@
 /*
- *
- * log-client.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:13:40 1995 ylo
- *
  * Client-side versions of debug(), log(), etc.  These print to stderr.
  * This is a stripped down version of log-server.c.
  *
+ * 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-client.c,v 1.9 2000/06/20 01:39:42 markus Exp $");
+RCSID("$OpenBSD: log-client.c,v 1.15 2001/01/21 19:05:50 markus Exp $");
 
 #include "xmalloc.h"
-#include "ssh.h"
+#include "log.h"
 
 static LogLevel log_level = SYSLOG_LEVEL_INFO;
 
@@ -32,11 +53,13 @@ log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
 {
        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:
@@ -54,9 +77,8 @@ do_log(LogLevel level, const char *fmt, va_list args)
 
        if (level > log_level)
                return;
-       if (level == SYSLOG_LEVEL_DEBUG)
+       if (level >= SYSLOG_LEVEL_DEBUG1)
                fprintf(stderr, "debug: ");
        vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
-       fprintf(stderr, "%s", msgbuf);
-       fprintf(stderr, "\r\n");
+       fprintf(stderr, "%s\r\n", msgbuf);
 }