[network-manager-openvpn/th/export-bgo764132] properties: move NMV_OVPN_TAG_* defines to "utils.h"

[Thomas Haller <thaller src gnome org>]

commit d0cfdf2ebf985e1692b1f9bb0adabaee32e68c64
Author: Thomas Haller <thaller redhat com>
Date:   Tue Mar 29 12:30:54 2016 +0200

    properties: move NMV_OVPN_TAG_* defines to "utils.h"
    
    So that they might be used by "nm-openvpn-service.c" as well.

 properties/import-export.c |   49 --------------------------------------------
 shared/utils.h             |   48 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 49 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 8128712..af1973c 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -49,55 +49,6 @@
 #define INLINE_BLOB_SECRET              "secret"
 #define INLINE_BLOB_TLS_AUTH            "tls-auth"
 
-#define NMV_OVPN_TAG_AUTH               "auth"
-#define NMV_OVPN_TAG_AUTH_NOCACHE       "auth-nocache"
-#define NMV_OVPN_TAG_AUTH_USER_PASS     "auth-user-pass"
-#define NMV_OVPN_TAG_CA                 "ca"
-#define NMV_OVPN_TAG_CERT               "cert"
-#define NMV_OVPN_TAG_CIPHER             "cipher"
-#define NMV_OVPN_TAG_CLIENT             "client"
-#define NMV_OVPN_TAG_COMP_LZO           "comp-lzo"
-#define NMV_OVPN_TAG_DEV                "dev"
-#define NMV_OVPN_TAG_DEV_TYPE           "dev-type"
-#define NMV_OVPN_TAG_FLOAT              "float"
-#define NMV_OVPN_TAG_FRAGMENT           "fragment"
-#define NMV_OVPN_TAG_GROUP              "group"
-#define NMV_OVPN_TAG_HTTP_PROXY         "http-proxy"
-#define NMV_OVPN_TAG_HTTP_PROXY_RETRY   "http-proxy-retry"
-#define NMV_OVPN_TAG_IFCONFIG           "ifconfig"
-#define NMV_OVPN_TAG_KEEPALIVE          "keepalive"
-#define NMV_OVPN_TAG_KEY_DIRECTION      "key-direction"
-#define NMV_OVPN_TAG_KEY                "key"
-#define NMV_OVPN_TAG_KEYSIZE            "keysize"
-#define NMV_OVPN_TAG_MSSFIX             "mssfix"
-#define NMV_OVPN_TAG_NOBIND             "nobind"
-#define NMV_OVPN_TAG_PERSIST_KEY        "persist-key"
-#define NMV_OVPN_TAG_PERSIST_TUN        "persist-tun"
-#define NMV_OVPN_TAG_PING_EXIT          "ping-exit"
-#define NMV_OVPN_TAG_PING               "ping"
-#define NMV_OVPN_TAG_PING_RESTART       "ping-restart"
-#define NMV_OVPN_TAG_PKCS12             "pkcs12"
-#define NMV_OVPN_TAG_PORT               "port"
-#define NMV_OVPN_TAG_PROTO              "proto"
-#define NMV_OVPN_TAG_REMOTE_CERT_TLS    "remote-cert-tls"
-#define NMV_OVPN_TAG_REMOTE_RANDOM      "remote-random"
-#define NMV_OVPN_TAG_REMOTE             "remote"
-#define NMV_OVPN_TAG_RENEG_SEC          "reneg-sec"
-#define NMV_OVPN_TAG_ROUTE              "route"
-#define NMV_OVPN_TAG_RPORT              "rport"
-#define NMV_OVPN_TAG_SCRIPT_SECURITY    "script-security"
-#define NMV_OVPN_TAG_SECRET             "secret"
-#define NMV_OVPN_TAG_SOCKS_PROXY_RETRY  "socks-proxy-retry"
-#define NMV_OVPN_TAG_SOCKS_PROXY        "socks-proxy"
-#define NMV_OVPN_TAG_TLS_AUTH           "tls-auth"
-#define NMV_OVPN_TAG_TLS_CLIENT         "tls-client"
-#define NMV_OVPN_TAG_TLS_REMOTE         "tls-remote"
-#define NMV_OVPN_TAG_TOPOLOGY           "topology"
-#define NMV_OVPN_TAG_TUN_MTU            "tun-mtu"
-#define NMV_OVPN_TAG_TUN_IPV6           "tun-ipv6"
-#define NMV_OVPN_TAG_USER               "user"
-
-
 const char *_nmovpn_test_temp_path = NULL;
 
 /*****************************************************************************/
