In systemd after version 216, systemd-ask-password will support --echo which
will avoid masking the user input. As OpenVPN uses this mechanism collecting
usernames when systemd is available, this will avoid the input of usernames to
be masked.
This patch also adds the --icon argument, which is aimed at graphical inputs.
For example when OpenVPN is started at system boot-time using a graphical boot
interface such as Plymouth.
Signed-off-by: David Sommerseth <dav...@openvpn.net>
---
configure.ac | 1 +
src/openvpn/console_systemd.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/configure.ac b/configure.ac
index c3088fd..a44e1df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1023,6 +1023,7 @@ if test "$enable_systemd" = "yes" ; then
AC_CHECK_FUNCS([sd_booted], [], [AC_MSG_ERROR([systemd library is missing
sd_booted()])])
OPTIONAL_SYSTEMD_LIBS="${libsystemd_LIBS}"
AC_DEFINE(ENABLE_SYSTEMD, 1, [Enable systemd integration])
+ AC_DEFINE_UNQUOTED(SYSTEMD_VERSION, [`echo ${libsystemd_MODVERSION}`],
[systemd version installed])
LIBS="${saved_LIBS}"
fi
diff --git a/src/openvpn/console_systemd.c b/src/openvpn/console_systemd.c
index bf0f99d..62aba44 100644
--- a/src/openvpn/console_systemd.c
+++ b/src/openvpn/console_systemd.c
@@ -64,6 +64,13 @@ get_console_input_systemd (const char *prompt, const bool
echo, char *input, con
argv_init (&argv);
argv_printf (&argv, SYSTEMD_ASK_PASSWORD_PATH);
+#if SYSTEMD_VERSION > 216
+ if( echo )
+ {
+ argv_printf_cat(&argv, "--echo");
+ }
+#endif
+ argv_printf_cat (&argv, "--icon network-vpn");
argv_printf_cat (&argv, "%s", prompt);
if ((std_out = openvpn_popen (&argv, NULL)) < 0) {
--
1.8.3.1
