comparison: dav/scfg.c
dav/scfg.c
- changeset 549
- af91d3c96994
- parent 539
- 8deb52292c99
- child 576
- 62cc92445234
equal
deleted
inserted
replaced
| 548:ab46acda1066 | 549:af91d3c96994 |
|---|---|
| 390 int allow_cmd = SYNC_CMD_PULL | SYNC_CMD_PUSH | 390 int allow_cmd = SYNC_CMD_PULL | SYNC_CMD_PUSH |
| 391 | SYNC_CMD_ARCHIVE | SYNC_CMD_RESTORE; | 391 | SYNC_CMD_ARCHIVE | SYNC_CMD_RESTORE; |
| 392 bool backuppull = false; | 392 bool backuppull = false; |
| 393 bool lockpull = false; | 393 bool lockpull = false; |
| 394 bool lockpush = false; | 394 bool lockpush = false; |
| 395 bool hashing = false; | |
| 396 bool detect_copy = false; | |
| 395 time_t lock_timeout = 0; | 397 time_t lock_timeout = 0; |
| 396 uint32_t metadata = 0; | 398 uint32_t metadata = 0; |
| 397 | 399 |
| 398 unsigned short parentlineno = node->line; | 400 unsigned short parentlineno = node->line; |
| 399 node = node->children; | 401 node = node->children; |
| 483 lock_timeout = (time_t)t; | 485 lock_timeout = (time_t)t; |
| 484 } else { | 486 } else { |
| 485 print_warning(node->line, "integer value " | 487 print_warning(node->line, "integer value " |
| 486 "expected in <lock-timeout> element\n"); | 488 "expected in <lock-timeout> element\n"); |
| 487 } | 489 } |
| 490 } else if(xstreq(node->name, "hashing")) { | |
| 491 hashing = util_getboolean(value); | |
| 488 } else { | 492 } else { |
| 489 print_error(node->line, | 493 print_error(node->line, |
| 490 "unknown directory config element: %s\n", node->name); | 494 "unknown directory config element: %s\n", node->name); |
| 491 return 1; | 495 return 1; |
| 492 } | 496 } |
| 525 dir->max_retry = max_retry; | 529 dir->max_retry = max_retry; |
| 526 dir->allow_cmd = allow_cmd; | 530 dir->allow_cmd = allow_cmd; |
| 527 dir->backuppull = backuppull; | 531 dir->backuppull = backuppull; |
| 528 dir->lockpull = lockpull; | 532 dir->lockpull = lockpull; |
| 529 dir->lockpush = lockpush; | 533 dir->lockpush = lockpush; |
| 534 dir->hashing = hashing; | |
| 530 dir->lock_timeout = lock_timeout; | 535 dir->lock_timeout = lock_timeout; |
| 531 dir->metadata = metadata; | 536 dir->metadata = metadata; |
| 532 dir->splitconfig = splitconfig; | 537 dir->splitconfig = splitconfig; |
| 533 if((metadata & FINFO_MODE) == FINFO_MODE) { | 538 if((metadata & FINFO_MODE) == FINFO_MODE) { |
| 534 dir->db_settings = DB_STORE_MODE; | 539 dir->db_settings = DB_STORE_MODE; |
