Notice/Acknowledge updates

COPYRIGHT

-Copyright 1998-2003 The OpenLDAP Foundation.
+Copyright 1998-2003 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -16,12 +16,12 @@ 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
-at: http://www.umich.edu/~dirsvcs/ldap/
+at <http://www.umich.edu/~dirsvcs/ldap/>.
 
 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/>.
 
 ---
 

INSTALL

@@ -99,3 +99,15 @@ End of OpenLDAP INSTALL file.
 $OpenLDAP: pkg/openldap-guide/release/install.sdf,v 1.16 2002/02/18
 17:09:26 kurt Exp $
 
+Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
+	California, USA.  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 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.

Makefile.in

-# $OpenLDAP$
 # Master Makefile for OpenLDAP
-##
-## Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+# $OpenLDAP$
+## Copyright 1998-2003 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
-## Redistribution and use in source and binary forms 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 file LICENSE in the top-level directory of the distribution.
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 SUBDIRS= include libraries clients servers tests doc
 CLEANDIRS=

README

@@ -25,3 +25,16 @@ Contributing
 
 ---
 $OpenLDAP$
+
+Copyright 1998-2003 The OpenLDAP Foundation, Redwood City,
+	California, USA.  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 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.

acconfig.h

-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* Copyright 1998-2003 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
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in 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>.
  */
 
 #ifndef _LDAP_PORTABLE_H

acinclude.m4

+dnl OpenLDAP Autoconf Macros
+dnl $OpenLDAP$
 dnl
-dnl Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+dnl Copyright 1998-2003 The OpenLDAP Foundation.
 dnl All rights reserved.
-dnl 
+dnl
 dnl Redistribution and use in source and binary forms, with or without
 dnl modification, are permitted only as authorized by the OpenLDAP
-dnl Public License.  A copy of this license is available at
-dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
-dnl top-level directory of the distribution.
-dnl
-dnl OpenLDAP Autoconf Macros
+dnl Public License.
 dnl
+dnl A copy of this license is available in the file LICENSE in the
+dnl top-level directory of the distribution or, alternatively, at
+dnl <http://www.OpenLDAP.org/license.html>.
 divert(-1)
 builtin(include, build/openldap.m4)dnl

aclocal.m4

@@ -10,18 +10,16 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 dnl PARTICULAR PURPOSE.
 
-dnl
-dnl Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+dnl Copyright 1998-2003 The OpenLDAP Foundation.
 dnl All rights reserved.
-dnl 
+dnl
 dnl Redistribution and use in source and binary forms, with or without
 dnl modification, are permitted only as authorized by the OpenLDAP
-dnl Public License.  A copy of this license is available at
-dnl http://www.OpenLDAP.org/license.html or in file LICENSE in the
-dnl top-level directory of the distribution.
-dnl
-dnl OpenLDAP Autoconf Macros
+dnl Public License.
 dnl
+dnl A copy of this license is available in the file LICENSE in the
+dnl top-level directory of the distribution or, alternatively, at
+dnl <http://www.OpenLDAP.org/license.html>.
 divert(-1)
 builtin(include, build/openldap.m4)dnl
 

build/build.mak

+# build.mak: nmake for MSVC builds
 # $OpenLDAP$
-#
-# Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-# COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-#
+## Copyright 1998-2003 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
+## 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>.
 
 all: build.txt
 

build/config.guess

 #! /bin/sh
 # Attempt to guess a canonical system name.
+#   Copyright 1998-2003 The OpenLDAP Foundation.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
-# Portions Copyright 1998-2002 OpenLDAP Foundation.
 
 timestamp='2002-10-21-OpenLDAP'
+# $OpenLDAP$
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -28,8 +29,17 @@ timestamp='2002-10-21-OpenLDAP'
 # This file is distributed with OpenLDAP Software, which contains a
 # configuration script generated by Autoconf, and is distributable
 # under the same distributions terms as OpenLDAP inself.
-# See the OpenLDAP COPYRIGHT and LICENSE file for details.
-# $OpenLDAP$
+
+## Copyright 1998-2003 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
+## 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>.
 
 # Originally written by Per Bothner <per@bothner.com>.
 # Please send patches to <config-patches@gnu.org>.  Submit a context

build/config.sub

 #! /bin/sh
 # Configuration validation subroutine script.
+#   Copyright 1998-2003 The OpenLDAP Foundation.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002 Free Software Foundation, Inc.
-# Portions Copyright 1998-2002 OpenLDAP Foundation.
 
 timestamp='2002-09-05 (OpenLDAP)'
+# $OpenLDAP$
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -33,8 +34,17 @@ timestamp='2002-09-05 (OpenLDAP)'
 # This file is distributed with OpenLDAP Software, which contains a
 # configuration script generated by Autoconf, and is distributable
 # under the same distributions terms as OpenLDAP inself.
-# See the OpenLDAP COPYRIGHT and LICENSE file for details.
-# $OpenLDAP$
+
+## Copyright 1998-2003 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
+## 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>.
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
 # diff and a properly formatted ChangeLog entry.

build/crupdate

 #! /bin/sh
 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
+## Copyright 1998-2003 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
+## 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>.
 #
 # Update copyright statements
 #

build/dir.mk

 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makes subdirectories
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makes subdirectories
+#
 
 
 all-common: FORCE

build/info.mk

 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile Template for Non-Source Directories
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makefile Template for Non-Source Directories
+#
 
 Makefile: $(top_srcdir)/build/info.mk

build/lib-shared.mk

 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile Template for Shared Libraries
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makefile Template for Shared Libraries
+#
 
 MKDEPFLAG = -l
 

build/lib-static.mk

 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile Template for Static Libraries
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makefile Template for Static Libraries
+#
 
 $(LIBRARY): version.o
 	$(AR) ru $@ $(OBJS) version.o

build/lib.mk

 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile Template for Libraries
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makefile Template for Libraries
+#
 
 all-common: $(LIBRARY) $(PROGRAMS)
 

build/ltmain.sh

@@ -27,7 +27,17 @@
 # This file is distributed with OpenLDAP Software, which contains a
 # configuration script generated by Autoconf, and is distributable
 # under the same distributions terms as OpenLDAP inself.
-# See the OpenLDAP COPYRIGHT and LICENSE file for details.
+
+## Copyright 1998-2003 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
+## 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>.
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then

build/man.mk

 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile Template for Manual Pages
+## 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 in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makefile Template for Manual Pages
+#
 
 MANDIR=$(mandir)/man$(MANSECT)
 TMP_SUFFIX=tmp

build/missing

 #! /bin/sh
 # $OpenLDAP$
-## Portions Copyright 1998-2003 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
-## Public License.  A copy of this license is available at
-## http://www.OpenLDAP.org/license.html or in file LICENSE in the
-## top-level directory of the distribution.
-
 # This file is distributed with OpenLDAP Software but is an an 
 # independently licensed program.
 

build/mkdep

 #! /bin/sh -
 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
+## Copyright 1998-2003 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
+## 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>.
 #
-# Portions
-# Copyright (c) 1987 Regents of the University of California.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# advertising materials, and other materials related to such
-# distribution and use acknowledge that the software was developed
-# by the University of California, Berkeley.  The name of the
-# University may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+## Portions Copyright (c) 1987 Regents of the University of California.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms are permitted
+## provided that the above copyright notice and this paragraph are
+## duplicated in all such forms and that any documentation,
+## advertising materials, and other materials related to such
+## distribution and use acknowledge that the software was developed
+## by the University of California, Berkeley.  The name of the
+## University may not be used to endorse or promote products derived
+## from this software without specific prior written permission.
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+## IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+## WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #	@(#)mkdep.sh	5.12 (Berkeley) 6/30/88
 #