- (djm) Merge OpenBSD changes:

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index 3b65c6a6f26b13724c7ced0d02508d60e9fc3168..f00a1284f55140c6d3ea93636d46bbe70d6d0eb6 100644 (file)
--- a/servconf.h
+++ b/servconf.h
@@ -1,19 +1,17 @@
 /*
- *
- * servconf.h
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- *
- * Created: Mon Aug 21 15:35:03 1995 ylo
- *
  * Definitions for server configuration data and for the functions reading it.
  *
+ * 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: servconf.h,v 1.27 2000/07/22 09:14:36 markus Exp $"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.28 2000/09/07 20:27:53 deraadt Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H