Hopefully things did not get mixed around too much. It compiles under

[openssh.git] / xmalloc.c

diff --git a/xmalloc.c b/xmalloc.c
index dcb3d4eddb954d4fb20a34f4cae163f477375fa9..566bbfd202799968e8b6d453af7c4255517c55e1 100644 (file)
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -2,15 +2,21 @@
  * 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:23:10 1995 ylo
  * Versions of malloc and friends that check their results, and never return
  * failure (they call fatal if they encounter an error).
+ * 
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
 #include "includes.h"
-RCSID("$Id$");
+RCSID("$OpenBSD: xmalloc.c,v 1.9 2001/01/21 19:06:02 markus Exp $");
 
-#include "ssh.h"
+#include "xmalloc.h"
+#include "log.h"
 
 void *
 xmalloc(size_t size)