On 02/08/12 15:37, Arne Schwabe wrote:
> Warn if both options are used at the same time.
>
> Signed-off-by: Arne Schwabe <a...@rfc2549.org>
> ---
> src/openvpn/options.c | 17 +++++++++++++++--
> 1 file changed, 15 insertions(+), 2 deletions(-)
>
> diff --git a/src/openvpn/options.c b/src/openvpn/options.c
> index 9f4ddbb..39dceb8 100644
> --- a/src/openvpn/options.c
> +++ b/src/openvpn/options.c
> @@ -1581,6 +1581,12 @@ show_settings (const struct options *o)
> SHOW_STR (ca_path);
> SHOW_STR (dh_file);
> SHOW_STR (cert_file);
> +
> +#ifdef MANAGMENT_EXTERNAL_KEY
> + if((options->management_flags & MF_EXTERNAL_KEY))
> + SHOW_PARM ("priv_key_file","EXTERNAL_PRIVATE_KEY","%s");
> + else
> +#endif
Please test compile without any special ./configure settings too before
submitting patches ;-) The piece of code above won't compile. Look at the
function declaration, it's not 'options' but 'o' which needs to be used. This
time I fixed it before pushing out the patch, just because it was too simple
fix to insist on another patch.
So, applied to master - with a minor fix :)
commit 4806cc102655f1a829d656f6deb83e5953c5eab2
Author: Arne Schwabe <a...@rfc2549.org>
List-Post: openvpn-devel@lists.sourceforge.net
Date: Thu Aug 2 15:37:48 2012 +0200
Fixes error: --key fails with EXTERNAL_PRIVATE_KEY: No such file or
directory if --management-external-key is used
Signed-off-by: Arne Schwabe <a...@rfc2549.org>
Acked-by: Gert Doering <g...@greenie.muc.de>
Message-Id: 1343914668-10696-1-git-send-email-a...@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/6943
kind regards,
David Sommerseth
signature.asc
Description: OpenPGP digital signature
