From e930650fd3dd81fa10ae9504e439cf77d47f0b5d Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 1 Dec 2003 00:16:48 +0000 Subject: [PATCH] Sync with HEAD --- include/ac/alloca.h | 13 ++++++++----- include/ac/assert.h | 15 +++++++++------ include/ac/bytes.h | 13 ++++++++----- include/ac/crypt.h | 13 ++++++++----- include/ac/ctype.h | 13 ++++++++----- include/ac/dirent.h | 13 ++++++++----- include/ac/errno.h | 13 ++++++++----- include/ac/krb.h | 13 ++++++++----- include/ac/krb5.h | 13 ++++++++----- include/ac/localize.h | 13 ++++++++----- include/ac/param.h | 13 ++++++++----- include/ac/regex.h | 21 +++++++++++---------- include/ac/setproctitle.h | 13 ++++++++----- include/ac/signal.h | 13 ++++++++----- include/ac/socket.h | 13 ++++++++----- include/ac/stdarg.h | 13 ++++++++----- include/ac/stdlib.h | 13 ++++++++----- include/ac/string.h | 13 ++++++++----- include/ac/sysexits.h | 13 ++++++++----- include/ac/syslog.h | 13 ++++++++----- include/ac/termios.h | 13 ++++++++----- include/ac/time.h | 13 ++++++++----- include/ac/unistd.h | 13 ++++++++----- include/ac/wait.h | 13 ++++++++----- 24 files changed, 196 insertions(+), 126 deletions(-) diff --git a/include/ac/alloca.h b/include/ac/alloca.h index 88b419a106..c8b980633a 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_ALLOCA_H diff --git a/include/ac/assert.h b/include/ac/assert.h index 323c18dfc0..f8df48be5f 100644 --- 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 . + * + * 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 + * . */ #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 4563ae192e..bbc9129686 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_BYTES_H diff --git a/include/ac/crypt.h b/include/ac/crypt.h index 3f71af57e0..5b0c68b043 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_CRYPT_H diff --git a/include/ac/ctype.h b/include/ac/ctype.h index 9c59f6973e..023f7e0cb0 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_CTYPE_H diff --git a/include/ac/dirent.h b/include/ac/dirent.h index 8d2da0dd55..08fd7e8186 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_DIRENT_H diff --git a/include/ac/errno.h b/include/ac/errno.h index 29cedf4262..889d3c0eb4 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_ERRNO_H diff --git a/include/ac/krb.h b/include/ac/krb.h index 9ebbb742b6..b29948903f 100644 --- 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 . + * + * 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 + * . */ /* Kerberos IV */ diff --git a/include/ac/krb5.h b/include/ac/krb5.h index 1f4dc18557..89c3ebf58e 100644 --- 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 . + * + * 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 + * . */ /* Kerberos V */ diff --git a/include/ac/localize.h b/include/ac/localize.h index 834c0a16c6..721a5f4f61 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_LOCALIZE_H diff --git a/include/ac/param.h b/include/ac/param.h index 4f67a107ab..7991a74f5a 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_PARAM_H diff --git a/include/ac/regex.h b/include/ac/regex.h index e63c03c419..6f3c915b79 100644 --- 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 . + * + * 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 + * . */ #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 13002cdfaf..6450f7b348 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_SETPROCTITLE_H diff --git a/include/ac/signal.h b/include/ac/signal.h index 8c45a6cc18..a29b992204 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_SIGNAL_H diff --git a/include/ac/socket.h b/include/ac/socket.h index a28eac56d0..090ee8fbc2 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_SOCKET_H_ diff --git a/include/ac/stdarg.h b/include/ac/stdarg.h index 16bedb1b98..ffa8f4ab75 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_STDARG_H diff --git a/include/ac/stdlib.h b/include/ac/stdlib.h index 94be31c517..41e3f42d82 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_STDLIB_H diff --git a/include/ac/string.h b/include/ac/string.h index 1d71d79332..764dfc4484 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_STRING_H diff --git a/include/ac/sysexits.h b/include/ac/sysexits.h index c953845e04..46707f2348 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_SYSEXITS_H_ diff --git a/include/ac/syslog.h b/include/ac/syslog.h index f4eed2644f..b36108ddfd 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_SYSLOG_H_ diff --git a/include/ac/termios.h b/include/ac/termios.h index 61109e2f03..1c532aed15 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_TERMIOS_H diff --git a/include/ac/time.h b/include/ac/time.h index 01b911156d..da0bb58040 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_TIME_H diff --git a/include/ac/unistd.h b/include/ac/unistd.h index 70c6197c03..a266dd83e2 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_UNISTD_H diff --git a/include/ac/wait.h b/include/ac/wait.h index 667b36de93..da27f52956 100644 --- 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 . + * + * 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 + * . */ #ifndef _AC_WAIT_H -- 2.39.2