- markus@cvs.openbsd.org 2001/02/06 22:43:02

[openssh.git] / log.c

diff --git a/log.c b/log.c
index 03038b2fbe41dd3539bf85830657957e7ced64f5..7e01384faeef479bc5cab6a40221181f220db61b 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1,11 +1,44 @@
+/*
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ *
+ * 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".
+ */
 /*
  * Shared versions of debug(), log(), etc.
+ *
+ * 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.c,v 1.7 2000/01/04 00:07:59 markus Exp $");
+RCSID("$OpenBSD: log.c,v 1.15 2001/01/21 19:05:51 markus Exp $");
 
-#include "ssh.h"
+#include "log.h"
 #include "xmalloc.h"
 
 /* Fatal messages.  This function never returns. */
@@ -60,7 +93,25 @@ debug(const char *fmt,...)
 {
        va_list args;
        va_start(args, fmt);
-       do_log(SYSLOG_LEVEL_DEBUG, fmt, args);
+       do_log(SYSLOG_LEVEL_DEBUG1, fmt, args);
+       va_end(args);
+}
+
+void
+debug2(const char *fmt,...)
+{
+       va_list args;
+       va_start(args, fmt);
+       do_log(SYSLOG_LEVEL_DEBUG2, fmt, args);
+       va_end(args);
+}
+
+void
+debug3(const char *fmt,...)
+{
+       va_list args;
+       va_start(args, fmt);
+       do_log(SYSLOG_LEVEL_DEBUG3, fmt, args);
        va_end(args);
 }
 
@@ -104,7 +155,7 @@ fatal_remove_cleanup(void (*proc) (void *context), void *context)
                }
        }
        fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n",
-             (unsigned long) proc, (unsigned long) context);
+             (u_long) proc, (u_long) context);
 }
 
 /* Cleanup and exit */
@@ -121,7 +172,7 @@ fatal_cleanup(void)
        for (cu = fatal_cleanups; cu; cu = next_cu) {
                next_cu = cu->next;
                debug("Calling cleanup 0x%lx(0x%lx)",
-                     (unsigned long) cu->proc, (unsigned long) cu->context);
+                     (u_long) cu->proc, (u_long) cu->context);
                (*cu->proc) (cu->context);
        }
        exit(255);
@@ -136,6 +187,9 @@ static struct {
        { "DAEMON",     SYSLOG_FACILITY_DAEMON },
        { "USER",       SYSLOG_FACILITY_USER },
        { "AUTH",       SYSLOG_FACILITY_AUTH },
+#ifdef LOG_AUTHPRIV
+       { "AUTHPRIV",   SYSLOG_FACILITY_AUTHPRIV },
+#endif
        { "LOCAL0",     SYSLOG_FACILITY_LOCAL0 },
        { "LOCAL1",     SYSLOG_FACILITY_LOCAL1 },
        { "LOCAL2",     SYSLOG_FACILITY_LOCAL2 },
@@ -157,7 +211,10 @@ static struct {
        { "ERROR",      SYSLOG_LEVEL_ERROR },
        { "INFO",       SYSLOG_LEVEL_INFO },
        { "VERBOSE",    SYSLOG_LEVEL_VERBOSE },
-       { "DEBUG",      SYSLOG_LEVEL_DEBUG },
+       { "DEBUG",      SYSLOG_LEVEL_DEBUG1 },
+       { "DEBUG1",     SYSLOG_LEVEL_DEBUG1 },
+       { "DEBUG2",     SYSLOG_LEVEL_DEBUG2 },
+       { "DEBUG3",     SYSLOG_LEVEL_DEBUG3 },
        { NULL, 0 }
 };