Compare commits

...
Author SHA1 Message Date
braginini dde4693fdd Fix possible race when syncing peer 2024-07-20 20:11:15 +02:00
Carlos Hernandez 0a8c78deb1 Minor fix local dns search domain (#2287) 2024-07-19 16:44:12 +02:00
2 changed files with 3 additions and 3 deletions

No files matched your search

+2 -2
View File
@@ -225,8 +225,8 @@ func (s *systemConfigurator) getSystemDNSSettings() (SystemDNSSettings, error) {
}
if inSearchDomainsArray {
searchDomains := strings.Split(line, " : ")
dnsSettings.Domains = append(dnsSettings.Domains, searchDomains...)
searchDomain := strings.Split(line, " : ")[1]
dnsSettings.Domains = append(dnsSettings.Domains, searchDomain)
} else if inServerAddressesArray {
address := strings.Split(line, " : ")[1]
if ip := net.ParseIP(address); ip != nil && ip.To4() != nil {
+1 -1
View File
@@ -1870,7 +1870,7 @@ func (am *DefaultAccountManager) SyncAndMarkPeer(ctx context.Context, peerPubKey
return nil, nil, nil, err
}
unlock := am.Store.AcquireAccountReadLock(ctx, accountID)
unlock := am.Store.AcquireAccountWriteLock(ctx, accountID)
defer unlock()
account, err := am.Store.GetAccount(ctx, accountID)