aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-19 14:10:41 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-19 14:10:41 +0000
commitc9ee6dee2bbaa772c325f67d5c7f7a7f6a173e6c (patch)
tree6a3b1a1ed02c1047ab53f2c40f9183e2d36b11af
parentsvn merge -r 670:672 $SO/trunk/openvpn (diff)
downloadopenvpn-c9ee6dee2bbaa772c325f67d5c7f7a7f6a173e6c.tar.xz
Allow OPT_P_SOCKFLAGS to be specified in
a client-specific config. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@681 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--multi.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/multi.c b/multi.c
index c4015d7..e3444df 100644
--- a/multi.c
+++ b/multi.c
@@ -1289,8 +1289,17 @@ multi_connection_established (struct multi_context *m, struct multi_instance *mi
{
struct gc_arena gc = gc_new ();
unsigned int option_types_found = 0;
+
const unsigned int option_permissions_mask =
- OPT_P_INSTANCE|OPT_P_INHERIT|OPT_P_PUSH|OPT_P_TIMER|OPT_P_CONFIG|OPT_P_ECHO|OPT_P_COMP;
+ OPT_P_INSTANCE
+ | OPT_P_INHERIT
+ | OPT_P_PUSH
+ | OPT_P_TIMER
+ | OPT_P_CONFIG
+ | OPT_P_ECHO
+ | OPT_P_COMP
+ | OPT_P_SOCKFLAGS;
+
int cc_succeeded = true; /* client connect script status */
int cc_succeeded_count = 0;