- 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, 21 insertions, 21 deletions

diff --git a/xmalloc.h b/xmalloc.h
index 7a9610e7e..94280b118 100644
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,34 +1,34 @@
 /*
-
-xmalloc.h
-
-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 22:09:17 1995 ylo
-
-Versions of malloc and friends that check their results, and never return
-failure (they call fatal if they encounter an error).
-
-*/
-
-/* RCSID("$Id: xmalloc.h,v 1.1 1999/10/27 03:42:46 damien Exp $"); */
+ * 
+ * xmalloc.h
+ * 
+ * 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 22:09:17 1995 ylo
+ * 
+ * Versions of malloc and friends that check their results, and never return
+ * failure (they call fatal if they encounter an error).
+ * 
+ */
+
+/* RCSID("$Id: xmalloc.h,v 1.2 1999/11/24 13:26:23 damien Exp $"); */
 
 #ifndef XMALLOC_H
 #define XMALLOC_H
 
 /* Like malloc, but calls fatal() if out of memory. */
-void *xmalloc(size_t size);
+void   *xmalloc(size_t size);
 
 /* Like realloc, but calls fatal() if out of memory. */
-void *xrealloc(void *ptr, size_t new_size);
+void   *xrealloc(void *ptr, size_t new_size);
 
 /* Frees memory allocated using xmalloc or xrealloc. */
-void xfree(void *ptr);
+void    xfree(void *ptr);
 
 /* Allocates memory using xmalloc, and copies the string into that memory. */
-char *xstrdup(const char *str);
+char   *xstrdup(const char *str);
 
-#endif /* XMALLOC_H */
+#endif				/* XMALLOC_H */