rename SYSLOG_LEVEL_INFO->SYSLOG_LEVEL_NOTICE

syslog priority changes:
	fatal() LOG_ERR  -> LOG_CRIT
	log()   LOG_INFO -> LOG_NOTICE

9 files changed, 32 insertions, 29 deletions

diff --git a/usr.bin/ssh/log-client.c b/usr.bin/ssh/log-client.c
index 505c8c33787..bfcab30ba62 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.12 2000/09/12 20:53:10 markus Exp $");
+RCSID("$OpenBSD: log-client.c,v 1.13 2001/01/07 11:28:04 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
 
-static LogLevel log_level = SYSLOG_LEVEL_INFO;
+static LogLevel log_level = SYSLOG_LEVEL_NOTICE;
 
 /* Initialize the log.
  *   av0	program name (should be argv[0])
@@ -53,9 +53,9 @@ log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
 {
 	switch (level) {
 	case SYSLOG_LEVEL_QUIET:
-	case SYSLOG_LEVEL_ERROR:
 	case SYSLOG_LEVEL_FATAL:
-	case SYSLOG_LEVEL_INFO:
+	case SYSLOG_LEVEL_ERROR:
+	case SYSLOG_LEVEL_NOTICE:
 	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 de3d5cfeb97..9946a1b60bf 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.17 2000/09/12 20:53:10 markus Exp $");
+RCSID("$OpenBSD: log-server.c,v 1.18 2001/01/07 11:28:05 markus Exp $");
 
 #include <syslog.h>
 #include "packet.h"
 #include "xmalloc.h"
 #include "ssh.h"
 
-static LogLevel log_level = SYSLOG_LEVEL_INFO;
+static LogLevel log_level = SYSLOG_LEVEL_NOTICE;
 static int log_on_stderr = 0;
 static int log_facility = LOG_AUTH;
 
@@ -58,9 +58,9 @@ 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_ERROR:
+	case SYSLOG_LEVEL_NOTICE:
 	case SYSLOG_LEVEL_VERBOSE:
 	case SYSLOG_LEVEL_DEBUG1:
 	case SYSLOG_LEVEL_DEBUG2:
@@ -128,15 +128,17 @@ do_log(LogLevel level, const char *fmt, va_list args)
 	if (level > log_level)
 		return;
 	switch (level) {
+	case SYSLOG_LEVEL_FATAL:
+		txt = "fatal";
+		pri = LOG_CRIT;
+		break;
 	case SYSLOG_LEVEL_ERROR:
 		txt = "error";
 		pri = LOG_ERR;
 		break;
-	case SYSLOG_LEVEL_FATAL:
-		txt = "fatal";
-		pri = LOG_ERR;
+	case SYSLOG_LEVEL_NOTICE:
+		pri = LOG_NOTICE;
 		break;
-	case SYSLOG_LEVEL_INFO:
 	case SYSLOG_LEVEL_VERBOSE:
 		pri = LOG_INFO;
 		break;
diff --git a/usr.bin/ssh/log.c b/usr.bin/ssh/log.c
index 9cae37125e6..7dfffa185f5 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.12 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: log.c,v 1.13 2001/01/07 11:28:05 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_INFO, fmt, args);
+	do_log(SYSLOG_LEVEL_NOTICE, fmt, args);
 	va_end(args);
 }
 
@@ -206,12 +206,13 @@ static struct {
 	{ "QUIET",	SYSLOG_LEVEL_QUIET },
 	{ "FATAL",	SYSLOG_LEVEL_FATAL },
 	{ "ERROR",	SYSLOG_LEVEL_ERROR },
-	{ "INFO",	SYSLOG_LEVEL_INFO },
+	{ "NOTICE",	SYSLOG_LEVEL_NOTICE },
 	{ "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 59268f413c1..6f862cb70ab 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.52 2000/12/27 12:30:19 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.53 2001/01/07 11:28:05 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_INFO;
+		options->log_level = SYSLOG_LEVEL_NOTICE;
 	/* 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 8dd6e7d8897..6604e3d2349 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.55 2000/12/19 23:17:57 markus Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.56 2001/01/07 11:28:06 markus Exp $");
 
 #include "ssh.h"
 #include "servconf.h"
@@ -129,7 +129,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_INFO;
+		options->log_level = SYSLOG_LEVEL_NOTICE;
 	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 f25c2998721..59cc7f18049 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.75 2001/01/04 22:35:32 djm Exp $
+.\" $OpenBSD: ssh.1,v 1.76 2001/01/07 11:28:06 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, INFO, VERBOSE and DEBUG.
-The default is INFO.
+QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG.
+The default is NOTICE.
 .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 b3252639ecf..5c3cdbf594f 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.56 2000/12/19 23:17:58 markus Exp $"); */
+/* RCSID("$OpenBSD: ssh.h,v 1.57 2001/01/07 11:28:06 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_INFO,
+	SYSLOG_LEVEL_NOTICE,
 	SYSLOG_LEVEL_VERBOSE,
 	SYSLOG_LEVEL_DEBUG1,
 	SYSLOG_LEVEL_DEBUG2,
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8
index 6078216b98c..d6232f4b253 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.78 2001/01/04 22:35:32 djm Exp $
+.\" $OpenBSD: sshd.8,v 1.79 2001/01/07 11:28:07 markus Exp $
 .Dd September 25, 1999
 .Dt SSHD 8
 .Os
@@ -492,8 +492,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, INFO, VERBOSE and DEBUG.
-The default is INFO.
+QUIET, FATAL, ERROR, NOTICE, VERBOSE and DEBUG.
+The default is NOTICE.
 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 ec8e782fb01..4c8ff6a1b5d 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.145 2001/01/04 22:25:58 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.146 2001/01/07 11:28:07 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -660,7 +660,7 @@ main(int ac, char **av)
 	 * key (unless started from inetd)
 	 */
 	log_init(__progname,
-	    options.log_level == -1 ? SYSLOG_LEVEL_INFO : options.log_level,
+	    options.log_level == -1 ? SYSLOG_LEVEL_NOTICE : options.log_level,
 	    options.log_facility == -1 ? SYSLOG_FACILITY_AUTH : options.log_facility,
 	    !silent && !inetd_flag);