tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/03/03 23:59:34 

[log.c ssh.c]
     log*.c -> log.c
This commit is contained in:
Ben Lindstrom 2001-03-05 07:24:46 +00:00
parent 46d6e09099
commit 8a432f5fe0
3 changed files with 214 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -140,6 +140,9 @@
- markus@cvs.openbsd.org 2001/03/03 23:52:22 - markus@cvs.openbsd.org 2001/03/03 23:52:22
[sftp.c] [sftp.c]
clean up arg processing. based on work by Christophe_Moret@hp.com clean up arg processing. based on work by Christophe_Moret@hp.com
- markus@cvs.openbsd.org 2001/03/03 23:59:34
[log.c ssh.c]
log*.c -> log.c
20010304 20010304
- (bal) Remove make-ssh-known-hosts.1 since it's no longer valid. - (bal) Remove make-ssh-known-hosts.1 since it's no longer valid.
@ -4332,4 +4335,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.894 2001/03/05 07:10:47 mouring Exp $ $Id: ChangeLog,v 1.895 2001/03/05 07:24:46 mouring Exp $

263
log.c
View File

@ -10,8 +10,6 @@
* called by a name other than "ssh" or "Secure Shell". * called by a name other than "ssh" or "Secure Shell".
*/ */
/* /*
* Shared versions of debug(), log(), etc.
*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,11 +34,78 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: log.c,v 1.15 2001/01/21 19:05:51 markus Exp $"); RCSID("$OpenBSD: log.c,v 1.17 2001/03/04 17:42:28 millert Exp $");
#include "log.h" #include "log.h"
#include "xmalloc.h" #include "xmalloc.h"
#include <syslog.h>
static LogLevel log_level = SYSLOG_LEVEL_INFO;
static int log_on_stderr = 1;
static int log_facility = LOG_AUTH;
static char *argv0;
extern char *__progname;
/* 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 },
{ "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;
}
/* Fatal messages. This function never returns. */ /* Fatal messages. This function never returns. */
void void
@ -154,8 +219,8 @@ fatal_remove_cleanup(void (*proc) (void *context), void *context)
return; return;
} }
} }
fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx\n", fatal("fatal_remove_cleanup: no such cleanup function: 0x%lx 0x%lx",
(u_long) proc, (u_long) context); (u_long) proc, (u_long) context);
} }
/* Cleanup and exit */ /* Cleanup and exit */
@ -178,64 +243,142 @@ fatal_cleanup(void)
exit(255); exit(255);
} }
/* textual representation of log-facilities/levels */
static struct { /*
const char *name; * Initialize the log.
SyslogFacility val; */
} log_facilities[] = {
{ "DAEMON", SYSLOG_FACILITY_DAEMON }, void
{ "USER", SYSLOG_FACILITY_USER }, log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
{ "AUTH", SYSLOG_FACILITY_AUTH }, {
#ifdef LOG_AUTHPRIV argv0 = av0;
{ "AUTHPRIV", SYSLOG_FACILITY_AUTHPRIV },
switch (level) {
case SYSLOG_LEVEL_QUIET:
case SYSLOG_LEVEL_FATAL:
case SYSLOG_LEVEL_ERROR:
case SYSLOG_LEVEL_INFO:
case SYSLOG_LEVEL_VERBOSE:
case SYSLOG_LEVEL_DEBUG1:
case SYSLOG_LEVEL_DEBUG2:
case SYSLOG_LEVEL_DEBUG3:
log_level = level;
break;
default:
fprintf(stderr, "Unrecognized internal syslog level code %d\n",
(int) level);
exit(1);
}
log_on_stderr = on_stderr;
if (on_stderr)
return;
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;
#ifdef LOG_AUTHPRIV /** BAL: Verify */
case SYSLOG_FACILITY_AUTHPRIV
log_facility = AUTHPRIV;
break
#endif #endif
{ "LOCAL0", SYSLOG_FACILITY_LOCAL0 }, case SYSLOG_FACILITY_LOCAL0:
{ "LOCAL1", SYSLOG_FACILITY_LOCAL1 }, log_facility = LOG_LOCAL0;
{ "LOCAL2", SYSLOG_FACILITY_LOCAL2 }, break;
{ "LOCAL3", SYSLOG_FACILITY_LOCAL3 }, case SYSLOG_FACILITY_LOCAL1:
{ "LOCAL4", SYSLOG_FACILITY_LOCAL4 }, log_facility = LOG_LOCAL1;
{ "LOCAL5", SYSLOG_FACILITY_LOCAL5 }, break;
{ "LOCAL6", SYSLOG_FACILITY_LOCAL6 }, case SYSLOG_FACILITY_LOCAL2:
{ "LOCAL7", SYSLOG_FACILITY_LOCAL7 }, log_facility = LOG_LOCAL2;
{ NULL, 0 } break;
}; case SYSLOG_FACILITY_LOCAL3:
log_facility = LOG_LOCAL3;
static struct { break;
const char *name; case SYSLOG_FACILITY_LOCAL4:
LogLevel val; log_facility = LOG_LOCAL4;
} log_levels[] = break;
{ case SYSLOG_FACILITY_LOCAL5:
{ "QUIET", SYSLOG_LEVEL_QUIET }, log_facility = LOG_LOCAL5;
{ "FATAL", SYSLOG_LEVEL_FATAL }, break;
{ "ERROR", SYSLOG_LEVEL_ERROR }, case SYSLOG_FACILITY_LOCAL6:
{ "INFO", SYSLOG_LEVEL_INFO }, log_facility = LOG_LOCAL6;
{ "VERBOSE", SYSLOG_LEVEL_VERBOSE }, break;
{ "DEBUG", SYSLOG_LEVEL_DEBUG1 }, case SYSLOG_FACILITY_LOCAL7:
{ "DEBUG1", SYSLOG_LEVEL_DEBUG1 }, log_facility = LOG_LOCAL7;
{ "DEBUG2", SYSLOG_LEVEL_DEBUG2 }, break;
{ "DEBUG3", SYSLOG_LEVEL_DEBUG3 }, default:
{ NULL, 0 } fprintf(stderr,
}; "Unrecognized internal syslog facility code %d\n",
(int) facility);
SyslogFacility exit(1);
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 #define MSGBUFSIZ 1024
log_level_number(char *name)
void
do_log(LogLevel level, const char *fmt, va_list args)
{ {
int i; char msgbuf[MSGBUFSIZ];
if (name != NULL) char fmtbuf[MSGBUFSIZ];
for (i = 0; log_levels[i].name; i++) char *txt = NULL;
if (strcasecmp(log_levels[i].name, name) == 0) int pri = LOG_INFO;
return log_levels[i].val;
return (LogLevel) - 1; if (level > log_level)
return;
switch (level) {
case SYSLOG_LEVEL_FATAL:
if (!log_on_stderr)
txt = "fatal";
pri = LOG_CRIT;
break;
case SYSLOG_LEVEL_ERROR:
if (!log_on_stderr)
txt = "error";
pri = LOG_ERR;
break;
case SYSLOG_LEVEL_INFO:
pri = LOG_INFO;
break;
case SYSLOG_LEVEL_VERBOSE:
pri = LOG_INFO;
break;
case SYSLOG_LEVEL_DEBUG1:
txt = "debug1";
pri = LOG_DEBUG;
break;
case SYSLOG_LEVEL_DEBUG2:
txt = "debug2";
pri = LOG_DEBUG;
break;
case SYSLOG_LEVEL_DEBUG3:
txt = "debug3";
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\r\n", msgbuf);
} else {
openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
syslog(pri, "%.500s", msgbuf);
closelog();
}
} }

12
ssh.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.100 2001/03/01 22:46:37 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.101 2001/03/03 23:59:34 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -556,9 +556,11 @@ main(int ac, char **av)
/* Take a copy of the returned structure. */ /* Take a copy of the returned structure. */
pw = pwcopy(pw); pw = pwcopy(pw);
/* Initialize "log" output. Since we are the client all output /*
actually goes to the terminal. */ * Initialize "log" output. Since we are the client all output
log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0); * actually goes to stderr.
*/
log_init(av[0], SYSLOG_LEVEL_INFO, SYSLOG_FACILITY_USER, 1);
/* Read per-user configuration file. */ /* Read per-user configuration file. */
snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE);
@ -571,7 +573,7 @@ main(int ac, char **av)
fill_default_options(&options); fill_default_options(&options);
/* reinit */ /* reinit */
log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 0); log_init(av[0], options.log_level, SYSLOG_FACILITY_USER, 1);
if (options.user == NULL) if (options.user == NULL)
options.user = xstrdup(pw->pw_name); options.user = xstrdup(pw->pw_name);