[Openvpn-devel] [PATCH 5/8] Add the name of the context where option is not allowed to the error message.

[Arne Schwabe]

Changes

Options error: option 'dhcp-option' cannot be used in this context

to

P:Options error: option 'dhcp-option' cannot be used in this context 
([PUSH-OPTIONS])

Signed-off-by: Arne Schwabe <a...@rfc2549.org>
---
 src/openvpn/options.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 1d5a75b..9ed4ff5 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -4021,10 +4021,11 @@ void options_string_import (struct options *options,

 #if P2MP

-#define VERIFY_PERMISSION(mask) { if (!verify_permission(p[0], (mask), 
permission_mask, option_types_found, msglevel)) goto err; }
+#define VERIFY_PERMISSION(mask) { if (!verify_permission(p[0], file, (mask), 
permission_mask, option_types_found, msglevel)) goto err; }

 static bool
 verify_permission (const char *name,
+                  const char* file,
                   const unsigned int type,
                   const unsigned int allowed,
                   unsigned int *found,
@@ -4032,7 +4033,7 @@ verify_permission (const char *name,
 {
   if (!(type & allowed))
     {
-      msg (msglevel, "option '%s' cannot be used in this context", name);
+      msg (msglevel, "option '%s' cannot be used in this context (%s)", name, 
file);
       return false;
     }
   else
-- 
1.7.7.5 (Apple Git-26)