summaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
Diffstat (limited to 'log.c')
-rw-r--r--log.c59
1 files changed, 56 insertions, 3 deletions
diff --git a/log.c b/log.c
index 03038b2fb..13033ab42 100644
--- a/log.c
+++ b/log.c
@@ -1,9 +1,42 @@
1/* 1/*
2 * Author: Tatu Ylonen <ylo@cs.hut.fi>
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved
5 *
6 * As far as I am concerned, the code I have written for this software
7 * can be used freely for any purpose. Any derived versions of this
8 * software must be clearly marked as such, and if the derived work is
9 * incompatible with the protocol description in the RFC file, it must be
10 * called by a name other than "ssh" or "Secure Shell".
11 */
12/*
2 * Shared versions of debug(), log(), etc. 13 * Shared versions of debug(), log(), etc.
14 *
15 * Copyright (c) 2000 Markus Friedl. All rights reserved.
16 *
17 * Redistribution and use in source and binary forms, with or without
18 * modification, are permitted provided that the following conditions
19 * are met:
20 * 1. Redistributions of source code must retain the above copyright
21 * notice, this list of conditions and the following disclaimer.
22 * 2. Redistributions in binary form must reproduce the above copyright
23 * notice, this list of conditions and the following disclaimer in the
24 * documentation and/or other materials provided with the distribution.
25 *
26 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
27 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
28 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
29 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
30 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
31 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
32 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
33 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3 */ 36 */
4 37
5#include "includes.h" 38#include "includes.h"
6RCSID("$OpenBSD: log.c,v 1.7 2000/01/04 00:07:59 markus Exp $"); 39RCSID("$OpenBSD: log.c,v 1.10 2000/09/12 20:53:10 markus Exp $");
7 40
8#include "ssh.h" 41#include "ssh.h"
9#include "xmalloc.h" 42#include "xmalloc.h"
@@ -60,7 +93,25 @@ debug(const char *fmt,...)
60{ 93{
61 va_list args; 94 va_list args;
62 va_start(args, fmt); 95 va_start(args, fmt);
63 do_log(SYSLOG_LEVEL_DEBUG, fmt, args); 96 do_log(SYSLOG_LEVEL_DEBUG1, fmt, args);
97 va_end(args);
98}
99
100void
101debug2(const char *fmt,...)
102{
103 va_list args;
104 va_start(args, fmt);
105 do_log(SYSLOG_LEVEL_DEBUG2, fmt, args);
106 va_end(args);
107}
108
109void
110debug3(const char *fmt,...)
111{
112 va_list args;
113 va_start(args, fmt);
114 do_log(SYSLOG_LEVEL_DEBUG3, fmt, args);
64 va_end(args); 115 va_end(args);
65} 116}
66 117
@@ -157,7 +208,9 @@ static struct {
157 { "ERROR", SYSLOG_LEVEL_ERROR }, 208 { "ERROR", SYSLOG_LEVEL_ERROR },
158 { "INFO", SYSLOG_LEVEL_INFO }, 209 { "INFO", SYSLOG_LEVEL_INFO },
159 { "VERBOSE", SYSLOG_LEVEL_VERBOSE }, 210 { "VERBOSE", SYSLOG_LEVEL_VERBOSE },
160 { "DEBUG", SYSLOG_LEVEL_DEBUG }, 211 { "DEBUG1", SYSLOG_LEVEL_DEBUG1 },
212 { "DEBUG2", SYSLOG_LEVEL_DEBUG2 },
213 { "DEBUG3", SYSLOG_LEVEL_DEBUG3 },
161 { NULL, 0 } 214 { NULL, 0 }
162}; 215};
163 216