ACK from me, but just to nitpick:

we now have an option 'disable-occ' and an option 'ncp-disable' - wouldn't it make more sense to make it "disable-ncp" as well?

JJK

On 25/07/16 20:52, Steffan Karger wrote:
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 <[email protected]>
---
  src/openvpn/options.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 18af179..79dcb79 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -6666,12 +6666,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])


Reply via email to