Merge tag 'upstream/1.40' into tizen.

[platform/upstream/connman.git] / vpn / plugins / openvpn.c

diff --git a/vpn/plugins/openvpn.c b/vpn/plugins/openvpn.c
old mode 100644 (file)
new mode 100755 (executable)
index daf66cd..8c8d316
--- a/vpn/plugins/openvpn.c
+++ b/vpn/plugins/openvpn.c
@@ -154,8 +154,15 @@ static struct nameserver_entry *ov_append_dns_entries(const char *key,
                                options[2]) {
 
                entry = g_try_new(struct nameserver_entry, 1);
+#if defined TIZEN_EXT
+               if (!entry) {
+                       g_strfreev(options);
+                       return NULL;
+               }
+#else
                if (!entry)
                        return NULL;
+#endif
 
                entry->nameserver = g_strdup(options[2]);
                entry->id = atoi(key + 15); /* foreign_option_XXX */
@@ -496,8 +503,10 @@ static int run_connect(struct ov_private_data *data,
 
        connman_task_add_argument(task, "--persist-tun", NULL);
 
+#if !defined TIZEN_EXT
        connman_task_add_argument(task, "--route-noexec", NULL);
        connman_task_add_argument(task, "--ifconfig-noexec", NULL);
+#endif
 
        /*
         * Disable client restarts with TCP because we can't handle this at