Notice/Acknowledge updates

COPYRIGHT

@@ -1,4 +1,4 @@
-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

@@ -1,14 +1,15 @@
-# $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

@@ -1,12 +1,13 @@
-/*
- * 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

@@ -1,14 +1,15 @@
+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

@@ -1,8 +1,15 @@
+# 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

@@ -1,10 +1,11 @@
 #! /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

@@ -1,10 +1,11 @@
 #! /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

@@ -1,8 +1,15 @@
 #! /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

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makes subdirectories
-##
+#
+# Makes subdirectories
+#
 
 
 all-common: FORCE

build/info.mk

@@ -1,10 +1,17 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Non-Source Directories
-##
+#
+# Makefile Template for Non-Source Directories
+#
 
 Makefile: $(top_srcdir)/build/info.mk

build/lib-shared.mk

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Shared Libraries
-##
+#
+# Makefile Template for Shared Libraries
+#
 
 MKDEPFLAG = -l
 

build/lib-static.mk

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Static Libraries
-##
+#
+# Makefile Template for Static Libraries
+#
 
 $(LIBRARY): version.o
 	$(AR) ru $@ $(OBJS) version.o

build/lib.mk

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Libraries
-##
+#
+# 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

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Manual Pages
-##
+#
+# Makefile Template for Manual Pages
+#
 
 MANDIR=$(mandir)/man$(MANSECT)
 TMP_SUFFIX=tmp

build/missing

@@ -1,14 +1,5 @@
 #! /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

@@ -1,24 +1,30 @@
 #! /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
 #

build/mkdep.aix

@@ -1,7 +1,14 @@
 #! /bin/sh
-## 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>.
 cc_r -ME $* > /dev/null
 cat *.u
 rm *.u

build/mkrelease

@@ -1,8 +1,15 @@
 #! /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>.
 #
 # Make a release
 #	mkrelease RELNAME CVSTAG CVSMODULES

build/mkvers.bat

@@ -1,7 +1,15 @@
 :: $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>.
+
 ::
 :: Create a version.c file from build/version.h
 ::

build/mkversion

@@ -1,8 +1,15 @@
 #! /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>.
 #
 # Create a version.c file
 #

build/mod.mk

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Server Modules
-##
+#
+# Makefile Template for Server Modules
+#
 
 LIBRARY = $(LIBBASE).la
 LIBSTAT = lib$(LIBBASE).a

build/openldap.m4

@@ -1,15 +1,16 @@
+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 Public License.
 dnl
-dnl OpenLDAP Autoconf Macros
+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>.
 dnl
 dnl --------------------------------------------------------------------
 dnl Restricted form of AC_ARG_ENABLE that limits user options

build/rules.mk

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Programs
-##
+#
+# Makefile Template for Programs
+#
 
 all-common: $(PROGRAMS) FORCE
 

build/srv.mk

@@ -1,11 +1,18 @@
 # $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>.
 ##---------------------------------------------------------------------------
-##
-## Makefile Template for Servers
-##
+#
+# Makefile Template for Servers
+#
 
 all-common: all-$(BUILD_SRV)
 all-no lint-no 5lint-no depend-no install-no:

build/top.mk

@@ -1,13 +1,18 @@
 # $OpenLDAP$
-## 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
+##---------------------------------------------------------------------------
+#
+# Top-level Makefile template
+#
+
 PACKAGE= @PACKAGE@
 VERSION= @VERSION@
 RELEASEDATE= @OPENLDAP_RELEASE_DATE@

build/version.h

@@ -1,9 +1,17 @@
 /*
- * 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>.
  */
 
 static const char copyright[] =
-"Copyright 1998-2003 The OpenLDAP Foundation\n"
-"COPYING RESTRICTIONS APPLY\n";
+"Copyright 1998-2003 The OpenLDAP Foundation.  All rights reserved.\n"
+"COPYING RESTRICTIONS APPLY.\n";
+

build/version.sh

@@ -1,8 +1,15 @@
 #! /bin/sh
 # $OpenLDAP$
-## Copyright 2000-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>.
 #
 DIR=`dirname $0`
 . $DIR/version.var

build/version.var

@@ -1,8 +1,15 @@
 #! /bin/sh
 # $OpenLDAP$
