From: Arne Schwabe Date: Fri, 22 Jul 2022 13:02:24 +0000 (+0200) Subject: Error out if both remap-usr1 SIGHUP and config stdin are used X-Git-Tag: v2.6_beta1~157 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4df5003;p=thirdparty%2Fopenvpn.git Error out if both remap-usr1 SIGHUP and config stdin are used OpenVPN for Android uses config stdin to avoid writing the config file containing private keys to 'disk'. However using stdin means that config cannot be reread using SIGHUP. While there might be other corner cases that trigger SIGHUP, this is an obvious one, so we error out if we detect this misconfiguration. Signed-off-by: Arne Schwabe Acked-by: Gert Doering Message-Id: <20220722130224.2442759-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24720.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/options.c b/src/openvpn/options.c index b00acf7e0..d2ffab51e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3662,6 +3662,12 @@ options_postprocess_mutate(struct options *o, struct env_set *es) o->verify_hash_no_ca = true; } + if (streq(o->config, "stdin") && o->remap_sigusr1 == SIGHUP) + { + msg(M_USAGE, "Options 'config stdin' and 'remap-usr1 SIGHUP' are " + "incompatible with each other."); + } + /* check if any option should force disabling DCO */ #if defined(TARGET_LINUX) o->tuntap_options.disable_dco = !dco_check_option_conflict(D_DCO, o);