diff --git a/shared/utils.h b/shared/utils.h
index a727d96..ec685ad 100644
--- a/shared/utils.h
+++ b/shared/utils.h
@@ -24,6 +24,54 @@
 
 #include <glib.h>
 
+#define NMV_OVPN_TAG_AUTH               "auth"
+#define NMV_OVPN_TAG_AUTH_NOCACHE       "auth-nocache"
+#define NMV_OVPN_TAG_AUTH_USER_PASS     "auth-user-pass"
+#define NMV_OVPN_TAG_CA                 "ca"
+#define NMV_OVPN_TAG_CERT               "cert"
+#define NMV_OVPN_TAG_CIPHER             "cipher"
+#define NMV_OVPN_TAG_CLIENT             "client"
+#define NMV_OVPN_TAG_COMP_LZO           "comp-lzo"
+#define NMV_OVPN_TAG_DEV                "dev"
+#define NMV_OVPN_TAG_DEV_TYPE           "dev-type"
+#define NMV_OVPN_TAG_FLOAT              "float"
+#define NMV_OVPN_TAG_FRAGMENT           "fragment"
+#define NMV_OVPN_TAG_GROUP              "group"
+#define NMV_OVPN_TAG_HTTP_PROXY         "http-proxy"
+#define NMV_OVPN_TAG_HTTP_PROXY_RETRY   "http-proxy-retry"
+#define NMV_OVPN_TAG_IFCONFIG           "ifconfig"
+#define NMV_OVPN_TAG_KEEPALIVE          "keepalive"
+#define NMV_OVPN_TAG_KEY_DIRECTION      "key-direction"
+#define NMV_OVPN_TAG_KEY                "key"
+#define NMV_OVPN_TAG_KEYSIZE            "keysize"
+#define NMV_OVPN_TAG_MSSFIX             "mssfix"
+#define NMV_OVPN_TAG_NOBIND             "nobind"
+#define NMV_OVPN_TAG_PERSIST_KEY        "persist-key"
+#define NMV_OVPN_TAG_PERSIST_TUN        "persist-tun"
+#define NMV_OVPN_TAG_PING_EXIT          "ping-exit"
+#define NMV_OVPN_TAG_PING               "ping"
+#define NMV_OVPN_TAG_PING_RESTART       "ping-restart"
+#define NMV_OVPN_TAG_PKCS12             "pkcs12"
+#define NMV_OVPN_TAG_PORT               "port"
+#define NMV_OVPN_TAG_PROTO              "proto"
+#define NMV_OVPN_TAG_REMOTE_CERT_TLS    "remote-cert-tls"
+#define NMV_OVPN_TAG_REMOTE_RANDOM      "remote-random"
+#define NMV_OVPN_TAG_REMOTE             "remote"
+#define NMV_OVPN_TAG_RENEG_SEC          "reneg-sec"
+#define NMV_OVPN_TAG_ROUTE              "route"
+#define NMV_OVPN_TAG_RPORT              "rport"
+#define NMV_OVPN_TAG_SCRIPT_SECURITY    "script-security"
+#define NMV_OVPN_TAG_SECRET             "secret"
+#define NMV_OVPN_TAG_SOCKS_PROXY_RETRY  "socks-proxy-retry"
+#define NMV_OVPN_TAG_SOCKS_PROXY        "socks-proxy"
+#define NMV_OVPN_TAG_TLS_AUTH           "tls-auth"
+#define NMV_OVPN_TAG_TLS_CLIENT         "tls-client"
+#define NMV_OVPN_TAG_TLS_REMOTE         "tls-remote"
+#define NMV_OVPN_TAG_TOPOLOGY           "topology"
+#define NMV_OVPN_TAG_TUN_MTU            "tun-mtu"
+#define NMV_OVPN_TAG_TUN_IPV6           "tun-ipv6"
+#define NMV_OVPN_TAG_USER               "user"
+
 gboolean is_pkcs12 (const char *filepath);
 
 gboolean is_encrypted (const char *filename);