- Merged very large OpenBSD source code reformat

 - OpenBSD CVS updates
   - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
     [ssh.h sshd.8 sshd.c]
     syslog changes:
     * Unified Logmessage for all auth-types, for success and for failed
     * Standard connections get only ONE line in the LOG when level==LOG:
       Auth-attempts are logged only, if authentication is:
          a) successfull or
          b) with passwd or
          c) we had more than AUTH_FAIL_LOG failues
     * many log() became verbose()
     * old behaviour with level=VERBOSE
   - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
     tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
     messages. allows use of s/key in windows (ttssh, securecrt) and
     ssh-1.2.27 clients without 'ssh -v', ok: niels@
   - [sshd.8]
     -V, for fallback to openssh in SSH2 compatibility mode
   - [sshd.c]
     fix sigchld race; cjc5@po.cwru.edu

1 files changed, 40 insertions, 41 deletions

diff --git a/log-client.c b/log-client.c
index 63cc79445..4d40cf268 100644
--- a/log-client.c
+++ b/log-client.c
@@ -1,21 +1,21 @@
 /*
-
-log-client.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:13:40 1995 ylo
-
-Client-side versions of debug(), log(), etc.  These print to stderr.
-This is a stripped down version of log-server.c.
-
-*/
+ * 
+ * log-client.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:13:40 1995 ylo
+ * 
+ * Client-side versions of debug(), log(), etc.  These print to stderr.
+ * This is a stripped down version of log-server.c.
+ * 
+ */
 
 #include "includes.h"
-RCSID("$Id: log-client.c,v 1.2 1999/11/11 06:57:39 damien Exp $");
+RCSID("$Id: log-client.c,v 1.3 1999/11/24 13:26:22 damien Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -23,27 +23,26 @@ RCSID("$Id: log-client.c,v 1.2 1999/11/11 06:57:39 damien Exp $");
 static LogLevel log_level = SYSLOG_LEVEL_INFO;
 
 /* Initialize the log.
-     av0        program name (should be argv[0])
-     level      logging level
-     */
+ *   av0        program name (should be argv[0])
+ *   level      logging level
+ */
 
 void
 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_CHAT:
-    case SYSLOG_LEVEL_DEBUG:
-      log_level = level;
-      break;
-    default:
-      /* unchanged */
-      break;
-    }
+        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:
+                /* unchanged */
+                break;
+        }
 }
 
 #define MSGBUFSIZE 1024
@@ -51,13 +50,13 @@ log_init(char *av0, LogLevel level, SyslogFacility ignored1, int ignored2)
 void
 do_log(LogLevel level, const char *fmt, va_list args)
 {
-  char msgbuf[MSGBUFSIZE];
-
-  if (level > log_level)
-    return;
-  if (level == SYSLOG_LEVEL_DEBUG)
-    fprintf(stderr, "debug: ");
-  vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
-  fprintf(stderr, "%s", msgbuf);
-  fprintf(stderr, "\r\n");
+        char msgbuf[MSGBUFSIZE];
+
+        if (level > log_level)
+                return;
+        if (level == SYSLOG_LEVEL_DEBUG)
+                fprintf(stderr, "debug: ");
+        vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
+        fprintf(stderr, "%s", msgbuf);
+        fprintf(stderr, "\r\n");
 }