From: "flichtenheld (Code Review)"
Date: Fri, 26 Jul 2024 09:33:53 +0000
In-Reply-To:
References:
Reply-To: frank@...2641..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, gert@...1296...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="YmRGjceKsSw="; charset=UTF-8
Subject: [Openvpn-devel] [M] Change in openvpn[master]: console_systemd:
rename query_user_exec to query_user_systemd
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , cron2
Cc: openvpn-devel
--YmRGjceKsSw=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, plaisthos.
Hello cron2, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/670?usp=3Demail
to look at the new patch set (#4).
The following approvals got outdated and were removed:
Code-Review+1 by cron2
Change subject: console_systemd: rename query_user_exec to query_user_syste=
md
......................................................................
console_systemd: rename query_user_exec to query_user_systemd
This allows us to override query_user_exec for unit
tests more consistently without having to jump through
weird hoops.
Fixes running test_pkcs11 with --enable-systemd.
While here also fix documentation comments for
query_user_exec*.
Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Signed-off-by: Frank Lichtenheld
---
M src/openvpn/console.h
M src/openvpn/console_systemd.c
M tests/unit_tests/openvpn/test_pkcs11.c
M tests/unit_tests/openvpn/test_user_pass.c
4 files changed, 37 insertions(+), 14 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/70/670/4
diff --git a/src/openvpn/console.h b/src/openvpn/console.h
index 7358299..72ae8e0 100644
--- a/src/openvpn/console.h
+++ b/src/openvpn/console.h
@@ -65,11 +65,10 @@
/**
- * Executes a configured setup, using the built-in method for querying the=
user.
+ * Loop through configured query_user slots, using the built-in method for
+ * querying the user.
* This method uses the console/TTY directly.
*
- * @param setup Pointer to the setup defining what to ask the user
- *
* @return True if executing all the defined steps completed successfully
*/
bool query_user_exec_builtin(void);
@@ -77,21 +76,34 @@
#if defined(ENABLE_SYSTEMD)
/**
- * Executes a configured setup, using the compiled method for querying the=
user
- *
- * @param setup Pointer to the setup defining what to ask the user
+ * Loop through configured query_user slots, using the systemd method for
+ * querying the user.
+ * If systemd is not running it will fall back to use
+ * query_user_exec_builtin() instead.
*
* @return True if executing all the defined steps completed successfully
*/
-bool query_user_exec(void);
+bool query_user_exec_systemd(void);
-#else /* ENABLE_SYSTEMD not defined*/
+/**
+ * Loop through configured query_user slots, using the compiled method for
+ * querying the user.
+ *
+ * @return True if executing all the defined steps completed successfully
+ */
+static inline bool
+query_user_exec(void)
+{
+ return query_user_exec_systemd();
+}
+
+#else /* ENABLE_SYSTEMD not defined */
/**
* Wrapper function enabling query_user_exec() if no alternative methods h=
ave
* been enabled
*
*/
-static bool
+static inline bool
query_user_exec(void)
{
return query_user_exec_builtin();
diff --git a/src/openvpn/console_systemd.c b/src/openvpn/console_systemd.c
index c7cf1ad..cc91cd1 100644
--- a/src/openvpn/console_systemd.c
+++ b/src/openvpn/console_systemd.c
@@ -96,7 +96,7 @@
*
*/
bool
-query_user_exec(void)
+query_user_exec_systemd(void)
{
bool ret =3D true; /* Presume everything goes okay */
int i;
diff --git a/tests/unit_tests/openvpn/test_pkcs11.c b/tests/unit_tests/open=
vpn/test_pkcs11.c
index 6d283a2..5518fa1 100644
--- a/tests/unit_tests/openvpn/test_pkcs11.c
+++ b/tests/unit_tests/openvpn/test_pkcs11.c
@@ -75,6 +75,14 @@
{
assert_true(0);
}
+#if defined(ENABLE_SYSTEMD)
+bool
+query_user_exec_systemd(void)
+{
+ assert_true(0);
+ return false;
+}
+#endif
bool
query_user_exec_builtin(void)
{
diff --git a/tests/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/o=
penvpn/test_user_pass.c
index b43e655..de60291 100644
--- a/tests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_tests/openvpn/test_user_pass.c
@@ -26,10 +26,6 @@
#include "config.h"
#endif
-#undef ENABLE_SYSTEMD
-/* avoid redefining ENABLE_SYSTEMD in misc.c */
-#undef HAVE_CONFIG_H
-
#include "syshead.h"
#include "manage.h"
@@ -44,6 +40,13 @@
struct management *management; /* global */
/* mocking */
+#if defined(ENABLE_SYSTEMD)
+bool
+query_user_exec_systemd(void)
+{
+ return query_user_exec_builtin();
+}
+#endif
bool
query_user_exec_builtin(void)
{
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/670?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd947a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld
Gerrit-Reviewer: cron2
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: flichtenheld
Gerrit-MessageType: newpatchset
--YmRGjceKsSw=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: cron2, flichtenheld, plaisthos. <=
/p>
flichtenheld uploaded patch set #4 to this change.
<=
p>View Ch=
ange
The following approvals got outdated and were removed:
Code-Review+1 by cron2
console_systemd: rename query_user_exec to query_use=
r_systemd
This allows us to override query_user_exec for unit
tes=
ts more consistently without having to jump through
weird hoops.
=
Fixes running test_pkcs11 with --enable-systemd.
While here also fix=
documentation comments for
query_user_exec*.
Change-Id: I379e1eb=
6dc57b9fe4bbdaefbd947a14326e7117a
Signed-off-by: Frank Lichtenheld <f=
rank@...2641...>
---
M src/openvpn/console.h
M src/openvpn/cons=
ole_systemd.c
M tests/unit_tests/openvpn/test_pkcs11.c
M tests/unit_t=
ests/openvpn/test_user_pass.c
4 files changed, 37 insertions(+), 14 dele=
tions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/cha=
nges/70/670/4
diff --git a/src/openvpn/console.h b/src/openvpn/cons=
ole.h
index 7358299..72ae8e0 100644
--- a/s=
rc/openvpn/console.h
+++ b/src/openvpn/console.h
=
@@ -65,11 +65,10 @@
/**
- * Executes a =
configured setup, using the built-in method for querying the user.+ * Loop through configured q=
uery_user slots, using the built-in method for
+ * querying the user.
* This m=
ethod uses the console/TTY directly.
*
- * @param setup Pointer to the setup =
defining what to ask the user
- *
* @return True if executing all the defined st=
eps completed successfully
*/
bool query=
_user_exec_builtin(void);
@@ -77,21 +76,34 @@
#if defined(ENABLE_SYSTEMD)
/**
- * Executes a configured s=
etup, using the compiled method for querying the user
- *
- * @param setup Pointer to the setup defining what to ask t=
he user
+ * Loop thro=
ugh configured query_user slots, using the systemd method for
+ * querying the user.
<=
span style=3D"color: hsl(120, 100%, 40%);">+ * If systemd is not running it=
will fall back to use
+ * query_user_exec_builtin() instead.
*
* @return True if executing all the defined steps completed successfull=
y
*/
=
-bool query_user_exec(void);
+bool query_user_exec_systemd(void);
-#else /* ENABLE_SYSTEMD not defin=
ed*/
+/**
<=
span style=3D"color: hsl(120, 100%, 40%);">+ * Loop through configured quer=
y_user slots, using the compiled method for
+ * querying the user.
+ *
+ * @return True if executing all the defined steps completed succe=
ssfully
+ */+static inline bool
+query_user_exec(void)<=
br>+{
+ return query_user_exec_systemd();<=
br>+}
+
+#else /* ENABLE_SYSTEMD not defined */
/**
* Wrapper function enabling query_user_exec() if no alternat=
ive methods have
* been enabled
*
*/
-static=
bool
+static inline =
bool
query_user_exec(void)
{
return query_user_exec_builtin();
diff --git a/src=
/openvpn/console_systemd.c b/src/openvpn/console_systemd.c
=
index c7cf1ad..cc91cd1 100644
--- a/src/openvpn/console_sys=
temd.c
+++ b/src/openvpn/console_systemd.c
=
@@ -96,7 +96,7 @@
*
*/
=
bool
-query_user_exec(=
void)
+query_user_exe=
c_systemd(void)
{
bool ret =3D true; =
/* Presume everything goes okay */
int i;
<=
span>diff --git a/tests/unit_tests/openvpn/test_pkcs11.c b/tests/unit_tests=
/openvpn/test_pkcs11.c
index 6d283a2..5518fa1 100644=
--- a/tests/unit_tests/openvpn/test_pkcs11.c
+++ =
b/tests/unit_tests/openvpn/test_pkcs11.c
@@ -75,6 +75,14 @@=
{
assert_true(0);
}=
+#if defined(ENABLE_=
SYSTEMD)
+bool=
+query_user_exec_systemd(vo=
id)
+{
+ assert_true(0);
+ return false;
+}
+#endif
bool
query_us=
er_exec_builtin(void)
{
diff --git a/tests=
/unit_tests/openvpn/test_user_pass.c b/tests/unit_tests/openvpn/test_user_p=
ass.c
index b43e655..de60291 100644
--- a/t=
ests/unit_tests/openvpn/test_user_pass.c
+++ b/tests/unit_t=
ests/openvpn/test_user_pass.c
@@ -26,10 +26,6 @@
=
#include "config.h"
#endif
-#undef ENABLE_SYST=
EMD
-/* avoid redefinin=
g ENABLE_SYSTEMD in misc.c */
-#undef HAVE_CONFIG_H
-
#include "syshead.h"
#i=
nclude "manage.h"
@@ -44,6 +40,=
13 @@
struct management *management; /* global */
/* mocking */
+#if defined(ENABLE_SYSTEMD)
+bool
+query_user_exec_systemd(void)
+{
+ return query_user_exec_builtin();
+}
+#endif
bool
query_user_exec_builtin=
(void)
{
To view, visi=
t change =
670. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I379e1eb6dc57b9fe4bbdaefbd94=
7a14326e7117a
Gerrit-Change-Number: 670
Gerrit-PatchSet: 4
Gerrit-Owner: flichtenheld <frank@...2723...=
.>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: cron2 <gert@...1296...>=
;
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-MessageType: newpatchset
--YmRGjceKsSw=--