Sync with HEAD

diff --git a/include/ac/alloca.h b/include/ac/alloca.h
index 88b419a106ba8067615d97a3a0002d0b75e7a4d1..c8b980633a000aa1269a1bf8f1106467b3129b35 100644 (file)
--- a/include/ac/alloca.h
+++ b/include/ac/alloca.h
@@ -1,14 +1,17 @@
 /* Generic alloca.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ALLOCA_H

diff --git a/include/ac/assert.h b/include/ac/assert.h
index 323c18dfc0650b685c21db0838b3563c97f21704..f8df48be5f8338d68c03a242ea6ff7b28351d06b 100644 (file)
--- a/include/ac/assert.h
+++ b/include/ac/assert.h
@@ -1,14 +1,17 @@
 /* Generic assert.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ASSERT_H
@@ -33,7 +36,7 @@
  */
 
 LBER_F (void) ber_pvt_assert LDAP_P(( const char *file, int line,
-                                        const char *test ));
+       const char *test ));
 
 /* Can't use LDAP_STRING(test), that'd expand to "test" */
 #if defined(__STDC__) || defined(__cplusplus)

diff --git a/include/ac/bytes.h b/include/ac/bytes.h
index 4563ae192e8de36000cc003b9bd26ca90a1a80aa..bbc9129686168d6f466b692974f7f708fc3de935 100644 (file)
--- a/include/ac/bytes.h
+++ b/include/ac/bytes.h
@@ -1,14 +1,17 @@
 /* Generic bytes.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_BYTES_H

diff --git a/include/ac/crypt.h b/include/ac/crypt.h
index 3f71af57e082c3f7dcb81fbf05c0cf522e125407..5b0c68b0432425aa4ed4acfe8c4a2f8d6f5848aa 100644 (file)
--- a/include/ac/crypt.h
+++ b/include/ac/crypt.h
@@ -1,14 +1,17 @@
 /* Generic crypt.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_CRYPT_H

diff --git a/include/ac/ctype.h b/include/ac/ctype.h
index 9c59f6973eae3f8fc47c9bd1a756d2820b8d41c4..023f7e0cb0e73bdd98c7c109bf40df7a9527e1fe 100644 (file)
--- a/include/ac/ctype.h
+++ b/include/ac/ctype.h
@@ -1,14 +1,17 @@
 /* Generic ctype.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_CTYPE_H

diff --git a/include/ac/dirent.h b/include/ac/dirent.h
index 8d2da0dd55a392acfbfc3a0f1a4e9153cdd95ca4..08fd7e818665efaa1878bf25bf46c582b3561c93 100644 (file)
--- a/include/ac/dirent.h
+++ b/include/ac/dirent.h
@@ -1,14 +1,17 @@
 /* Generic dirent.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_DIRENT_H

diff --git a/include/ac/errno.h b/include/ac/errno.h
index 29cedf4262351c00fb0c87f27e05baac2e34d5c0..889d3c0eb425e51595efdaae2dddf831369c5b38 100644 (file)
--- a/include/ac/errno.h
+++ b/include/ac/errno.h
@@ -1,14 +1,17 @@
 /* Generic errno.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_ERRNO_H

diff --git a/include/ac/krb.h b/include/ac/krb.h
index 9ebbb742b628cb34477f989beb6c05ef1eb07f5c..b29948903fd8a5ba86ea5b8d60816d528631a1bd 100644 (file)
--- a/include/ac/krb.h
+++ b/include/ac/krb.h
@@ -1,14 +1,17 @@
 /* Generic krb.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 /* Kerberos IV */

diff --git a/include/ac/krb5.h b/include/ac/krb5.h
index 1f4dc18557ea040c92e85eb78e501806e77e9c93..89c3ebf58e35fdbd92ccbdaaad55d5149e248ed8 100644 (file)
--- a/include/ac/krb5.h
+++ b/include/ac/krb5.h
@@ -1,14 +1,17 @@
 /* Generic krb.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 /* Kerberos V */

diff --git a/include/ac/localize.h b/include/ac/localize.h
index 834c0a16c67b4ba9cc1444bd0b7caff50d254409..721a5f4f6196f0bc14021d4a0a00cfbf973ef72a 100644 (file)
--- a/include/ac/localize.h
+++ b/include/ac/localize.h
@@ -1,14 +1,17 @@
 /* localize.h (i18n/l10n) */
 /* $OpenLDAP$ */
-/*
- * Copyright 2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_LOCALIZE_H

diff --git a/include/ac/param.h b/include/ac/param.h
index 4f67a107ab045ec32858d1904eb6fae67f101a2e..7991a74f5a9ba7790c7c58c506d8a2342705f035 100644 (file)
--- a/include/ac/param.h
+++ b/include/ac/param.h
@@ -1,14 +1,17 @@
 /* Generic param.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_PARAM_H

diff --git a/include/ac/regex.h b/include/ac/regex.h
index e63c03c419324ff8fe6c3d04cc2c2fa62facb34a..6f3c915b79ef2f0bf8f2c7dbffc5f29581e97832 100644 (file)
--- a/include/ac/regex.h
+++ b/include/ac/regex.h
@@ -1,14 +1,17 @@
 /* Generic Regex */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_REGEX_H_
