lib/model: Add option for overwriting names on connect (fixes #2912)

lib/config/config_test.go

@@ -61,6 +61,7 @@ func TestDefaultValues(t *testing.T) {
 		URPostInsecurely:        false,
 		ReleasesURL:             "https://api.github.com/repos/syncthing/syncthing/releases?per_page=30",
 		AlwaysLocalNets:         []string{},
+		OverwriteNames:          false,
 	}
 
 	cfg := New(device1)
@@ -190,6 +191,7 @@ func TestOverriddenValues(t *testing.T) {
 		URPostInsecurely:        true,
 		ReleasesURL:             "https://localhost/releases",
 		AlwaysLocalNets:         []string{},
+		OverwriteNames:          true,
 	}
 
 	cfg, err := Load("testdata/overridenvalues.xml", device1)

lib/config/optionsconfiguration.go

@@ -39,6 +39,7 @@ type OptionsConfiguration struct {
 	MinHomeDiskFreePct      float64  `xml:"minHomeDiskFreePct" json:"minHomeDiskFreePct" default:"1"`
 	ReleasesURL             string   `xml:"releasesURL" json:"releasesURL" default:"https://api.github.com/repos/syncthing/syncthing/releases?per_page=30"`
 	AlwaysLocalNets         []string `xml:"alwaysLocalNet" json:"alwaysLocalNets"`
+	OverwriteNames          bool     `xml:"overwriteNames" json:"overwriteNames" default:"false"`
 }
 
 func (orig OptionsConfiguration) Copy() OptionsConfiguration {

lib/config/testdata/overridenvalues.xml

@@ -34,5 +34,6 @@
         <urInitialDelayS>800</urInitialDelayS>
         <urPostInsecurely>true</urPostInsecurely>
         <releasesURL>https://localhost/releases</releasesURL>
+        <overwriteNames>true</overwriteNames>
     </options>
 </configuration>