From: Steffan Karger <steffan@karger.me>
Date: Mon, 25 Jul 2016 18:52:46 +0000 (+0200)
Subject: Allow ncp-disable and ncp-ciphers to be specified in ccd files
X-Git-Tag: v2.4_alpha1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834f602fd069118b5d00a9042c9fdb20930257eb;p=thirdparty%2Fopenvpn.git

Allow ncp-disable and ncp-ciphers to be specified in ccd files

This allows the ncp-disable and ncp-ciphers options to be used in 'client
config dir' files, to disable or change the negotiable crypto parameter
settings for specific clients.

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1469472766-25131-1-git-send-email-steffan@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/12096
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 56479dc7a..3d4a6455d 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -6677,12 +6677,12 @@ add_option (struct options *options,
     }
   else if (streq (p[0], "ncp-ciphers") && p[1] && !p[2])
     {
-      VERIFY_PERMISSION (OPT_P_GENERAL);
+      VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_INSTANCE);
       options->ncp_ciphers = p[1];
     }
   else if (streq (p[0], "ncp-disable") && !p[1])
     {
-      VERIFY_PERMISSION (OPT_P_GENERAL);
+      VERIFY_PERMISSION (OPT_P_GENERAL|OPT_P_INSTANCE);
       options->ncp_enabled = false;
     }
   else if (streq (p[0], "prng") && p[1] && !p[3])