[network-manager-openvpn: 7/10] properties/trivial: move definition of start/end tags away from regular options

[Thomas Haller <thaller src gnome org>]

commit a9cc9b7d18d6d6204362104d2806d49981d8a4de
Author: Thomas Haller <thaller redhat com>
Date:   Fri Jan 22 14:26:37 2016 +0100

    properties/trivial: move definition of start/end tags away from regular options

 properties/import-export.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 6bb8f09..fd48a79 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -67,14 +67,19 @@
 #include "../src/nm-openvpn-service-defines.h"
 #include "../common/utils.h"
 
-#define AUTH_TAG "auth "
-#define AUTH_USER_PASS_TAG "auth-user-pass"
-#define CA_TAG "ca "
 #define CA_BLOB_START_TAG "<ca>"
 #define CA_BLOB_END_TAG "</ca>"
-#define CERT_TAG "cert "
 #define CERT_BLOB_START_TAG "<cert>"
 #define CERT_BLOB_END_TAG "</cert>"
+#define KEY_BLOB_START_TAG "<key>"
+#define KEY_BLOB_END_TAG "</key>"
+#define TLS_AUTH_BLOB_START_TAG "<tls-auth>"
+#define TLS_AUTH_BLOB_END_TAG "</tls-auth>"
+
+#define AUTH_TAG "auth "
+#define AUTH_USER_PASS_TAG "auth-user-pass"
+#define CA_TAG "ca "
+#define CERT_TAG "cert "
 #define CIPHER_TAG "cipher "
 #define KEYSIZE_TAG "keysize "
 #define CLIENT_TAG "client"
@@ -85,8 +90,6 @@
 #define FRAGMENT_TAG "fragment "
 #define IFCONFIG_TAG "ifconfig "
 #define KEY_TAG "key "
-#define KEY_BLOB_START_TAG "<key>"
-#define KEY_BLOB_END_TAG "</key>"
 #define KEEPALIVE_TAG "keepalive "
 #define MSSFIX_TAG "mssfix"
 #define PING_TAG "ping "
@@ -105,8 +108,6 @@
 #define RPORT_TAG "rport "
 #define SECRET_TAG "secret "
 #define TLS_AUTH_TAG "tls-auth "
-#define TLS_AUTH_BLOB_START_TAG "<tls-auth>"
-#define TLS_AUTH_BLOB_END_TAG "</tls-auth>"
 #define KEY_DIRECTION_TAG "key-direction "
 #define TLS_CLIENT_TAG "tls-client"
 #define TLS_REMOTE_TAG "tls-remote "