1999-10-27 05:42:43 +02:00
|
|
|
/*
|
2000-04-16 03:18:38 +02:00
|
|
|
*
|
1999-11-24 14:26:21 +01:00
|
|
|
* log-client.c
|
2000-04-16 03:18:38 +02:00
|
|
|
*
|
1999-11-24 14:26:21 +01:00
|
|
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
2000-04-16 03:18:38 +02:00
|
|
|
*
|
1999-11-24 14:26:21 +01:00
|
|
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
|
|
|
|
* All rights reserved
|
2000-04-16 03:18:38 +02:00
|
|
|
*
|
1999-11-24 14:26:21 +01:00
|
|
|
* Created: Mon Mar 20 21:13:40 1995 ylo
|
2000-04-16 03:18:38 +02:00
|
|
|
*
|
1999-11-24 14:26:21 +01:00
|
|
|
* Client-side versions of debug(), log(), etc. These print to stderr.
|
|
|
|
|
* This is a stripped down version of log-server.c.
|
2000-04-16 03:18:38 +02:00
|
|
|
*
|
1999-11-24 14:26:21 +01:00
|
|
|
*/
|
1999-10-27 05:42:43 +02:00
|
|
|
|
|
|
|
|
#include "includes.h"
|
2000-08-23 02:46:23 +02:00
|
|
|
RCSID("$OpenBSD: log-client.c,v 1.10 2000/08/19 02:57:33 deraadt Exp $");
|
1999-10-27 05:42:43 +02:00
|
|
|
|
|
|
|
|
#include "xmalloc.h"
|
|
|
|
|
#include "ssh.h"
|
|
|
|
|
|
1999-11-11 07:57:39 +01:00
|
|
|
static LogLevel log_level = SYSLOG_LEVEL_INFO;
|
1999-10-27 05:42:43 +02:00
|
|
|
|
1999-11-11 07:57:39 +01:00
|
|
|
/* Initialize the log.
|
1999-11-24 14:26:21 +01:00
|
|
|
* av0 program name (should be argv[0])
|
|
|
|
|
* level logging level
|
|
|
|
|
*/
|
1999-10-27 05:42:43 +02:00
|
|
|
|
1999-11-11 07:57:39 +01:00
|
|
|
void
|
|
|
|
|
log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
|
1999-10-27 05:42:43 +02:00
|
|
|
{
|
1999-11-24 14:26:21 +01:00
|
|
|
switch (level) {
|
|
|
|
|
case SYSLOG_LEVEL_QUIET:
|
|
|
|
|
case SYSLOG_LEVEL_ERROR:
|
|
|
|
|
case SYSLOG_LEVEL_FATAL:
|
|
|
|
|
case SYSLOG_LEVEL_INFO:
|
|
|
|
|
case SYSLOG_LEVEL_VERBOSE:
|
|
|
|
|
case SYSLOG_LEVEL_DEBUG:
|
|
|
|
|
log_level = level;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
/* unchanged */
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-10-27 05:42:43 +02:00
|
|
|
}
|
|
|
|
|
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 11:27:49 +01:00
|
|
|
#define MSGBUFSIZ 1024
|
1999-10-27 05:42:43 +02:00
|
|
|
|
1999-11-11 07:57:39 +01:00
|
|
|
void
|
|
|
|
|
do_log(LogLevel level, const char *fmt, va_list args)
|
1999-10-27 05:42:43 +02:00
|
|
|
{
|
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
2000-03-09 11:27:49 +01:00
|
|
|
char msgbuf[MSGBUFSIZ];
|
1999-11-24 14:26:21 +01:00
|
|
|
|
|
|
|
|
if (level > log_level)
|
|
|
|
|
return;
|
|
|
|
|
if (level == SYSLOG_LEVEL_DEBUG)
|
|
|
|
|
fprintf(stderr, "debug: ");
|
|
|
|
|
vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
|
2000-08-23 02:46:23 +02:00
|
|
|
fprintf(stderr, "%s\r\n", msgbuf);
|
1999-10-27 05:42:43 +02:00
|
|
|
}
|