@@ -20,11 +23,9 @@
 
 #ifndef HAVE_REGEX_H
 /*     NO POSIX REGEX!!
-       you'll need to install a POSIX compatible REGEX library.
-       Either Henry Spencer's or GNU regex will do.
-
-       For NT: http://people.delphi.com/gjc/hs_regex.html
-*/
+ *  You'll need to install a POSIX compatible REGEX library.
+ *  Either Henry Spencer's or GNU regex will do.
+ */
 #error "No POSIX REGEX available."
 
 #elif HAVE_GNUREGEX_H

diff --git a/include/ac/setproctitle.h b/include/ac/setproctitle.h
index 13002cdfaf0f33167d4b522d700888e29d7a0c33..6450f7b348ca9716a633a3d3650201a1db8f7bad 100644 (file)
--- a/include/ac/setproctitle.h
+++ b/include/ac/setproctitle.h
@@ -1,14 +1,17 @@
 /* Generic setproctitle.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SETPROCTITLE_H

diff --git a/include/ac/signal.h b/include/ac/signal.h
index 8c45a6cc18c5cc8392596528f475bdeff8b1c46b..a29b992204fbb25d3c5c099ed7e8822a5ba64417 100644 (file)
--- a/include/ac/signal.h
+++ b/include/ac/signal.h
@@ -1,14 +1,17 @@
 /* Generic signal.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SIGNAL_H

diff --git a/include/ac/socket.h b/include/ac/socket.h
index a28eac56d0502e4ec61300d922243d39b37bfe13..090ee8fbc236f1efa4344bdbca11df3922b919db 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -1,14 +1,17 @@
 /* Generic socket.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SOCKET_H_

diff --git a/include/ac/stdarg.h b/include/ac/stdarg.h
index 16bedb1b9839fac343e017814d9faa54a462b045..ffa8f4ab75cf7ff6f01fefa6842de57104316815 100644 (file)
--- a/include/ac/stdarg.h
+++ b/include/ac/stdarg.h
@@ -1,14 +1,17 @@
 /* Generic stdarg.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_STDARG_H

diff --git a/include/ac/stdlib.h b/include/ac/stdlib.h
index 94be31c5178458de369c3d315b5a8027dc35231a..41e3f42d829440a41b1c70397b91ce95fb654985 100644 (file)
--- a/include/ac/stdlib.h
+++ b/include/ac/stdlib.h
@@ -1,14 +1,17 @@
 /* Generic stdlib.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_STDLIB_H

diff --git a/include/ac/string.h b/include/ac/string.h
index 1d71d793329bc9b0404f981d972fe0ff7702d7a7..764dfc448474529eca9a60f10a2bb6c12423720e 100644 (file)
--- a/include/ac/string.h
+++ b/include/ac/string.h
@@ -1,14 +1,17 @@
 /* Generic string.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_STRING_H

diff --git a/include/ac/sysexits.h b/include/ac/sysexits.h
index c953845e049db26c778f263a3913d5f9d2e92a74..46707f2348a42a3774636aa609c32cb91585c7de 100644 (file)
--- a/include/ac/sysexits.h
+++ b/include/ac/sysexits.h
@@ -1,14 +1,17 @@
 /* Generic sysexits */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SYSEXITS_H_

diff --git a/include/ac/syslog.h b/include/ac/syslog.h
index f4eed2644fff3d5241e76c3e2f21eda88d1fda74..b36108ddfd4bdc45be6c00e932b1fa5ec5a9d0c8 100644 (file)
--- a/include/ac/syslog.h
+++ b/include/ac/syslog.h
@@ -1,14 +1,17 @@
 /* Generic syslog.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SYSLOG_H_

diff --git a/include/ac/termios.h b/include/ac/termios.h
index 61109e2f03a33772ddb813a7ec9890c64c28e410..1c532aed152e1b00a19be2ad422f8cec14d2d757 100644 (file)
--- a/include/ac/termios.h
+++ b/include/ac/termios.h
@@ -1,14 +1,17 @@
 /* Generic termios.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_TERMIOS_H

diff --git a/include/ac/time.h b/include/ac/time.h
index 01b911156dcd782c23435148e2b0c415039ef878..da0bb58040e75fdfd3bddc54937ea1428e31fa3f 100644 (file)
--- a/include/ac/time.h
+++ b/include/ac/time.h
@@ -1,14 +1,17 @@
 /* Generic time.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_TIME_H

diff --git a/include/ac/unistd.h b/include/ac/unistd.h
index 70c6197c03d7b7f55349e389dda6627f6012f207..a266dd83e26b5438e368ec7d4a188caa4ea0c412 100644 (file)
--- a/include/ac/unistd.h
+++ b/include/ac/unistd.h
@@ -1,14 +1,17 @@
 /* Generic unistd.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_UNISTD_H

diff --git a/include/ac/wait.h b/include/ac/wait.h
index 667b36de93a2934a320fe926e7d5ad0b612345ab..da27f52956ac6404bce0eb3cc8d18d037e79b3a7 100644 (file)
--- a/include/ac/wait.h
+++ b/include/ac/wait.h
@@ -1,14 +1,17 @@
 /* Generic wait.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * 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 file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_WAIT_H