From a4691d42f749de19890823deb77459b3bd91c42a Mon Sep 17 00:00:00 2001 From: Markus Friedl Date: Thu, 18 Jan 2001 16:20:23 +0000 Subject: log() is at pri=LOG_INFO, since LOG_NOTICE goes to /dev/console on many systems --- usr.bin/ssh/log-client.c | 6 +++--- usr.bin/ssh/log-server.c | 10 +++++----- usr.bin/ssh/log.c | 7 +++---- usr.bin/ssh/readconf.c | 4 ++-- usr.bin/ssh/servconf.c | 4 ++-- usr.bin/ssh/ssh.1 | 6 +++--- usr.bin/ssh/ssh.h | 4 ++-- usr.bin/ssh/sshd.8 | 6 +++--- usr.bin/ssh/sshd.c | 4 ++-- 9 files changed, 25 insertions(+), 26 deletions(-) (limited to 'usr.bin/ssh') diff --git a/usr.bin/ssh/log-client.c b/usr.bin/ssh/log-client.c index bfcab30ba62..656499ad1d7 100644 --- a/usr.bin/ssh/log-client.c +++ b/usr.bin/ssh/log-client.c @@ -36,12 +36,12 @@ */ #include "includes.h" -RCSID("$OpenBSD: log-client.c,v 1.13 2001/01/07 11:28:04 markus Exp $"); +RCSID("$OpenBSD: log-client.c,v 1.14 2001/01/18 16:20:21 markus Exp $"); #include "xmalloc.h" #include "ssh.h" -static LogLevel log_level = SYSLOG_LEVEL_NOTICE; +static LogLevel log_level = SYSLOG_LEVEL_INFO; /* Initialize the log. * av0 program name (should be argv[0]) @@ -55,7 +55,7 @@ log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2) case SYSLOG_LEVEL_QUIET: case SYSLOG_LEVEL_FATAL: case SYSLOG_LEVEL_ERROR: - case SYSLOG_LEVEL_NOTICE: + case SYSLOG_LEVEL_INFO: case SYSLOG_LEVEL_VERBOSE: case SYSLOG_LEVEL_DEBUG1: case SYSLOG_LEVEL_DEBUG2: diff --git a/usr.bin/ssh/log-server.c b/usr.bin/ssh/log-server.c index 9946a1b60bf..3c5547387ec 100644 --- a/usr.bin/ssh/log-server.c +++ b/usr.bin/ssh/log-server.c @@ -36,14 +36,14 @@ */ #include "includes.h" -RCSID("$OpenBSD: log-server.c,v 1.18 2001/01/07 11:28:05 markus Exp $"); +RCSID("$OpenBSD: log-server.c,v 1.19 2001/01/18 16:20:21 markus Exp $"); #include #include "packet.h" #include "xmalloc.h" #include "ssh.h" -static LogLevel log_level = SYSLOG_LEVEL_NOTICE; +static LogLevel log_level = SYSLOG_LEVEL_INFO; static int log_on_stderr = 0; static int log_facility = LOG_AUTH; @@ -60,7 +60,7 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr) case SYSLOG_LEVEL_QUIET: case SYSLOG_LEVEL_FATAL: case SYSLOG_LEVEL_ERROR: - case SYSLOG_LEVEL_NOTICE: + case SYSLOG_LEVEL_INFO: case SYSLOG_LEVEL_VERBOSE: case SYSLOG_LEVEL_DEBUG1: case SYSLOG_LEVEL_DEBUG2: @@ -136,8 +136,8 @@ do_log(LogLevel level, const char *fmt, va_list args) txt = "error"; pri = LOG_ERR; break; - case SYSLOG_LEVEL_NOTICE: - pri = LOG_NOTICE; + case SYSLOG_LEVEL_INFO: + pri = LOG_INFO; break; case SYSLOG_LEVEL_VERBOSE: pri = LOG_INFO; diff --git a/usr.bin/ssh/log.c b/usr.bin/ssh/log.c index 7dfffa185f5..94b189b8da6 100644 --- a/usr.bin/ssh/log.c +++ b/usr.bin/ssh/log.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: log.c,v 1.13 2001/01/07 11:28:05 markus Exp $"); +RCSID("$OpenBSD: log.c,v 1.14 2001/01/18 16:20:21 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -71,7 +71,7 @@ log(const char *fmt,...) { va_list args; va_start(args, fmt); - do_log(SYSLOG_LEVEL_NOTICE, fmt, args); + do_log(SYSLOG_LEVEL_INFO, fmt, args); va_end(args); } @@ -206,13 +206,12 @@ static struct { { "QUIET", SYSLOG_LEVEL_QUIET }, { "FATAL", SYSLOG_LEVEL_FATAL }, { "ERROR", SYSLOG_LEVEL_ERROR }, - { "NOTICE", SYSLOG_LEVEL_NOTICE }, + { "INFO", SYSLOG_LEVEL_INFO }, { "VERBOSE", SYSLOG_LEVEL_VERBOSE }, { "DEBUG", SYSLOG_LEVEL_DEBUG1 }, { "DEBUG1", SYSLOG_LEVEL_DEBUG1 }, { "DEBUG2", SYSLOG_LEVEL_DEBUG2 }, { "DEBUG3", SYSLOG_LEVEL_DEBUG3 }, - { "INFO", SYSLOG_LEVEL_NOTICE }, /* backward compatible */ { NULL, 0 } }; diff --git a/usr.bin/ssh/readconf.c b/usr.bin/ssh/readconf.c index 6f862cb70ab..34eb3160d9a 100644 --- a/usr.bin/ssh/readconf.c +++ b/usr.bin/ssh/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.53 2001/01/07 11:28:05 markus Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.54 2001/01/18 16:20:22 markus Exp $"); #include "ssh.h" #include "readconf.h" @@ -802,7 +802,7 @@ fill_default_options(Options * options) if (options->user_hostfile2 == NULL) options->user_hostfile2 = SSH_USER_HOSTFILE2; if (options->log_level == (LogLevel) - 1) - options->log_level = SYSLOG_LEVEL_NOTICE; + options->log_level = SYSLOG_LEVEL_INFO; /* options->proxy_command should not be set by default */ /* options->user will be set in the main program if appropriate */ /* options->hostname will be set in the main program if appropriate */ diff --git a/usr.bin/ssh/servconf.c b/usr.bin/ssh/servconf.c index fb42d74ef16..544bb340ea8 100644 --- a/usr.bin/ssh/servconf.c +++ b/usr.bin/ssh/servconf.c @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: servconf.c,v 1.57 2001/01/08 22:29:05 markus Exp $"); +RCSID("$OpenBSD: servconf.c,v 1.58 2001/01/18 16:20:22 markus Exp $"); #include "ssh.h" #include "servconf.h" @@ -130,7 +130,7 @@ fill_default_server_options(ServerOptions *options) if (options->log_facility == (SyslogFacility) (-1)) options->log_facility = SYSLOG_FACILITY_AUTH; if (options->log_level == (LogLevel) (-1)) - options->log_level = SYSLOG_LEVEL_NOTICE; + options->log_level = SYSLOG_LEVEL_INFO; if (options->rhosts_authentication == -1) options->rhosts_authentication = 0; if (options->rhosts_rsa_authentication == -1) diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1 index 59cc7f18049..5807ec187eb 100644 --- a/usr.bin/ssh/ssh.1 +++ b/usr.bin/ssh/ssh.1 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.76 2001/01/07 11:28:06 markus Exp $ +.\" $OpenBSD: ssh.1,v 1.77 2001/01/18 16:20:22 markus Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -814,8 +814,8 @@ Only the superuser can forward privileged ports. Gives the verbosity level that is used when logging messages from .Nm ssh . The possible values are: -QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG. -The default is NOTICE. +QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. +The default is INFO. .It Cm NumberOfPasswordPrompts Specifies the number of password prompts before giving up. The argument to this keyword must be an integer. diff --git a/usr.bin/ssh/ssh.h b/usr.bin/ssh/ssh.h index 5c3cdbf594f..30fa28bfda2 100644 --- a/usr.bin/ssh/ssh.h +++ b/usr.bin/ssh/ssh.h @@ -12,7 +12,7 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: ssh.h,v 1.57 2001/01/07 11:28:06 markus Exp $"); */ +/* RCSID("$OpenBSD: ssh.h,v 1.58 2001/01/18 16:20:22 markus Exp $"); */ #ifndef SSH_H #define SSH_H @@ -398,7 +398,7 @@ typedef enum { SYSLOG_LEVEL_QUIET, SYSLOG_LEVEL_FATAL, SYSLOG_LEVEL_ERROR, - SYSLOG_LEVEL_NOTICE, + SYSLOG_LEVEL_INFO, SYSLOG_LEVEL_VERBOSE, SYSLOG_LEVEL_DEBUG1, SYSLOG_LEVEL_DEBUG2, diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index a513978d950..415d960a1fe 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.81 2001/01/13 18:56:48 markus Exp $ +.\" $OpenBSD: sshd.8,v 1.82 2001/01/18 16:20:22 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -499,8 +499,8 @@ The default is 600 (seconds). Gives the verbosity level that is used when logging messages from .Nm sshd . The possible values are: -QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG. -The default is NOTICE. +QUIET, FATAL, ERROR, INFO, VERBOSE and DEBUG. +The default is INFO. Logging with level DEBUG violates the privacy of users and is not recommended. .It Cm MaxStartups diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 9c5364c7a24..fb9e340669f 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.151 2001/01/18 15:54:49 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.152 2001/01/18 16:20:22 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -653,7 +653,7 @@ main(int ac, char **av) * key (unless started from inetd) */ log_init(__progname, - options.log_level == -1 ? SYSLOG_LEVEL_NOTICE : options.log_level, + options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level, options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility, !silent && !inetd_flag); -- cgit v1.2.3