From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 2 Jun 2012 13:03:40 +0000 (+0200)
Subject: Add the name of the context where option is not allowed to the error message.
X-Git-Tag: v2.3_alpha2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e656b995b44fab0b8290c6c2a4a73079b3f9813b;p=thirdparty%2Fopenvpn.git

Add the name of the context where option is not allowed to the error message.

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 <arne@rfc2549.org>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1338642223-20324-6-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/6646
Signed-off-by: David Sommerseth <davids@redhat.com>
---

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 2f7083983..10636eaa6 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -4017,10 +4017,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,
@@ -4028,7 +4029,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