diff -r 4a6a59f89f9f -r 11797f33bc24 dav/scfg.h
--- a/dav/scfg.h	Fri Feb 02 18:57:21 2018 +0100
+++ b/dav/scfg.h	Sat Feb 03 15:59:53 2018 +0100
@@ -42,6 +42,9 @@
 #define SYNC_CMD_PUSH    2
 #define SYNC_CMD_ARCHIVE 4
     
+#define DEFAULT_TAG_XATTR "tags"
+#define MACOS_TAG_XATTR "com.apple.metadata:_kMDItemUserTags"
+    
 typedef struct TagConfig TagConfig;
     
 typedef struct SyncDirectory {
@@ -78,11 +81,21 @@
 };
 typedef enum TagStore TagStore;
 
+enum TagConflict {
+    TAG_NO_CONFLICT = 0,
+    TAG_KEEP_LOCAL,
+    TAG_KEEP_REMOTE,
+    TAG_MERGE
+};
+typedef enum TagConflict TagConflict;
+
 struct TagConfig {
     TagStore store;
     TagFormat local_format;
     TagFormat server_format;
-    bool scan;
+    char *xattr_name;
+    TagConflict conflict;
+    bool detect_changes;
 };
 
 int load_sync_config();