- 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, 5 insertions, 3 deletions

diff --git a/auth-skey.c b/auth-skey.c
index 66e09bb59..457100ccc 100644
--- a/auth-skey.c
+++ b/auth-skey.c
@@ -1,7 +1,8 @@
+#include "includes.h"
+
 #ifdef SKEY
 
-#include "includes.h"
-RCSID("$Id: auth-skey.c,v 1.2 1999/10/16 20:57:52 deraadt Exp $");
+RCSID("$Id: auth-skey.c,v 1.3 1999/11/23 22:25:52 markus Exp $");
 
 #include "ssh.h"
 #include <sha1.h>
@@ -32,6 +33,7 @@ hash_collapse(s)
 
         return i;
 }
+
 char *
 skey_fake_keyinfo(char *username)
 {
@@ -150,4 +152,4 @@ skey_fake_keyinfo(char *username)
         return skeyprompt;
 }
 
-#endif SKEY
+#endif /* SKEY */