[ntpsec commit] License exception cleanup in include/ntif.h

Eric S. Raymond esr at ntpsec.org
Thu Oct 22 11:46:37 UTC 2015


Module:    ntpsec
Branch:    master
Commit:    700fc0b6f6cff81ff0d85d382109b4a42648b7e8
Changeset: http://git.ntpsec.org/ntpsec/commit/?id=700fc0b6f6cff81ff0d85d382109b4a42648b7e8

Author:    Eric S. Raymond <esr at thyrsus.com>
Date:      Thu Oct 22 06:24:44 2015 -0400

License exception cleanup in include/ntif.h

This contained a reference to the BSD license, but without the clauses
or disclaimer.  The Regents have nullified the restrictive clauses in
BSD software issued under their copyright. Thus, move to BSD-2-clause.

Approved-by: Mark Atwood <me at mark.atwood.name>

---

 include/ntif.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/include/ntif.h b/include/ntif.h
index 50b2ead..6b83254 100644
--- a/include/ntif.h
+++ b/include/ntif.h
@@ -1,19 +1,16 @@
-/* this is a hacked version of if.h from unix to contain the stuff we need only to build named (bind) with
-   the minimal amount of changes... by l. kahn */
-
-   /*
+/*
  * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ *
+ * this is a hacked version of if.h from BSD unix to contain the stuff
+ * we need only to build named (bind) with
+ * the minimal amount of changes... by l. kahn
+ *
+ * SPDX-License-Identifier: BSD-2-clause
  */
 
 #ifndef	GUARD_NET_IF_H
 #define	GUARD_NET_IF_H
 
-
-/* #pragma ident	"@(#)if.h	1.3	93/06/30 SMI"
-/* if.h 1.26 90/05/29 SMI; from UCB 7.1 6/4/86		*/
-
 #ifdef	__cplusplus
 extern "C" {
 #endif



More information about the vc mailing list