summaryrefslogtreecommitdiff
path: root/src/openvpn/manage.c
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2013-01-10 17:54:01 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2013-01-10 17:54:01 +0100
commit9e3cceecfca10ef806f193ec41e0e0a44706c328 (patch)
tree7198ea4f45a8a88c0828acd4eb4afe817dbe23a7 /src/openvpn/manage.c
parent9abc160bcbe71cfa43952943c6dff41e8016c32f (diff)
Imported Upstream version 2.3.0upstream/2.3.0
Diffstat (limited to 'src/openvpn/manage.c')
-rw-r--r--src/openvpn/manage.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index d0bb416..0a4542a 100644
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -287,13 +287,13 @@ virtual_output_callback_func (void *arg, const unsigned int flags, const char *s
# define AF_DID_PUSH (1<<0)
# define AF_DID_RESET (1<<1)
- unsigned int action_flags = 0;
if (!recursive_level) /* don't allow recursion */
{
struct gc_arena gc = gc_new ();
struct log_entry e;
const char *out = NULL;
+ unsigned int action_flags = 0;
++recursive_level;
@@ -334,14 +334,15 @@ virtual_output_callback_func (void *arg, const unsigned int flags, const char *s
}
}
- --recursive_level;
gc_free (&gc);
- }
- if (action_flags & AF_DID_PUSH)
- man_output_list_push_finalize (man);
- if (action_flags & AF_DID_RESET)
- man_reset_client_socket (man, true);
+ if (action_flags & AF_DID_PUSH)
+ man_output_list_push_finalize (man);
+ if (action_flags & AF_DID_RESET)
+ man_reset_client_socket (man, true);
+
+ --recursive_level;
+ }
}
/*