diff mbox series

[Openvpn-devel,v1] test_user_pass: Fix building with --enable-systemd

Message ID 20240605111012.3023-1-gert@greenie.muc.de
State Accepted
Headers show
Series [Openvpn-devel,v1] test_user_pass: Fix building with --enable-systemd | expand

Commit Message

Gert Doering June 5, 2024, 11:10 a.m. UTC 
From: Frank Lichtenheld <frank@lichtenheld.com>

Need to make sure that ENABLE_SYSTEMD is really disabled.

Change-Id: Ic33c210f06e173a450534aa0969c57f140086655
Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
---

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/+/641
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>

Comments

Gert Doering June 5, 2024, 11:17 a.m. UTC | #1 
Your patch has been applied to the master branch (this unit test is not
in release/2.6, so nothing to fix there).  Not tested myself as I do not
have anything with systemd, but it does not break "non-systemd tests",
as confirmed by gerrit/all the buildbots.

commit 7dfff75659e6c06abe500f5b8716d9712aa41bcc (master)
Author: Frank Lichtenheld
Date:   Wed Jun 5 13:10:12 2024 +0200

     test_user_pass: Fix building with --enable-systemd

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20240605111012.3023-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28708.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/openvpn/test_user_pass.c
index ac84654..b43e655 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -27,6 +27,8 @@ 
 #endif
 
 #undef ENABLE_SYSTEMD
+/* avoid redefining ENABLE_SYSTEMD in misc.c */
+#undef HAVE_CONFIG_H
 
 #include "syshead.h"
 #include "manage.h"