Change in openvpn[master]: configure.ac: Clean up systemd support
A message that is not in the archive (sent off-list or not yet received): gerrit.1767974222000.Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc@...2715...
Attention is currently required from: plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email
to review the following change.
Change subject: configure.ac: Clean up systemd support
......................................................................
configure.ac: Clean up systemd support
- Do not try to handle very old systemd that was released over ten years ago (remove SYSTEMD_NEWER_THAN_216)
- Do not require systemd.pc. I can't find any indication that we use any of the variables defined by it. (It does not define any libraries, just variables)
- Remove check for sd-daemon.h. We did not use the conditional and assumed it was there already.
- Allow libsystemd.pc to define cflags. Previously we ignored those.
---
M config.h.cmake.in
M configure.ac
M src/openvpn/Makefile.am
M src/openvpn/console_systemd.c
M src/openvpn/init.c
5 files changed, 7 insertions(+), 28 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/63/1463/1
config.h.cmake.in +0 -6
@@ -284,9 +284,6 @@ /* Define to 1 if you have the <syslog.h> header file. */ #cmakedefine HAVE_SYSLOG_H -/* Define to 1 if you have the <systemd/sd-daemon.h> header file. */ -#undef HAVE_SYSTEMD_SD_DAEMON_H - /* Define to 1 if you have the <sys/epoll.h> header file. */ #cmakedefine HAVE_SYS_EPOLL_H
@@ -374,9 +371,6 @@ /* Path to systemd-ask-password tool */ #undef SYSTEMD_ASK_PASSWORD_PATH -/* systemd is newer than v216 */ -#define SYSTEMD_NEWER_THAN_216 - /* The tap-windows id */ #define TAP_WIN_COMPONENT_ID "tap0901"
configure.ac +4 -17
@@ -1139,28 +1139,14 @@ dnl AM_CONDITIONAL([ENABLE_SYSTEMD], [test "${enable_systemd}" = "yes"]) if test "$enable_systemd" = "yes" ; then - PKG_CHECK_MODULES([libsystemd], [systemd libsystemd], + PKG_CHECK_MODULES([libsystemd], [libsystemd > 216], [], - [PKG_CHECK_MODULES([libsystemd], [libsystemd-daemon])] + [AC_MSG_ERROR([systemd enabled but libsystemd is missing])] ) - PKG_CHECK_EXISTS([libsystemd > 216], - [AC_DEFINE([SYSTEMD_NEWER_THAN_216], [1], - [systemd is newer than v216])] - ) - - AC_CHECK_HEADERS(systemd/sd-daemon.h, - , - [ - AC_MSG_ERROR([systemd development headers not found.]) - ]) - - saved_LIBS="${LIBS}" - LIBS="${LIBS} ${libsystemd_LIBS}" - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is missing sd_booted()])]) + OPTIONAL_SYSTEMD_CFLAGS="${libsystemd_CFLAGS}" OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}" AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration]) - LIBS="${saved_LIBS}" if test -n "${SYSTEMD_UNIT_DIR}"; then systemdunitdir="${SYSTEMD_UNIT_DIR}"
@@ -1377,6 +1363,7 @@ AC_SUBST([OPTIONAL_LZO_LIBS]) AC_SUBST([OPTIONAL_LZ4_CFLAGS]) AC_SUBST([OPTIONAL_LZ4_LIBS]) +AC_SUBST([OPTIONAL_SYSTEMD_CFLAGS]) AC_SUBST([OPTIONAL_SYSTEMD_LIBS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])
src/openvpn/Makefile.am +1 -0
@@ -28,6 +28,7 @@ $(OPTIONAL_LIBNL_GENL_CFLAGS) \ $(OPTIONAL_LZO_CFLAGS) \ $(OPTIONAL_LZ4_CFLAGS) \ + $(OPTIONAL_SYSTEMD_CFLAGS) \ $(OPTIONAL_PKCS11_HELPER_CFLAGS) \ $(OPTIONAL_INOTIFY_CFLAGS) \ -DPLUGIN_LIBDIR=\"${plugindir}\" \
src/openvpn/console_systemd.c +0 -3
@@ -61,13 +61,10 @@struct argv argv =argv_new ();argv_printf (&argv,SYSTEMD_ASK_PASSWORD_PATH ); -#ifdef SYSTEMD_NEWER_THAN_216 -/* the --echo support arrived in upstream systemd 217 */ if (echo) {argv_printf_cat (&argv,"--echo" ); } -#endif argv_printf_cat (&argv,"--icon network-vpn" );argv_printf_cat (&argv,"--timeout=0" );argv_printf_cat (&argv,"%s" , prompt);
src/openvpn/init.c +2 -2
@@ -1545,7 +1545,7 @@#else #ifdef ENABLE_SYSTEMD sd_notifyf (0 ,"STATUS=Failed to start up: %s With Errors\nERRNO=1" , message); -#endif /* HAVE_SYSTEMD_SD_DAEMON_H */ +#endif msg (M_INFO ,"%s With Errors" , message);#endif }
@@ -5052,4 +5052,4 @@packet_id_free (&c->c2.crypto_options.packet_id);context_gc_free (c); -} +}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc
Gerrit-Change-Number: 1463
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email )
Change subject: configure.ac: Clean up systemd support
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc
Gerrit-Change-Number: 1463
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 09 Jan 2026 16:23:56 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email )
Change subject: configure.ac: Clean up systemd support
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
v216 seems to be truly ancient (https://github.com/systemd/systemd/tree/v216) and like 12 years old
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc
Gerrit-Change-Number: 1463
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Fri, 09 Jan 2026 16:27:09 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
PATCH 1/1 configure.ac: Clean up systemd support
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
- Do not try to handle very old systemd that was released over ten years ago (remove SYSTEMD_NEWER_THAN_216)
- Do not require systemd.pc. I can't find any indication that we use any of the variables defined by it. (It does not define any libraries, just variables)
- Remove check for sd-daemon.h. We did not use the conditional and assumed it was there already.
- Allow libsystemd.pc to define cflags. Previously we ignored those.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Arne Schwabe <[email protected]...>
config.h.cmake.in +0 -6
@@ -284,9 +284,6 @@ /* Define to 1 if you have the <syslog.h> header file. */ #cmakedefine HAVE_SYSLOG_H -/* Define to 1 if you have the <systemd/sd-daemon.h> header file. */ -#undef HAVE_SYSTEMD_SD_DAEMON_H - /* Define to 1 if you have the <sys/epoll.h> header file. */ #cmakedefine HAVE_SYS_EPOLL_H
@@ -374,9 +371,6 @@ /* Path to systemd-ask-password tool */ #undef SYSTEMD_ASK_PASSWORD_PATH -/* systemd is newer than v216 */ -#define SYSTEMD_NEWER_THAN_216 - /* The tap-windows id */ #define TAP_WIN_COMPONENT_ID "tap0901"
configure.ac +4 -17
@@ -1139,28 +1139,14 @@ dnl AM_CONDITIONAL([ENABLE_SYSTEMD], [test "${enable_systemd}" = "yes"]) if test "$enable_systemd" = "yes" ; then - PKG_CHECK_MODULES([libsystemd], [systemd libsystemd], + PKG_CHECK_MODULES([libsystemd], [libsystemd > 216], [], - [PKG_CHECK_MODULES([libsystemd], [libsystemd-daemon])] + [AC_MSG_ERROR([systemd enabled but libsystemd is missing])] ) - PKG_CHECK_EXISTS([libsystemd > 216], - [AC_DEFINE([SYSTEMD_NEWER_THAN_216], [1], - [systemd is newer than v216])] - ) - - AC_CHECK_HEADERS(systemd/sd-daemon.h, - , - [ - AC_MSG_ERROR([systemd development headers not found.]) - ]) - - saved_LIBS="${LIBS}" - LIBS="${LIBS} ${libsystemd_LIBS}" - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is missing sd_booted()])]) + OPTIONAL_SYSTEMD_CFLAGS="${libsystemd_CFLAGS}" OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}" AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration]) - LIBS="${saved_LIBS}" if test -n "${SYSTEMD_UNIT_DIR}"; then systemdunitdir="${SYSTEMD_UNIT_DIR}"
@@ -1377,6 +1363,7 @@ AC_SUBST([OPTIONAL_LZO_LIBS]) AC_SUBST([OPTIONAL_LZ4_CFLAGS]) AC_SUBST([OPTIONAL_LZ4_LIBS]) +AC_SUBST([OPTIONAL_SYSTEMD_CFLAGS]) AC_SUBST([OPTIONAL_SYSTEMD_LIBS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])
src/openvpn/Makefile.am +1 -0
@@ -28,6 +28,7 @@ $(OPTIONAL_LIBNL_GENL_CFLAGS) \ $(OPTIONAL_LZO_CFLAGS) \ $(OPTIONAL_LZ4_CFLAGS) \ + $(OPTIONAL_SYSTEMD_CFLAGS) \ $(OPTIONAL_PKCS11_HELPER_CFLAGS) \ $(OPTIONAL_INOTIFY_CFLAGS) \ -DPLUGIN_LIBDIR=\"${plugindir}\" \
src/openvpn/console_systemd.c +0 -3
@@ -61,13 +61,10 @@struct argv argv =argv_new ();argv_printf (&argv,SYSTEMD_ASK_PASSWORD_PATH ); -#ifdef SYSTEMD_NEWER_THAN_216 -/* the --echo support arrived in upstream systemd 217 */ if (echo) {argv_printf_cat (&argv,"--echo" ); } -#endif argv_printf_cat (&argv,"--icon network-vpn" );argv_printf_cat (&argv,"--timeout=0" );argv_printf_cat (&argv,"%s" , prompt);
src/openvpn/init.c +2 -2
@@ -1545,7 +1545,7 @@#else #ifdef ENABLE_SYSTEMD sd_notifyf (0 ,"STATUS=Failed to start up: %s With Errors\nERRNO=1" , message); -#endif /* HAVE_SYSTEMD_SD_DAEMON_H */ +#endif msg (M_INFO ,"%s With Errors" , message);#endif }
@@ -5052,4 +5052,4 @@packet_id_free (&c->c2.crypto_options.packet_id);context_gc_free (c); -} +}
[Openvpn-devel] [PATCH applied] Re: configure.ac: Clean up systemd support
This makes sense, and now is the right time :-) - I have stared a bit at the change, and BB has tested it. Another #ifdef gone!
Your patch has been applied to the master branch.
commit 50a6b663e49410456ef6497346dc4ec149d50b0b
Author: Frank Lichtenheld Date: Fri Jan 9 17:35:08 2026 +0100
configure.ac: Clean up systemd support
Signed-off-by: Frank Lichtenheld <[email protected]...>
Acked-by: Arne Schwabe <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35203.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by plaisthos
Change subject: configure.ac: Clean up systemd support
......................................................................
configure.ac: Clean up systemd support
- Do not try to handle very old systemd that was released over ten years ago (remove SYSTEMD_NEWER_THAN_216)
- Do not require systemd.pc. I can't find any indication that we use any of the variables defined by it. (It does not define any libraries, just variables)
- Remove check for sd-daemon.h. We did not use the conditional and assumed it was there already.
- Allow libsystemd.pc to define cflags. Previously we ignored those.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35203.html
---
M config.h.cmake.in
M configure.ac
M src/openvpn/Makefile.am
M src/openvpn/console_systemd.c
M src/openvpn/init.c
5 files changed, 7 insertions(+), 28 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/63/1463/2
config.h.cmake.in +0 -6
@@ -284,9 +284,6 @@ /* Define to 1 if you have the <syslog.h> header file. */ #cmakedefine HAVE_SYSLOG_H -/* Define to 1 if you have the <systemd/sd-daemon.h> header file. */ -#undef HAVE_SYSTEMD_SD_DAEMON_H - /* Define to 1 if you have the <sys/epoll.h> header file. */ #cmakedefine HAVE_SYS_EPOLL_H
@@ -374,9 +371,6 @@ /* Path to systemd-ask-password tool */ #undef SYSTEMD_ASK_PASSWORD_PATH -/* systemd is newer than v216 */ -#define SYSTEMD_NEWER_THAN_216 - /* The tap-windows id */ #define TAP_WIN_COMPONENT_ID "tap0901"
configure.ac +4 -17
@@ -1139,28 +1139,14 @@ dnl AM_CONDITIONAL([ENABLE_SYSTEMD], [test "${enable_systemd}" = "yes"]) if test "$enable_systemd" = "yes" ; then - PKG_CHECK_MODULES([libsystemd], [systemd libsystemd], + PKG_CHECK_MODULES([libsystemd], [libsystemd > 216], [], - [PKG_CHECK_MODULES([libsystemd], [libsystemd-daemon])] + [AC_MSG_ERROR([systemd enabled but libsystemd is missing])] ) - PKG_CHECK_EXISTS([libsystemd > 216], - [AC_DEFINE([SYSTEMD_NEWER_THAN_216], [1], - [systemd is newer than v216])] - ) - - AC_CHECK_HEADERS(systemd/sd-daemon.h, - , - [ - AC_MSG_ERROR([systemd development headers not found.]) - ]) - - saved_LIBS="${LIBS}" - LIBS="${LIBS} ${libsystemd_LIBS}" - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is missing sd_booted()])]) + OPTIONAL_SYSTEMD_CFLAGS="${libsystemd_CFLAGS}" OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}" AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration]) - LIBS="${saved_LIBS}" if test -n "${SYSTEMD_UNIT_DIR}"; then systemdunitdir="${SYSTEMD_UNIT_DIR}"
@@ -1377,6 +1363,7 @@ AC_SUBST([OPTIONAL_LZO_LIBS]) AC_SUBST([OPTIONAL_LZ4_CFLAGS]) AC_SUBST([OPTIONAL_LZ4_LIBS]) +AC_SUBST([OPTIONAL_SYSTEMD_CFLAGS]) AC_SUBST([OPTIONAL_SYSTEMD_LIBS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])
src/openvpn/Makefile.am +1 -0
@@ -28,6 +28,7 @@ $(OPTIONAL_LIBNL_GENL_CFLAGS) \ $(OPTIONAL_LZO_CFLAGS) \ $(OPTIONAL_LZ4_CFLAGS) \ + $(OPTIONAL_SYSTEMD_CFLAGS) \ $(OPTIONAL_PKCS11_HELPER_CFLAGS) \ $(OPTIONAL_INOTIFY_CFLAGS) \ -DPLUGIN_LIBDIR=\"${plugindir}\" \
src/openvpn/console_systemd.c +0 -3
@@ -61,13 +61,10 @@struct argv argv =argv_new ();argv_printf (&argv,SYSTEMD_ASK_PASSWORD_PATH ); -#ifdef SYSTEMD_NEWER_THAN_216 -/* the --echo support arrived in upstream systemd 217 */ if (echo) {argv_printf_cat (&argv,"--echo" ); } -#endif argv_printf_cat (&argv,"--icon network-vpn" );argv_printf_cat (&argv,"--timeout=0" );argv_printf_cat (&argv,"%s" , prompt);
src/openvpn/init.c +2 -2
@@ -1545,7 +1545,7 @@#else #ifdef ENABLE_SYSTEMD sd_notifyf (0 ,"STATUS=Failed to start up: %s With Errors\nERRNO=1" , message); -#endif /* HAVE_SYSTEMD_SD_DAEMON_H */ +#endif msg (M_INFO ,"%s With Errors" , message);#endif }
@@ -5052,4 +5052,4 @@packet_id_free (&c->c2.crypto_options.packet_id);context_gc_free (c); -} +}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc
Gerrit-Change-Number: 1463
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email )
Change subject: configure.ac: Clean up systemd support
......................................................................
configure.ac: Clean up systemd support
- Do not try to handle very old systemd that was released over ten years ago (remove SYSTEMD_NEWER_THAN_216)
- Do not require systemd.pc. I can't find any indication that we use any of the variables defined by it. (It does not define any libraries, just variables)
- Remove check for sd-daemon.h. We did not use the conditional and assumed it was there already.
- Allow libsystemd.pc to define cflags. Previously we ignored those.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1463
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35203.html
---
M config.h.cmake.in
M configure.ac
M src/openvpn/Makefile.am
M src/openvpn/console_systemd.c
M src/openvpn/init.c
5 files changed, 7 insertions(+), 28 deletions(-)
config.h.cmake.in +0 -6
@@ -284,9 +284,6 @@ /* Define to 1 if you have the <syslog.h> header file. */ #cmakedefine HAVE_SYSLOG_H -/* Define to 1 if you have the <systemd/sd-daemon.h> header file. */ -#undef HAVE_SYSTEMD_SD_DAEMON_H - /* Define to 1 if you have the <sys/epoll.h> header file. */ #cmakedefine HAVE_SYS_EPOLL_H
@@ -374,9 +371,6 @@ /* Path to systemd-ask-password tool */ #undef SYSTEMD_ASK_PASSWORD_PATH -/* systemd is newer than v216 */ -#define SYSTEMD_NEWER_THAN_216 - /* The tap-windows id */ #define TAP_WIN_COMPONENT_ID "tap0901"
configure.ac +4 -17
@@ -1139,28 +1139,14 @@ dnl AM_CONDITIONAL([ENABLE_SYSTEMD], [test "${enable_systemd}" = "yes"]) if test "$enable_systemd" = "yes" ; then - PKG_CHECK_MODULES([libsystemd], [systemd libsystemd], + PKG_CHECK_MODULES([libsystemd], [libsystemd > 216], [], - [PKG_CHECK_MODULES([libsystemd], [libsystemd-daemon])] + [AC_MSG_ERROR([systemd enabled but libsystemd is missing])] ) - PKG_CHECK_EXISTS([libsystemd > 216], - [AC_DEFINE([SYSTEMD_NEWER_THAN_216], [1], - [systemd is newer than v216])] - ) - - AC_CHECK_HEADERS(systemd/sd-daemon.h, - , - [ - AC_MSG_ERROR([systemd development headers not found.]) - ]) - - saved_LIBS="${LIBS}" - LIBS="${LIBS} ${libsystemd_LIBS}" - AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is missing sd_booted()])]) + OPTIONAL_SYSTEMD_CFLAGS="${libsystemd_CFLAGS}" OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}" AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration]) - LIBS="${saved_LIBS}" if test -n "${SYSTEMD_UNIT_DIR}"; then systemdunitdir="${SYSTEMD_UNIT_DIR}"
@@ -1377,6 +1363,7 @@ AC_SUBST([OPTIONAL_LZO_LIBS]) AC_SUBST([OPTIONAL_LZ4_CFLAGS]) AC_SUBST([OPTIONAL_LZ4_LIBS]) +AC_SUBST([OPTIONAL_SYSTEMD_CFLAGS]) AC_SUBST([OPTIONAL_SYSTEMD_LIBS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_CFLAGS]) AC_SUBST([OPTIONAL_PKCS11_HELPER_LIBS])
src/openvpn/Makefile.am +1 -0
@@ -28,6 +28,7 @@ $(OPTIONAL_LIBNL_GENL_CFLAGS) \ $(OPTIONAL_LZO_CFLAGS) \ $(OPTIONAL_LZ4_CFLAGS) \ + $(OPTIONAL_SYSTEMD_CFLAGS) \ $(OPTIONAL_PKCS11_HELPER_CFLAGS) \ $(OPTIONAL_INOTIFY_CFLAGS) \ -DPLUGIN_LIBDIR=\"${plugindir}\" \
src/openvpn/console_systemd.c +0 -3
@@ -61,13 +61,10 @@struct argv argv =argv_new ();argv_printf (&argv,SYSTEMD_ASK_PASSWORD_PATH ); -#ifdef SYSTEMD_NEWER_THAN_216 -/* the --echo support arrived in upstream systemd 217 */ if (echo) {argv_printf_cat (&argv,"--echo" ); } -#endif argv_printf_cat (&argv,"--icon network-vpn" );argv_printf_cat (&argv,"--timeout=0" );argv_printf_cat (&argv,"%s" , prompt);
src/openvpn/init.c +2 -2
@@ -1545,7 +1545,7 @@#else #ifdef ENABLE_SYSTEMD sd_notifyf (0 ,"STATUS=Failed to start up: %s With Errors\nERRNO=1" , message); -#endif /* HAVE_SYSTEMD_SD_DAEMON_H */ +#endif msg (M_INFO ,"%s With Errors" , message);#endif }
@@ -5052,4 +5052,4 @@packet_id_free (&c->c2.crypto_options.packet_id);context_gc_free (c); -} +}
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1463?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie59e03ce01575acaeaf690f582eb5cfa80eb37fc
Gerrit-Change-Number: 1463
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>