diff options
| author | James Geboski <jgeboski@gmail.com> | 2013-01-08 17:52:57 -0500 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2015-07-13 21:41:37 +0200 |
| commit | 4d093fff305a3054d88ae2c803665cf90d512c7e (patch) | |
| tree | 15ac8e1c5e6d7f1b6783460be1a7506b6d074949 | |
| parent | b131c7b974d9d4d3f0a6ab3a81719af6f7ab2ad6 (diff) | |
| download | openvpn-4d093fff305a3054d88ae2c803665cf90d512c7e.tar.gz openvpn-4d093fff305a3054d88ae2c803665cf90d512c7e.tar.xz openvpn-4d093fff305a3054d88ae2c803665cf90d512c7e.zip | |
Fix --askpass not allowing for password input via stdin
This resolves --askpass treating stdin as a file during the file access
check. In turn, this leads to openvpn failing to start if this option is
set to stdin.
By default, --askpass reads the certificate's password from stdin rather
than a file. Without passing the CHKACC_ACPTSTDIN flag to
check_file_access(), stdin is marked as being a nonexistent file.
Trac #248
Signed-off-by: James Geboski <jgeboski@gmail.com>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <55A41225.2020705@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9918
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 4e1e3ba1d8582a1e95dd6f9564e97c99784959a7)
| -rw-r--r-- | src/openvpn/options.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 98ddb69..99c0187 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -2774,8 +2774,8 @@ options_postprocess_filechecks (struct options *options) /* ** Password files ** */ #ifdef ENABLE_SSL - errs |= check_file_access (CHKACC_FILE, options->key_pass_file, R_OK, - "--askpass"); + errs |= check_file_access (CHKACC_FILE|CHKACC_ACPTSTDIN, + options->key_pass_file, R_OK, "--askpass"); #endif /* ENABLE_SSL */ #ifdef ENABLE_MANAGEMENT errs |= check_file_access (CHKACC_FILE|CHKACC_ACPTSTDIN, |