- (djm) Merge OpenBSD changes:

[openssh.git] / xmalloc.h

diff --git a/xmalloc.h b/xmalloc.h
index b11b49cbf8ee254dd8db022a3c819e1ec123f8fc..59a598ed6df10b32b971ad9b4a67e02dfdf3a9bf 100644 (file)
--- a/xmalloc.h
+++ b/xmalloc.h
@@ -1,20 +1,20 @@
 /*
- *
- * 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).
  *
+ * 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".
  */
 
-/* RCSID("$OpenBSD: xmalloc.h,v 1.4 2000/06/20 01:39:45 markus Exp $"); */
+/* RCSID("$OpenBSD: xmalloc.h,v 1.5 2000/09/07 20:27:56 deraadt Exp $"); */
 
 #ifndef XMALLOC_H
 #define XMALLOC_H