fix slapi_sdn_isempty() logic

[openldap] / COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
index 5c41b9aafdd62bf22eac4b791a3008a10c9b9521..bb20ca036242a472c786607faff587957f45d0a3 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,11 +1,13 @@
-Copyright 1998-2003 The OpenLDAP Foundation
+Copyright 1998-2005 The OpenLDAP Foundation

 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP

-Public License.  A copy of this license is available at
-http://www.OpenLDAP.org/license.html or in the file LICENSE in the
-top-level directory of the distribution.
+Public License.
+
+A copy of this license is available in the file LICENSE in the
+top-level directory of the distribution or, alternatively, at
+<http://www.OpenLDAP.org/license.html>.

 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 


@@ -14,24 +16,37 @@ other parties and 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/>.

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

-Additional information about OpenLDAP can be obtained at:
-    http://www.openldap.org/
+Additional information about OpenLDAP can be obtained at
+<http://www.openldap.org/>.

 
 ---
 
 
 ---
 

-Portions Copyright 1998-2003 Kurt D. Zeilenga.
-Portions Copyright 1998-2003 Net Boolean Incorporated.
+Portions Copyright 1998-2005 Kurt D. Zeilenga.
+Portions Copyright 1998-2005 Net Boolean Incorporated.
+Portions Copyright 2001-2005 IBM Corporation.

 All rights reserved.
 
 All rights reserved.
 

-Redistribution and use in source and binary forms are permitted
-provided that this notice is preserved.  The names of the copyright
-holders may not be used to endorse or promote products derived from
-this software without their specific prior written permission.  This
-software is provided ``as is'' without express or implied warranty.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted only as authorized by the OpenLDAP
+Public License.
+
+---
+
+Portions Copyright 1999-2005 Howard Y.H. Chu.
+Portions Copyright 1999-2005 Symas Corporation.
+Portions Copyright 1998-2003 Hallvard B. Furuseth.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that this notice is preserved.
+The names of the copyright holders may not be used to endorse or
+promote products derived from this software without their specific
+prior written permission.  This software is provided ``as is''
+without express or implied warranty.

 
 ---
 
 
 ---