Notice/Acknowledge updates

build/mkdep.aix

 #! /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

 #! /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

 :: $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

 #! /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

 # $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 Server Modules
+## 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
+#
 
 LIBRARY = $(LIBBASE).la
 LIBSTAT = lib$(LIBBASE).a

build/openldap.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 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

 # $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 Programs
+## 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
+#
 
 all-common: $(PROGRAMS) FORCE
 

build/srv.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 Servers
+## 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
+#
 
 all-common: all-$(BUILD_SRV)
 all-no lint-no 5lint-no depend-no install-no:

build/top.mk

 # $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

 /*
- * 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

 #! /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

 #! /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

+# 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

+# 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