-## Copyright 2000-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>.
 #
 ol_package=OpenLDAP
 ol_major=2

clients/Makefile.in

@@ -1,8 +1,15 @@
+# Clients Makefile.in for OpenLDAP
 # $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.
 ##
-## Clients Makefile.in for OpenLDAP
+## 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 = tools
 

clients/tools/Makefile.in

@@ -1,7 +1,16 @@
+# Makefile for LDAP tools
 # $OpenLDAP$
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile for LDAP tools
+## 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>.
+
 SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
 		ldappasswd.c ldapwhoami.c ldapcompare.c common.c
 OBJS	= ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o \

clients/tools/common.c

@@ -15,7 +15,8 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* This file was initially created by Hallvard B. Furuseth based (in
+/* ACKNOWLEDGEMENTS:
+ * This file was initially created by Hallvard B. Furuseth based (in
  * part) upon argument parsing code for individual tools located in
  * this directory.   Additional contributors include:
  *   Kurt D. Zeilenga (additional common argument and control support)

clients/tools/common.h

@@ -13,7 +13,8 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* This file was initially created by Hallvard B. Furuseth based (in
+/* ACKNOWLEDGEMENTS:
+ * This file was initially created by Hallvard B. Furuseth based (in
  * part) upon argument parsing code for individual tools located in
  * this directory. 
  */

clients/tools/ldapcompare.c

@@ -31,8 +31,9 @@
  * This is free software; you can redistribute and use it
  * under the same terms as OpenLDAP itself.
  */
-/* This work was originally developed by Jeff Costlow (F5 Networks)
- * based, in part, on existing LDAP tools.  Adaption for inclusion
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Jeff Costlow (F5 Networks)
+ * based, in part, on existing LDAP tools and adapted for inclusion
  * into OpenLDAP Software by Kurt D. Zeilenga.
  */
 

clients/tools/ldapdelete.c

@@ -26,7 +26,8 @@
  * from this software without specific prior written permission.  This
  * software is provided ``as is'' without express or implied warranty.
  */
-/* This work was originally developed by the University of Michigan
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
  * (as part of U-MICH LDAP).  Additional significant contributors
  * include:
  *   Kurt D. Zeilenga

clients/tools/ldapmodify.c

@@ -26,7 +26,8 @@
  * from this software without specific prior written permission.  This
  * software is provided ``as is'' without express or implied warranty.
  */
-/* This work was originally developed by the University of Michigan
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
  * (as part of U-MICH LDAP).  Additional significant contributors
  * include:
  *   Kurt D. Zeilenga

clients/tools/ldapmodrdn.c

@@ -34,7 +34,8 @@
  * from this software without specific prior written permission.  This
  * software is provided ``as is'' without express or implied warranty.
  */
-/* This work was originally developed by the University of Michigan
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
  * (as part of U-MICH LDAP).  Additional significant contributors
  * include:
  *    Kurt D. Zeilenga

clients/tools/ldappasswd.c

@@ -26,7 +26,8 @@
  * from this software without specific prior written permission.  This
  * software is provided ``as is'' without express or implied warranty.
  */
-/* The original ldappasswd(1) tool was developed by Dave Storey (F5
+/* ACKNOWLEDGEMENTS:
+ * The original ldappasswd(1) tool was developed by Dave Storey (F5
  * Network), based on other OpenLDAP client tools (which are, of
  * course, based on U-MICH LDAP).  This version was rewritten
  * by Kurt D. Zeilenga (based on other OpenLDAP client tools).

clients/tools/ldapsearch.c

@@ -26,7 +26,8 @@
  * from this software without specific prior written permission.  This
  * software is provided ``as is'' without express or implied warranty.
  */
-/* This work was originally developed by the University of Michigan
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
  * (as part of U-MICH LDAP).  Additional significant contributors
  * include:
  *   Jong Hyuk Choi

clients/tools/ldapwhoami.c

@@ -26,7 +26,8 @@
  * from this software without specific prior written permission.  This
  * software is provided ``as is'' without express or implied warranty.
  */
-/* This work was originally developed by Kurt D. Zeilenga for inclusion
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by Kurt D. Zeilenga for inclusion
  * in OpenLDAP Software based, in part, on other client tools.
  */
 

configure.in

@@ -1,14 +1,18 @@
 dnl $OpenLDAP$
 dnl
-dnl Copyright 1998-2003 The OpenLDAP Foundation.  All Rights Reserved.
-dnl 
+dnl Copyright 1998-2003 The OpenLDAP Foundation.
+dnl All rights reserved.
+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 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>.
 dnl
 dnl ----------------------------------------------------------------
+dnl
 dnl Redefine AC_INIT_BINSH to provide RCS IDs and copyright notice
 dnl at top of generated configure script.  Prints simple copyright.
 define([AC_INIT_BINSH],
@@ -16,15 +20,18 @@ define([AC_INIT_BINSH],
 # $]OpenLDAP[$
 # from] translit([$OpenLDAP$], $")] [
 
-# Copyright 1998-2003 The OpenLDAP Foundation.  All Rights Reserved.
-# 
+# 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>.
 
-echo "Copyright 1998-2003 The OpenLDAP Foundation,  All Rights Reserved."
+echo "Copyright 1998-2003 The OpenLDAP Foundation. All rights reserved."
 echo "	Restrictions apply, see COPYRIGHT and LICENSE files."
 ])dnl
 dnl ----------------------------------------------------------------

doc/Makefile.in

@@ -1,7 +1,14 @@
-# $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
-##
 ## doc Makefile.in for OpenLDAP
+# $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>.
 
 SUBDIRS= man

doc/devel/template.c

@@ -2,9 +2,9 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright YEAR The OpenLDAP Foundation
- * Portions Copyright YEAR Secondary Rights Holder 
- * Portions Copyright YEAR Another Rights Holder
+ * Copyright YEAR The OpenLDAP Foundation.
+ * Portions Copyright YEAR Secondary Rights Holder.
+ * Portions Copyright YEAR Another Rights Holder.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -19,7 +19,8 @@
  *  Please consult Kurt Zeilenga <kurt@openldap.org> before adding
  *  additional notices.
  */
-/* This work was initially developed by John Doe (of FOO Corporation).
- * This work was (SIGNIFICANTLY) modify by:
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by John Doe (of FOO Corporation).
+ * Additional significant contributors include:
  *   Jane Doe of BAR, Inc. (added this and that)
  */

doc/man/Makefile.in

@@ -1,7 +1,14 @@
+# man Makefile.in for OpenLDAP
 # $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.
 ##
-## man Makefile.in for OpenLDAP
+## 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= man1 man3 man5 man8

doc/man/man1/Makefile.in

@@ -1,7 +1,14 @@
+# man1 Makefile.in for OpenLDAP
 # $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.
 ##
-## man1 Makefile.in for OpenLDAP
+## 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>.
 
 MANSECT=1

doc/man/man3/Makefile.in

@@ -1,7 +1,14 @@
+# man3 Makefile.in for OpenLDAP
 # $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.
 ##
-## man3 Makefile.in for OpenLDAP
+## 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>.
 
 MANSECT=3

doc/man/man5/Makefile.in

@@ -1,7 +1,14 @@
+# man5 Makefile.in for OpenLDAP
 # $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.
 ##
-## man5 Makefile.in for OpenLDAP
+## 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>.
 
 MANSECT=5

doc/man/man8/Makefile.in

@@ -1,7 +1,14 @@
+# man8 Makefile.in for OpenLDAP
 # $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.
 ##
-## man8 Makefile.in for OpenLDAP
+## 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>.
 
 MANSECT=8

include/Makefile.in

@@ -1,8 +1,15 @@
+# include Makefile.in for OpenLDAP
 # $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.
 ##
-## include Makefile.in for OpenLDAP
+## 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-local: ldap_config.h FORCE
 

include/portable.h.in

@@ -1,13 +1,14 @@
 /* include/portable.h.in.  Generated automatically from configure.in by autoheader.  */
-/*
- * 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

libraries/Makefile.in

@@ -1,8 +1,15 @@
+# Libraries Makefile for OpenLDAP
 # $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.
 ##
-## Libraries Makefile for OpenLDAP
+## 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= \
 	liblutil \

libraries/libavl/Makefile.in

@@ -1,9 +1,15 @@
+# LIBAVL
 # $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.
 ##
-## LIBAVL
+## 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>.
 
 SRCS = avl.c testavl.c
 XSRCS = version.c

libraries/liblber/Makefile.in

@@ -1,9 +1,15 @@
+# LIBLBER
 # $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.
 ##
-## LIBLBER
+## 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>.
 
 LIBRARY = liblber.la
 

libraries/libldap/Makefile.in

@@ -1,9 +1,16 @@
+# Makefile.in for LDAP -lldap
 # $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.
 ##
-## Makefile.in for LDAP -lldap
+## 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>.
+
 LIBRARY = libldap.la
 
 PROGRAMS = apitest dntest ftest ltest

libraries/libldap_r/Makefile.in

@@ -1,9 +1,16 @@
+# Makefile.in for LDAP -lldap
 # $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.
 ##
-## Makefile.in for LDAP -lldap
+## 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>.
+
 LIBRARY = libldap_r.la
 
 PROGRAMS = apitest ltest

libraries/libldbm/Makefile.in

@@ -1,9 +1,15 @@
+# Makefile for -lldbm
 # $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.
 ##
-## Makefile for -lldbm
+## 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>.
 
 LIBRARY		= libldbm.a
 SRCS		= ldbm.c

libraries/liblunicode/Makefile.in

@@ -1,9 +1,16 @@
+# Makefile.in for LDAP -llunicode
 # $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.
 ##
-## Makefile.in for LDAP -lldap
+## 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>.
+
 LIBRARY = liblunicode.a
 
 XXDIR = $(srcdir)/*/

libraries/liblutil/Makefile.in

@@ -1,9 +1,15 @@
+# Makefile for -llutil
 # $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.
 ##
-## Makefile for -llutil
+## 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>.
 
 LIBRARY	= liblutil.a
 

libraries/librewrite/Makefile.in

@@ -1,8 +1,15 @@
+# LIBREWRITE
 # $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.
 ##
-## LIBREWRITE
+## 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>.
 ##
 ## Copyright 2000-2001 Pierangelo Masarati <ando@sys-net.it>
 ##

servers/Makefile.in

@@ -1,8 +1,15 @@
+# servers Makefile.in for OpenLDAP
 # $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.
 ##
-## servers Makefile.in for OpenLDAP
+## 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= slapd slurpd
 

servers/slapd/Makefile.in

@@ -1,9 +1,16 @@
-# $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-##
 ## Makefile.in for slapd
+# $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>.
+
 PROGRAMS=slapd
 XPROGRAMS=sslapd libbackends.a .backend
 XSRCS=version.c

servers/slapd/back-bdb/Makefile.in

@@ -1,17 +1,29 @@
+# Makefile.in for back-bdb
 # $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>.
 
 SRCS = init.c tools.c config.c \
 	add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
 	extended.c passwd.c referral.c operational.c \
 	attr.c index.c key.c dbcache.c filterindex.c \
-	dn2entry.c dn2id.c error.c id2entry.c idl.c nextid.c cache.c trans.c ctxcsn.c
+	dn2entry.c dn2id.c error.c id2entry.c idl.c \
+	nextid.c cache.c trans.c ctxcsn.c
+
 OBJS = init.lo tools.lo config.lo \
 	add.lo bind.lo compare.lo delete.lo modify.lo modrdn.lo search.lo \
 	extended.lo passwd.lo referral.lo operational.lo \
 	attr.lo index.lo key.lo dbcache.lo filterindex.lo \
-	dn2entry.lo dn2id.lo error.lo id2entry.lo idl.lo nextid.lo cache.lo trans.lo ctxcsn.lo
+	dn2entry.lo dn2id.lo error.lo id2entry.lo idl.lo \
+	nextid.lo cache.lo trans.lo ctxcsn.lo
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries

servers/slapd/back-dnssrv/Makefile.in

@@ -1,9 +1,20 @@
+# Makefile.in for back-dnssrv
 # $OpenLDAP$
-## Copyright 2000-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-########################################################################### 
-# DNSSRV backend written by Kurt Zeilenga
-##########################################################################
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## Portions Copyright 1998-2003 Kurt D. Zeilenga.
+## 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>.
+#
+# ACKNOWLEDGEMENTS:
+#  The DNSSRV backend was written by Kurt D. Zeilenga.
+#
 
 SRCS	= init.c bind.c search.c config.c referral.c
 OBJS	= init.lo bind.lo search.lo config.lo referral.lo

servers/slapd/back-hdb/Makefile.in

@@ -1,5 +1,17 @@
+# Makefile for back-hdb
 # $OpenLDAP$
-# Copyright 2003 Howard Chu @ Symas Corp. See master COPYRIGHT file for terms.
+## 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>.
+#
+## Copyright 2003 Howard Chu @ Symas Corp. See master COPYRIGHT file for terms.
 
 XXDIR = $(srcdir)/../back-bdb
 

servers/slapd/back-ldap/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-ldap
 # $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>.
 
 SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
 		delete.c modify.c modrdn.c \

servers/slapd/back-ldbm/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-ldbm
 # $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>.
 
 SRCS = idl.c add.c search.c cache.c dbcache.c dn2id.c entry.c \
 		id2entry.c index.c id2children.c nextid.c \

servers/slapd/back-meta/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-meta
 # $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>.
 
 SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
 		cache-query.c cache-search.c cache-config.c cache-merge.c \

servers/slapd/back-monitor/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-monitor
 # $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>.
 
 SRCS = init.c search.c compare.c modify.c bind.c \
 	operational.c \

servers/slapd/back-null/Makefile.in

@@ -1,5 +1,15 @@
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+# Makefile.in for back-null
+# $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>.
 
 SRCS = null.c
 OBJS = null.lo

servers/slapd/back-passwd/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-passwd
 # $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>.
 
 SRCS	= search.c config.c init.c
 OBJS	= search.lo config.lo init.lo

servers/slapd/back-perl/Makefile.in

@@ -1,4 +1,15 @@
+# Makefile.in for back-perl
 # $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>.
 ## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ########################################################################### 

servers/slapd/back-shell/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-shell
 # $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>.
 
 SRCS	= init.c config.c fork.c search.c bind.c unbind.c add.c \
 		delete.c modify.c modrdn.c compare.c result.c

servers/slapd/back-sql/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-sql
 # $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>.
 
 SRCS	= init.c config.c search.c bind.c other.c \
 		entry-id.c schema-map.c sql-wrap.c modify.c util.c

servers/slapd/back-tcl/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for back-tcl
 # $OpenLDAP$
-## Copyright 1999-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>.
 ########################################################################### 
 # 
 # Copyright 1999, Ben Collins <bcollins@debian.org>, All rights reserved.

servers/slapd/shell-backends/Makefile.in

@@ -1,6 +1,15 @@
+# Makefile.in for shell-backends
 # $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>.
 
 PROGRAMS = passwd-shell
 

servers/slapd/slapi/Makefile.in

@@ -1,10 +1,16 @@
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-
-## Copyright IBM Corp. 1997,2002,2003
+# Makefile.in for SLAPI
+# $OpenLDAP$
+## Copyright 1998-2003 The OpenLDAP Foundation.
+## Portions Copyright IBM Corp. 1997,2002,2003
+## 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>.
 
 LIBRARY = libslapi.la
 

servers/slapd/tools/Makefile.in

@@ -1,20 +1,15 @@
+# Makefile.in for slapd tools
 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-#-----------------------------------------------------------------------------
-# Portions Copyright (c) 1995 Regents of the University of Michigan.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that this notice is preserved and that due credit is given
-# to the University of Michigan at Ann Arbor. 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'' without express or implied warranty.
-#
-#       Stand alone LDAP server tools makefile
-#
-#-----------------------------------------------------------------------------
+## 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>.
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries

servers/slurpd/Makefile.in

@@ -1,9 +1,15 @@
+# Makefile.in for slurpd
 # $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.
 ##
-## Makefile.in for slurpd
+## 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>.
 
 PROGRAMS = slurpd
 XPROGRAMS = sslurpd

tests/Makefile.in

@@ -1,8 +1,16 @@
+# Makefile.in for tests
 # $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.
 ##
-## tests Makefile.in for OpenLDAP
+## 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>.
+
 RUN=./run
 SUBDIRS= progs
 

tests/progs/Makefile.in

@@ -1,8 +1,15 @@
+## Makefile.in for test programs
 # $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.
 ##
-## tests Makefile.in for OpenLDAP
+## 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>.
 
 PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn