mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-12-13 21:54:40 +00:00
98c7ad60ec
[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
146 lines
3.0 KiB
C
146 lines
3.0 KiB
C
/*
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#include "includes.h"
|
|
RCSID("$Id: log-server.c,v 1.7 2000/03/09 10:27:50 damien Exp $");
|
|
|
|
#include <syslog.h>
|
|
#include "packet.h"
|
|
#include "xmalloc.h"
|
|
#include "ssh.h"
|
|
|
|
#ifdef HAVE___PROGNAME
|
|
extern char *__progname;
|
|
#else /* HAVE___PROGNAME */
|
|
const char *__progname = "sshd";
|
|
#endif /* HAVE___PROGNAME */
|
|
|
|
static LogLevel log_level = SYSLOG_LEVEL_INFO;
|
|
static int log_on_stderr = 0;
|
|
static int log_facility = LOG_AUTH;
|
|
|
|
/* Initialize the log.
|
|
* av0 program name (should be argv[0])
|
|
* on_stderr print also on stderr
|
|
* level logging level
|
|
*/
|
|
|
|
void
|
|
log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
|
|
{
|
|
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:
|
|
fprintf(stderr, "Unrecognized internal syslog level code %d\n",
|
|
(int) level);
|
|
exit(1);
|
|
}
|
|
switch (facility) {
|
|
case SYSLOG_FACILITY_DAEMON:
|
|
log_facility = LOG_DAEMON;
|
|
break;
|
|
case SYSLOG_FACILITY_USER:
|
|
log_facility = LOG_USER;
|
|
break;
|
|
case SYSLOG_FACILITY_AUTH:
|
|
log_facility = LOG_AUTH;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL0:
|
|
log_facility = LOG_LOCAL0;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL1:
|
|
log_facility = LOG_LOCAL1;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL2:
|
|
log_facility = LOG_LOCAL2;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL3:
|
|
log_facility = LOG_LOCAL3;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL4:
|
|
log_facility = LOG_LOCAL4;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL5:
|
|
log_facility = LOG_LOCAL5;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL6:
|
|
log_facility = LOG_LOCAL6;
|
|
break;
|
|
case SYSLOG_FACILITY_LOCAL7:
|
|
log_facility = LOG_LOCAL7;
|
|
break;
|
|
default:
|
|
fprintf(stderr, "Unrecognized internal syslog facility code %d\n",
|
|
(int) facility);
|
|
exit(1);
|
|
}
|
|
log_on_stderr = on_stderr;
|
|
}
|
|
|
|
#define MSGBUFSIZ 1024
|
|
|
|
void
|
|
do_log(LogLevel level, const char *fmt, va_list args)
|
|
{
|
|
char msgbuf[MSGBUFSIZ];
|
|
char fmtbuf[MSGBUFSIZ];
|
|
char *txt = NULL;
|
|
int pri = LOG_INFO;
|
|
|
|
if (level > log_level)
|
|
return;
|
|
switch (level) {
|
|
case SYSLOG_LEVEL_ERROR:
|
|
txt = "error";
|
|
pri = LOG_ERR;
|
|
break;
|
|
case SYSLOG_LEVEL_FATAL:
|
|
txt = "fatal";
|
|
pri = LOG_ERR;
|
|
break;
|
|
case SYSLOG_LEVEL_INFO:
|
|
case SYSLOG_LEVEL_VERBOSE:
|
|
pri = LOG_INFO;
|
|
break;
|
|
case SYSLOG_LEVEL_DEBUG:
|
|
txt = "debug";
|
|
pri = LOG_DEBUG;
|
|
break;
|
|
default:
|
|
txt = "internal error";
|
|
pri = LOG_ERR;
|
|
break;
|
|
}
|
|
if (txt != NULL) {
|
|
snprintf(fmtbuf, sizeof(fmtbuf), "%s: %s", txt, fmt);
|
|
vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
|
|
} else {
|
|
vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
|
|
}
|
|
if (log_on_stderr)
|
|
fprintf(stderr, "%s\n", msgbuf);
|
|
openlog(__progname, LOG_PID, log_facility);
|
|
syslog(pri, "%.500s", msgbuf);
|
|
closelog();
|
|
}
|