ITS#6368 partially revert 1.273, always check for skips, not just on

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 4677202145f08ca3129c35ce8abc6952f5afb139..75e86c385edf16ded39c605032d7af3821178b7f 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,4 +1,4 @@
-Copyright 1998-2006 The OpenLDAP Foundation
+Copyright 1998-2009 The OpenLDAP Foundation

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


@@ -12,11 +12,11 @@ top-level directory of the distribution or, alternatively, at
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Individual files and/or contributed packages may be copyright by
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Individual files and/or contributed packages may be copyright by

-other parties and subject to additional restrictions.
+other parties and/or subject to additional restrictions.

 
 This work is derived from the University of Michigan LDAP v3.3
 distribution.  Information concerning this software is available
 
 This work is derived from the University of Michigan LDAP v3.3
 distribution.  Information concerning this software is available

-at <http://www.umich.edu/~dirsvcs/ldap/>.
+at <http://www.umich.edu/~dirsvcs/ldap/ldap.html>.

 
 This work also contains materials derived from public sources.
 
 
 This work also contains materials derived from public sources.
 


@@ -25,7 +25,7 @@ Additional information about OpenLDAP can be obtained at
 
 ---
 
 
 ---
 

-Portions Copyright 1998-2006 Kurt D. Zeilenga.
+Portions Copyright 1998-2008 Kurt D. Zeilenga.

 Portions Copyright 1998-2006 Net Boolean Incorporated.
 Portions Copyright 2001-2006 IBM Corporation.
 All rights reserved.
 Portions Copyright 1998-2006 Net Boolean Incorporated.
 Portions Copyright 2001-2006 IBM Corporation.
 All rights reserved.


@@ -36,9 +36,11 @@ Public License.
 
 ---
 
 
 ---
 

-Portions Copyright 1999-2005 Howard Y.H. Chu.
-Portions Copyright 1999-2005 Symas Corporation.
+Portions Copyright 1999-2008 Howard Y.H. Chu.
+Portions Copyright 1999-2008 Symas Corporation.

 Portions Copyright 1998-2003 Hallvard B. Furuseth.
 Portions Copyright 1998-2003 Hallvard B. Furuseth.

+Portions Copyright 2008-2009 Gavin Henry.
+Portions Copyright 2008-2009 Suretec Systems Ltd.

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without