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 --- servers/lloadd/Makefile.in | 2 +- servers/lloadd/Makefile_module.in | 2 +- servers/lloadd/Makefile_server.in | 4 +--- servers/lloadd/backend.c | 2 +- servers/lloadd/bind.c | 2 +- servers/lloadd/client.c | 2 +- servers/lloadd/config.c | 2 +- servers/lloadd/connection.c | 2 +- servers/lloadd/daemon.c | 6 +++--- servers/lloadd/epoch.c | 2 +- servers/lloadd/epoch.h | 2 +- servers/lloadd/extended.c | 2 +- servers/lloadd/init.c | 2 +- servers/lloadd/libevent_support.c | 2 +- servers/lloadd/lload-config.h | 2 +- servers/lloadd/lload.h | 2 +- servers/lloadd/main.c | 2 +- servers/lloadd/module_init.c | 2 +- servers/lloadd/monitor.c | 2 +- servers/lloadd/operation.c | 2 +- servers/lloadd/proto-lload.h | 2 +- servers/lloadd/tier.c | 2 +- servers/lloadd/tier_bestof.c | 2 +- servers/lloadd/tier_roundrobin.c | 2 +- servers/lloadd/tier_weighted.c | 2 +- servers/lloadd/upstream.c | 2 +- servers/lloadd/value.c | 2 +- 27 files changed, 29 insertions(+), 31 deletions(-) (limited to 'servers/lloadd') diff --git a/servers/lloadd/Makefile.in b/servers/lloadd/Makefile.in index a4c1dff..525329f 100644 --- a/servers/lloadd/Makefile.in +++ b/servers/lloadd/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/servers/lloadd/Makefile_module.in b/servers/lloadd/Makefile_module.in index 8ebb5d6..2aecd47 100644 --- a/servers/lloadd/Makefile_module.in +++ b/servers/lloadd/Makefile_module.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/servers/lloadd/Makefile_server.in b/servers/lloadd/Makefile_server.in index 86d99d2..f0c8849 100644 --- a/servers/lloadd/Makefile_server.in +++ b/servers/lloadd/Makefile_server.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 @@ -33,8 +33,6 @@ BUILD_SRV = @BUILD_BALANCER@ all-local-srv: $(PROGRAMS) all-cffiles -XXLIBS += $(SYSTEMD_LIBS) - lloadd: $(LLOADD_DEPENDS) version.o $(LTLINK) -o $@ $(OBJS) version.o $(LIBS) diff --git a/servers/lloadd/backend.c b/servers/lloadd/backend.c index d30284e..31fd235 100644 --- a/servers/lloadd/backend.c +++ b/servers/lloadd/backend.c @@ -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/servers/lloadd/bind.c b/servers/lloadd/bind.c index eaecb24..b1e724e 100644 --- a/servers/lloadd/bind.c +++ b/servers/lloadd/bind.c @@ -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/servers/lloadd/client.c b/servers/lloadd/client.c index 1241286..6b55b86 100644 --- a/servers/lloadd/client.c +++ b/servers/lloadd/client.c @@ -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/servers/lloadd/config.c b/servers/lloadd/config.c index ab7a26b..e986b79 100644 --- a/servers/lloadd/config.c +++ b/servers/lloadd/config.c @@ -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/servers/lloadd/connection.c b/servers/lloadd/connection.c index a3f5323..72f5016 100644 --- a/servers/lloadd/connection.c +++ b/servers/lloadd/connection.c @@ -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/servers/lloadd/daemon.c b/servers/lloadd/daemon.c index a93879e..96ba444 100644 --- a/servers/lloadd/daemon.c +++ b/servers/lloadd/daemon.c @@ -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 2007 by Howard Chu, Symas Corporation. * All rights reserved. * @@ -45,8 +45,8 @@ #include "ldap_rq.h" -#ifdef HAVE_SYSTEMD_SD_DAEMON_H -#include +#ifdef HAVE_SYSTEMD +#include "sd-notify.h" #endif #ifdef LDAP_PF_LOCAL diff --git a/servers/lloadd/epoch.c b/servers/lloadd/epoch.c index 72b6d5d..00b4773 100644 --- a/servers/lloadd/epoch.c +++ b/servers/lloadd/epoch.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2018-2022 The OpenLDAP Foundation. + * Copyright 2018-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/servers/lloadd/epoch.h b/servers/lloadd/epoch.h index 06b70be..da22ec8 100644 --- a/servers/lloadd/epoch.h +++ b/servers/lloadd/epoch.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2018-2022 The OpenLDAP Foundation. + * Copyright 2018-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/servers/lloadd/extended.c b/servers/lloadd/extended.c index 54d9700..578cc2e 100644 --- a/servers/lloadd/extended.c +++ b/servers/lloadd/extended.c @@ -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/servers/lloadd/init.c b/servers/lloadd/init.c index 5607465..0fb7cb9 100644 --- a/servers/lloadd/init.c +++ b/servers/lloadd/init.c @@ -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/servers/lloadd/libevent_support.c b/servers/lloadd/libevent_support.c index 79e7845..a27c458 100644 --- a/servers/lloadd/libevent_support.c +++ b/servers/lloadd/libevent_support.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2017-2022 The OpenLDAP Foundation. + * Copyright 2017-2024 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/servers/lloadd/lload-config.h b/servers/lloadd/lload-config.h index e8ab431..5f07d44 100644 --- a/servers/lloadd/lload-config.h +++ b/servers/lloadd/lload-config.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/servers/lloadd/lload.h b/servers/lloadd/lload.h index f9144a5..29b4451 100644 --- a/servers/lloadd/lload.h +++ b/servers/lloadd/lload.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/servers/lloadd/main.c b/servers/lloadd/main.c index b117726..b9d83dc 100644 --- a/servers/lloadd/main.c +++ b/servers/lloadd/main.c @@ -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/servers/lloadd/module_init.c b/servers/lloadd/module_init.c index a122a52..0cd2e58 100644 --- a/servers/lloadd/module_init.c +++ b/servers/lloadd/module_init.c @@ -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/servers/lloadd/monitor.c b/servers/lloadd/monitor.c index 9eaeecf..cdc7b26 100644 --- a/servers/lloadd/monitor.c +++ b/servers/lloadd/monitor.c @@ -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/servers/lloadd/operation.c b/servers/lloadd/operation.c index 73f91a1..1bc702e 100644 --- a/servers/lloadd/operation.c +++ b/servers/lloadd/operation.c @@ -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/servers/lloadd/proto-lload.h b/servers/lloadd/proto-lload.h index cfbbd95..4f40ac6 100644 --- a/servers/lloadd/proto-lload.h +++ b/servers/lloadd/proto-lload.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/servers/lloadd/tier.c b/servers/lloadd/tier.c index 84ead03..7c941a0 100644 --- a/servers/lloadd/tier.c +++ b/servers/lloadd/tier.c @@ -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/servers/lloadd/tier_bestof.c b/servers/lloadd/tier_bestof.c index 0c44d4e..984a3c9 100644 --- a/servers/lloadd/tier_bestof.c +++ b/servers/lloadd/tier_bestof.c @@ -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/servers/lloadd/tier_roundrobin.c b/servers/lloadd/tier_roundrobin.c index d299fb9..8cd04ad 100644 --- a/servers/lloadd/tier_roundrobin.c +++ b/servers/lloadd/tier_roundrobin.c @@ -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/servers/lloadd/tier_weighted.c b/servers/lloadd/tier_weighted.c index 1255104..c8deccc 100644 --- a/servers/lloadd/tier_weighted.c +++ b/servers/lloadd/tier_weighted.c @@ -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/servers/lloadd/upstream.c b/servers/lloadd/upstream.c index 2784532..b234081 100644 --- a/servers/lloadd/upstream.c +++ b/servers/lloadd/upstream.c @@ -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/servers/lloadd/value.c b/servers/lloadd/value.c index ec71444..8d1d7aa 100644 --- a/servers/lloadd/value.c +++ b/servers/lloadd/value.c @@ -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 -- cgit v1.2.3