From e7441ff6e8e73e78cf405934626e7e4f533f7a27 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@nym.se>
Date: Mon, 1 Dec 2014 11:26:54 +0100
Subject: [PATCH] DisableSymlinks -> !SymlinksEnabled

---
 cmd/syncthing/main.go                        | 2 +-
 internal/config/config.go                    | 2 +-
 internal/config/config_test.go               | 4 ++--
 internal/config/testdata/overridenvalues.xml | 2 +-
 internal/model/progressemitter_test.go       | 8 ++++----
 test/h2/config.xml                           | 1 +
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index c4ebd0017..e4b1e3174 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -458,7 +458,7 @@ func syncthingMain() {
 
 	opts := cfg.Options()
 
-	if opts.DisableSymlinks {
+	if !opts.SymlinksEnabled {
 		symlinks.Supported = false
 	}
 
diff --git a/internal/config/config.go b/internal/config/config.go
index d6890a3e6..21fe2da9d 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -179,7 +179,7 @@ type OptionsConfiguration struct {
 	KeepTemporariesH        int      `xml:"keepTemporariesH" default:"24"`     // 0 for off
 	CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" default:"true"`
 	ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" default:"5"`
-	DisableSymlinks         bool     `xml:"disableSymlinks" default:"false"`
+	SymlinksEnabled         bool     `xml:"symlinksEnabled" default:"true"`
 
 	Deprecated_RescanIntervalS int    `xml:"rescanIntervalS,omitempty" json:"-"`
 	Deprecated_UREnabled       bool   `xml:"urEnabled,omitempty" json:"-"`
diff --git a/internal/config/config_test.go b/internal/config/config_test.go
index 5ae59ac87..5de361399 100644
--- a/internal/config/config_test.go
+++ b/internal/config/config_test.go
@@ -53,7 +53,7 @@ func TestDefaultValues(t *testing.T) {
 		KeepTemporariesH:        24,
 		CacheIgnoredFiles:       true,
 		ProgressUpdateIntervalS: 5,
-		DisableSymlinks:         false,
+		SymlinksEnabled:         true,
 	}
 
 	cfg := New(device1)
@@ -156,7 +156,7 @@ func TestOverriddenValues(t *testing.T) {
 		KeepTemporariesH:        48,
 		CacheIgnoredFiles:       false,
 		ProgressUpdateIntervalS: 10,
-		DisableSymlinks:         true,
+		SymlinksEnabled:         false,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", device1)
diff --git a/internal/config/testdata/overridenvalues.xml b/internal/config/testdata/overridenvalues.xml
index 28efc872e..78fd9ca7e 100755
--- a/internal/config/testdata/overridenvalues.xml
+++ b/internal/config/testdata/overridenvalues.xml
@@ -20,6 +20,6 @@
         <keepTemporariesH>48</keepTemporariesH>
         <cacheIgnoredFiles>false</cacheIgnoredFiles>
         <progressUpdateIntervalS>10</progressUpdateIntervalS>
-        <disableSymlinks>true</disableSymlinks>
+        <symlinksEnabled>false</symlinksEnabled>
     </options>
 </configuration>
diff --git a/internal/model/progressemitter_test.go b/internal/model/progressemitter_test.go
index df56dad41..c22faaad1 100644
--- a/internal/model/progressemitter_test.go
+++ b/internal/model/progressemitter_test.go
@@ -31,15 +31,15 @@ func expectEvent(w *events.Subscription, t *testing.T, size int) {
 		t.Fatal("Unexpected error:", err)
 	}
 	if event.Type != events.DownloadProgress {
-		t.Fatal("Unexpected event:", event)		
+		t.Fatal("Unexpected event:", event)
 	}
 	data := event.Data.(map[string]map[string]*pullerProgress)
 	if len(data) != size {
-		t.Fatal("Unexpected event data size:", data)				
+		t.Fatal("Unexpected event data size:", data)
 	}
 }
 
-func expectTimeout(w *events.Subscription, t *testing.T){
+func expectTimeout(w *events.Subscription, t *testing.T) {
 	_, err := w.Poll(timeout)
 	if err != events.ErrTimeout {
 		t.Fatal("Unexpected non-Timeout error:", err)
@@ -78,7 +78,7 @@ func TestProgressEmitter(t *testing.T) {
 	expectTimeout(w, t)
 
 	s.pullStarted()
-	
+
 	expectEvent(w, t, 1)
 	expectTimeout(w, t)
 
diff --git a/test/h2/config.xml b/test/h2/config.xml
index 164fd1bdc..ae0e5a1f7 100644
--- a/test/h2/config.xml
+++ b/test/h2/config.xml
@@ -429,6 +429,7 @@
         <apikey>abc123</apikey>
     </gui>
     <options>
+	    <disableSymlinks>true</disableSymlinks>
         <listenAddress>127.0.0.1:22002</listenAddress>
         <globalAnnounceServer>announce.syncthing.net:22026</globalAnnounceServer>
         <globalAnnounceEnabled>false</globalAnnounceEnabled>