mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-24 19:53:24 +08:00
226cfa0378
Linux and works. So that is at least a good sign. =) 20010122 - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus [servconf.c ssh.h sshd.c] only auth-chall.c needs #ifdef SKEY - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c packet.c pathname.h readconf.c scp.c servconf.c serverloop.c session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h ssh1.h sshconnect1.c sshd.c ttymodes.c] move ssh1 definitions to ssh1.h, pathnames to pathnames.h - markus@cvs.openbsd.org 2001/01/19 16:48:14 [sshd.8] fix typo; from stevesk@ - markus@cvs.openbsd.org 2001/01/19 16:50:58 [ssh-dss.c] clear and free digest, make consistent with other code (use dlen); from stevesk@ - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus [auth-options.c auth-options.h auth-rsa.c auth2.c] pass the filename to auth_parse_options() - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001 [readconf.c] fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com - stevesk@cvs.openbsd.org 2001/01/20 18:20:29 [sshconnect2.c] dh_new_group() does not return NULL. ok markus@ - markus@cvs.openbsd.org 2001/01/20 21:33:42 [ssh-add.c] do not loop forever if askpass does not exist; from andrew@pimlott.ne.mediaone.net - djm@cvs.openbsd.org 2001/01/20 23:00:56 [servconf.c] Check for NULL return from strdelim; ok markus - djm@cvs.openbsd.org 2001/01/20 23:02:07 [readconf.c] KNF; ok markus - jakob@cvs.openbsd.org 2001/01/21 9:00:33 [ssh-keygen.1] remove -R flag; ok markus@ - markus@cvs.openbsd.org 2001/01/21 19:05:40 [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c bufaux.c bufaux.h buffer.c canahost.c canahost.h channels.c cipher.c cli.c clientloop.c clientloop.h compat.c compress.c deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c key.c key.h log-client.c log-server.c log.c log.h login.c login.h match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h ttysmodes.c uidswap.c xmalloc.c] split ssh.h and try to cleanup the #include mess. remove unnecessary #includes. rename util.[ch] -> misc.[ch] - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve conflict when compiling for non-kerb install - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes on 1/19.
242 lines
5.9 KiB
C
242 lines
5.9 KiB
C
/*
|
|
* 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.15 2001/01/21 19:05:51 markus Exp $");
|
|
|
|
#include "log.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* Fatal messages. This function never returns. */
|
|
|
|
void
|
|
fatal(const char *fmt,...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
do_log(SYSLOG_LEVEL_FATAL, fmt, args);
|
|
va_end(args);
|
|
fatal_cleanup();
|
|
}
|
|
|
|
/* Error messages that should be logged. */
|
|
|
|
void
|
|
error(const char *fmt,...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
do_log(SYSLOG_LEVEL_ERROR, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
/* Log this message (information that usually should go to the log). */
|
|
|
|
void
|
|
log(const char *fmt,...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
do_log(SYSLOG_LEVEL_INFO, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
/* More detailed messages (information that does not need to go to the log). */
|
|
|
|
void
|
|
verbose(const char *fmt,...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
do_log(SYSLOG_LEVEL_VERBOSE, fmt, args);
|
|
va_end(args);
|
|
}
|
|
|
|
/* Debugging messages that should not be logged during normal operation. */
|
|
|
|
void
|
|
debug(const char *fmt,...)
|
|
{
|
|
va_list args;
|
|
va_start(args, fmt);
|
|
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);
|
|
}
|
|
|
|
/* Fatal cleanup */
|
|
|
|
struct fatal_cleanup {
|
|
struct fatal_cleanup *next;
|
|
void (*proc) (void *);
|
|
void *context;
|
|
};
|
|
|
|
static struct fatal_cleanup *fatal_cleanups = NULL;
|
|
|
|
/* Registers a cleanup function to be called by fatal() before exiting. */
|
|
|
|
void
|
|
fatal_add_cleanup(void (*proc) (void *), void *context)
|
|
{
|
|
struct fatal_cleanup *cu;
|
|
|
|
cu = xmalloc(sizeof(*cu));
|
|
cu->proc = proc;
|
|
cu->context = context;
|
|
cu->next = fatal_cleanups;
|
|
fatal_cleanups = cu;
|
|
}
|
|
|
|
/* Removes a cleanup frunction to be called at fatal(). */
|
|
|
|
void
|
|
fatal_remove_cleanup(void (*proc) (void *context), void *context)
|
|
{
|
|
struct fatal_cleanup **cup, *cu;
|
|
|
|
for (cup = &fatal_cleanups; *cup; cup = &cu->next) {
|
|
cu = *cup;
|
|
if (cu->proc == proc && cu->context == context) {
|
|
*cup = cu->next;
|
|
xfree(cu);
|
|
return;
|
|
}
|
|
}
|
|
fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n",
|
|
(u_long) proc, (u_long) context);
|
|
}
|
|
|
|
/* Cleanup and exit */
|
|
void
|
|
fatal_cleanup(void)
|
|
{
|
|
struct fatal_cleanup *cu, *next_cu;
|
|
static int called = 0;
|
|
|
|
if (called)
|
|
exit(255);
|
|
called = 1;
|
|
/* Call cleanup functions. */
|
|
for (cu = fatal_cleanups; cu; cu = next_cu) {
|
|
next_cu = cu->next;
|
|
debug("Calling cleanup 0x%lx(0x%lx)",
|
|
(u_long) cu->proc, (u_long) cu->context);
|
|
(*cu->proc) (cu->context);
|
|
}
|
|
exit(255);
|
|
}
|
|
|
|
/* textual representation of log-facilities/levels */
|
|
|
|
static struct {
|
|
const char *name;
|
|
SyslogFacility val;
|
|
} log_facilities[] = {
|
|
{ "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 },
|
|
{ "LOCAL3", SYSLOG_FACILITY_LOCAL3 },
|
|
{ "LOCAL4", SYSLOG_FACILITY_LOCAL4 },
|
|
{ "LOCAL5", SYSLOG_FACILITY_LOCAL5 },
|
|
{ "LOCAL6", SYSLOG_FACILITY_LOCAL6 },
|
|
{ "LOCAL7", SYSLOG_FACILITY_LOCAL7 },
|
|
{ NULL, 0 }
|
|
};
|
|
|
|
static struct {
|
|
const char *name;
|
|
LogLevel val;
|
|
} log_levels[] =
|
|
{
|
|
{ "QUIET", SYSLOG_LEVEL_QUIET },
|
|
{ "FATAL", SYSLOG_LEVEL_FATAL },
|
|
{ "ERROR", SYSLOG_LEVEL_ERROR },
|
|
{ "INFO", SYSLOG_LEVEL_INFO },
|
|
{ "VERBOSE", SYSLOG_LEVEL_VERBOSE },
|
|
{ "DEBUG", SYSLOG_LEVEL_DEBUG1 },
|
|
{ "DEBUG1", SYSLOG_LEVEL_DEBUG1 },
|
|
{ "DEBUG2", SYSLOG_LEVEL_DEBUG2 },
|
|
{ "DEBUG3", SYSLOG_LEVEL_DEBUG3 },
|
|
{ NULL, 0 }
|
|
};
|
|
|
|
SyslogFacility
|
|
log_facility_number(char *name)
|
|
{
|
|
int i;
|
|
if (name != NULL)
|
|
for (i = 0; log_facilities[i].name; i++)
|
|
if (strcasecmp(log_facilities[i].name, name) == 0)
|
|
return log_facilities[i].val;
|
|
return (SyslogFacility) - 1;
|
|
}
|
|
|
|
LogLevel
|
|
log_level_number(char *name)
|
|
{
|
|
int i;
|
|
if (name != NULL)
|
|
for (i = 0; log_levels[i].name; i++)
|
|
if (strcasecmp(log_levels[i].name, name) == 0)
|
|
return log_levels[i].val;
|
|
return (LogLevel) - 1;
|
|
}
|