Mercurial > hg > dav / file diff

--- a/dav/scfg.c	Fri Mar 18 13:00:00 2016 +0100
+++ b/dav/scfg.c	Fri Mar 18 15:08:30 2016 +0100
@@ -129,6 +129,8 @@
     UcxList *exclude = NULL;
     int max_retry = DAV_MAX_RETRY;
     bool backuppull = false;
+    bool lockpull = false;
+    bool lockpush = true;
     
     node = node->children;
     while(node) {
@@ -162,6 +164,10 @@
                 }
             } else if(xstreq(node->name, "backup-on-pull")) {
                 backuppull = util_getboolean(value);
+            } else if(xstreq(node->name, "lock-pull")) {
+                lockpull = util_getboolean(value);
+            } else if(xstreq(node->name, "lock-push")) {
+                lockpush = util_getboolean(value);
             }
         }
         node = node->next;
@@ -192,6 +198,8 @@
     dir->database = strdup(database);
     dir->max_retry = max_retry;
     dir->backuppull = backuppull;
+    dir->lockpull = lockpull;
+    dir->lockpush = lockpush;
     if (include) {
         dir->include = include;
     } else {