From 36a5f1403a91d93db689e989ead3d9cf140c3cde Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Jun 2024 07:34:59 +0200 Subject: Merging upstream version 2.6.8+dfsg. Signed-off-by: Daniel Baumann --- include/Makefile.in | 2 +- include/ac/alloca.h | 2 +- include/ac/assert.h | 2 +- include/ac/bytes.h | 2 +- include/ac/crypt.h | 2 +- include/ac/ctype.h | 2 +- include/ac/dirent.h | 2 +- include/ac/errno.h | 2 +- include/ac/fdset.h | 2 +- include/ac/localize.h | 2 +- include/ac/param.h | 2 +- include/ac/regex.h | 2 +- include/ac/signal.h | 2 +- include/ac/socket.h | 2 +- include/ac/stdarg.h | 2 +- include/ac/stdlib.h | 2 +- include/ac/string.h | 2 +- include/ac/sysexits.h | 2 +- include/ac/syslog.h | 2 +- include/ac/termios.h | 2 +- include/ac/time.h | 2 +- include/ac/unistd.h | 2 +- include/ac/wait.h | 2 +- include/getopt-compat.h | 2 +- include/lber.h | 2 +- include/lber_pvt.h | 2 +- include/lber_types.hin | 2 +- include/ldap.h | 2 +- include/ldap_avl.h | 2 +- include/ldap_cdefs.h | 2 +- include/ldap_config.hin | 2 +- include/ldap_defaults.h | 2 +- include/ldap_features.hin | 2 +- include/ldap_int_thread.h | 2 +- include/ldap_log.h | 2 +- include/ldap_pvt.h | 2 +- include/ldap_pvt_thread.h | 2 +- include/ldap_pvt_uc.h | 2 +- include/ldap_queue.h | 2 +- include/ldap_rq.h | 2 +- include/ldap_schema.h | 2 +- include/ldap_utf8.h | 2 +- include/ldif.h | 2 +- include/lutil.h | 2 +- include/lutil_hash.h | 2 +- include/lutil_ldap.h | 2 +- include/lutil_lockf.h | 2 +- include/lutil_md5.h | 2 +- include/lutil_sha1.h | 2 +- include/openldap.h | 2 +- include/portable.hin | 12 +++++++-- include/rewrite.h | 2 +- include/sd-notify.h | 64 +++++++++++++++++++++++++++++++++++++++++++++++ include/slapi-plugin.h | 2 +- include/sysexits-compat.h | 2 +- 55 files changed, 127 insertions(+), 55 deletions(-) create mode 100644 include/sd-notify.h (limited to 'include') diff --git a/include/Makefile.in b/include/Makefile.in index debe1b0..d40e1cd 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2022 The OpenLDAP Foundation. +## Copyright 1998-2024 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without diff --git a/include/ac/alloca.h b/include/ac/alloca.h index 0192dca..4c9a7da 100644 --- a/include/ac/alloca.h +++ b/include/ac/alloca.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/assert.h b/include/ac/assert.h index dbb2295..9471979 100644 --- a/include/ac/assert.h +++ b/include/ac/assert.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/bytes.h b/include/ac/bytes.h index f8a6314..f55bfb2 100644 --- a/include/ac/bytes.h +++ b/include/ac/bytes.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/crypt.h b/include/ac/crypt.h index da52c1c..d846bb7 100644 --- a/include/ac/crypt.h +++ b/include/ac/crypt.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/ctype.h b/include/ac/ctype.h index e385f3a..7bb32dc 100644 --- a/include/ac/ctype.h +++ b/include/ac/ctype.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/dirent.h b/include/ac/dirent.h index 93df7b6..f4ebbf8 100644 --- a/include/ac/dirent.h +++ b/include/ac/dirent.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/errno.h b/include/ac/errno.h index 8a7f32c..9ecd460 100644 --- a/include/ac/errno.h +++ b/include/ac/errno.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/fdset.h b/include/ac/fdset.h index 620850b..2ea6eb5 100644 --- a/include/ac/fdset.h +++ b/include/ac/fdset.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/localize.h b/include/ac/localize.h index 9e19fe6..06ba6f5 100644 --- a/include/ac/localize.h +++ b/include/ac/localize.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/param.h b/include/ac/param.h index a3f5d67..1f6d56c 100644 --- a/include/ac/param.h +++ b/include/ac/param.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/regex.h b/include/ac/regex.h index ed1ddd4..4ec01a7 100644 --- a/include/ac/regex.h +++ b/include/ac/regex.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/signal.h b/include/ac/signal.h index 1c7293b..12dd6d3 100644 --- a/include/ac/signal.h +++ b/include/ac/signal.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/socket.h b/include/ac/socket.h index 96ebabe..a802541 100644 --- a/include/ac/socket.h +++ b/include/ac/socket.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/stdarg.h b/include/ac/stdarg.h index 7ba2973..6c075d9 100644 --- a/include/ac/stdarg.h +++ b/include/ac/stdarg.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/stdlib.h b/include/ac/stdlib.h index 63e3e70..2cf85ec 100644 --- a/include/ac/stdlib.h +++ b/include/ac/stdlib.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/string.h b/include/ac/string.h index 20a68d7..f82a98b 100644 --- a/include/ac/string.h +++ b/include/ac/string.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/sysexits.h b/include/ac/sysexits.h index f723224..778801a 100644 --- a/include/ac/sysexits.h +++ b/include/ac/sysexits.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/syslog.h b/include/ac/syslog.h index 90028ae..28696e4 100644 --- a/include/ac/syslog.h +++ b/include/ac/syslog.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/termios.h b/include/ac/termios.h index 427b1ca..91fbd97 100644 --- a/include/ac/termios.h +++ b/include/ac/termios.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/time.h b/include/ac/time.h index b715db0..cd75a6f 100644 --- a/include/ac/time.h +++ b/include/ac/time.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/unistd.h b/include/ac/unistd.h index 3998e63..51688d1 100644 --- a/include/ac/unistd.h +++ b/include/ac/unistd.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ac/wait.h b/include/ac/wait.h index 4837934..da5b32e 100644 --- a/include/ac/wait.h +++ b/include/ac/wait.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/getopt-compat.h b/include/getopt-compat.h index 3bbc1e4..73358df 100644 --- a/include/getopt-compat.h +++ b/include/getopt-compat.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lber.h b/include/lber.h index d474eb0..530359d 100644 --- a/include/lber.h +++ b/include/lber.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lber_pvt.h b/include/lber_pvt.h index 474c291..85c6835 100644 --- a/include/lber_pvt.h +++ b/include/lber_pvt.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lber_types.hin b/include/lber_types.hin index a557068..6c055ca 100644 --- a/include/lber_types.hin +++ b/include/lber_types.hin @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap.h b/include/ldap.h index f0cce01..a482b2b 100644 --- a/include/ldap.h +++ b/include/ldap.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_avl.h b/include/ldap_avl.h index 4bb1c39..735c411 100644 --- a/include/ldap_avl.h +++ b/include/ldap_avl.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_cdefs.h b/include/ldap_cdefs.h index 2f5fa7f..b602acf 100644 --- a/include/ldap_cdefs.h +++ b/include/ldap_cdefs.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_config.hin b/include/ldap_config.hin index 8146995..b6ce2de 100644 --- a/include/ldap_config.hin +++ b/include/ldap_config.hin @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_defaults.h b/include/ldap_defaults.h index c8632d7..06ad84f 100644 --- a/include/ldap_defaults.h +++ b/include/ldap_defaults.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_features.hin b/include/ldap_features.hin index 91ca099..b2c6ff0 100644 --- a/include/ldap_features.hin +++ b/include/ldap_features.hin @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h index 2c82d68..6bb3896 100644 --- a/include/ldap_int_thread.h +++ b/include/ldap_int_thread.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_log.h b/include/ldap_log.h index 8b8b0b6..4e7db34 100644 --- a/include/ldap_log.h +++ b/include/ldap_log.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h index ba6ec15..431f71e 100644 --- a/include/ldap_pvt.h +++ b/include/ldap_pvt.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h index 829ce8a..ec4a661 100644 --- a/include/ldap_pvt_thread.h +++ b/include/ldap_pvt_thread.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_pvt_uc.h b/include/ldap_pvt_uc.h index 1f2a50d..19f6819 100644 --- a/include/ldap_pvt_uc.h +++ b/include/ldap_pvt_uc.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_queue.h b/include/ldap_queue.h index 6d32370..060fad1 100644 --- a/include/ldap_queue.h +++ b/include/ldap_queue.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2001-2022 The OpenLDAP Foundation. + * Copyright 2001-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_rq.h b/include/ldap_rq.h index 1050550..fb9a95b 100644 --- a/include/ldap_rq.h +++ b/include/ldap_rq.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_schema.h b/include/ldap_schema.h index 9632180..2ea5b40 100644 --- a/include/ldap_schema.h +++ b/include/ldap_schema.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldap_utf8.h b/include/ldap_utf8.h index 663043a..f2bd10e 100644 --- a/include/ldap_utf8.h +++ b/include/ldap_utf8.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/ldif.h b/include/ldif.h index 62cacdc..6c05cc4 100644 --- a/include/ldif.h +++ b/include/ldif.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lutil.h b/include/lutil.h index fe0e6de..b037caa 100644 --- a/include/lutil.h +++ b/include/lutil.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lutil_hash.h b/include/lutil_hash.h index 2b1a744..4e7a846 100644 --- a/include/lutil_hash.h +++ b/include/lutil_hash.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lutil_ldap.h b/include/lutil_ldap.h index 179c7b8..10c57f0 100644 --- a/include/lutil_ldap.h +++ b/include/lutil_ldap.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lutil_lockf.h b/include/lutil_lockf.h index b24bde8..25cb231 100644 --- a/include/lutil_lockf.h +++ b/include/lutil_lockf.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lutil_md5.h b/include/lutil_md5.h index 8c1c112..a4dc9da 100644 --- a/include/lutil_md5.h +++ b/include/lutil_md5.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/lutil_sha1.h b/include/lutil_sha1.h index 87ea86c..86b7dea 100644 --- a/include/lutil_sha1.h +++ b/include/lutil_sha1.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/openldap.h b/include/openldap.h index 70a39c6..4b65750 100644 --- a/include/openldap.h +++ b/include/openldap.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2019-2022 The OpenLDAP Foundation. + * Copyright 2019-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/include/portable.hin b/include/portable.hin index 2463b90..9a84be9 100644 --- a/include/portable.hin +++ b/include/portable.hin @@ -4,7 +4,7 @@ /* begin of portable.h.pre */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation + * Copyright 1998-2024 The OpenLDAP Foundation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -547,6 +547,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -987,6 +990,9 @@ /* define for Reverse Group Membership overlay */ #undef SLAPD_OVER_MEMBEROF +/* define for Nested Group overlay */ +#undef SLAPD_OVER_NESTGROUP + /* define for OTP 2-factor Authentication overlay */ #undef SLAPD_OVER_OTP @@ -1056,7 +1062,9 @@ /* define to support run-time loadable ACL */ #undef SLAP_DYNACL -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Define to 1 if your declares `struct tm'. */ diff --git a/include/rewrite.h b/include/rewrite.h index 52d43be..b945234 100644 --- a/include/rewrite.h +++ b/include/rewrite.h @@ -2,7 +2,7 @@ */ /* This work is part of OpenLDAP Software . * - * Copyright 2000-2022 The OpenLDAP Foundation. + * Copyright 2000-2024 The OpenLDAP Foundation. * Portions Copyright 2000-2003 Pierangelo Masarati. * All rights reserved. * diff --git a/include/sd-notify.h b/include/sd-notify.h new file mode 100644 index 0000000..be284f6 --- /dev/null +++ b/include/sd-notify.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: MIT-0 */ +/* Implement the systemd notify protocol without external dependencies. + * Supports both readiness notification on startup and on reloading, + * according to the protocol defined at: + * https://www.freedesktop.org/software/systemd/man/latest/sd_notify.html + * This protocol is guaranteed to be stable as per: + * https://systemd.io/PORTABILITY_AND_STABILITY/ */ +#include +#include +#include +#include +#include +#include + +static int sd_notify(int ignore, const char *message) { + union sockaddr_union { + struct sockaddr sa; + struct sockaddr_un sun; + } socket_addr = { + .sun.sun_family = AF_UNIX, + }; + size_t path_length, message_length; + const char *socket_path; + int fd = -1; + int rc = 1; + + socket_path = getenv("NOTIFY_SOCKET"); + if (!socket_path) + return 0; /* Not running under systemd? Nothing to do */ + + if (!message) + return -EINVAL; + + message_length = strlen(message); + if (message_length == 0) + return -EINVAL; + + /* Only AF_UNIX is supported, with path or abstract sockets */ + if (socket_path[0] != '/' && socket_path[0] != '@') + return -EAFNOSUPPORT; + + path_length = strlen(socket_path); + /* Ensure there is room for NUL byte */ + if (path_length >= sizeof(socket_addr.sun.sun_path)) + return -E2BIG; + + memcpy(socket_addr.sun.sun_path, socket_path, path_length); + + /* Support for abstract socket */ + if (socket_addr.sun.sun_path[0] == '@') + socket_addr.sun.sun_path[0] = 0; + + fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0); + if (fd < 0) + return -errno; + + ssize_t written = sendto(fd, message, message_length, 0, + &socket_addr.sa, offsetof(struct sockaddr_un, sun_path) + path_length); + if (written != (ssize_t) message_length) + rc = written < 0 ? -errno : -EPROTO; + + close(fd); + return rc; +} diff --git a/include/slapi-plugin.h b/include/slapi-plugin.h index 33f007b..a96ab16 100644 --- a/include/slapi-plugin.h +++ b/include/slapi-plugin.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * Portions Copyright 1997,2002,2003 IBM Corporation. * All rights reserved. * diff --git a/include/sysexits-compat.h b/include/sysexits-compat.h index 8dedb7f..bffd2c7 100644 --- a/include/sysexits-compat.h +++ b/include/sysexits-compat.h @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2022 The OpenLDAP Foundation. + * Copyright 1998-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without -- cgit v1.2.3