sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-23 13:59:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into mdm_integration

Browse Source 
# Conflicts:
#	client/cmd/up.go
#	client/embed/embed.go
#	client/ios/NetBirdSDK/client.go
This commit is contained in:
riccardom
2026-08-25 16:55:11 +02:00
parent e4d4b44568 c512bf25aa
commit 12789d158e
427 changed files with 34362 additions and 5662 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/cmd/up.go
+5 -1
View File
@@ -21,9 +21,13 @@ import (
"github.com/netbirdio/netbird/client/internal"
"github.com/netbirdio/netbird/client/internal/peer"
"github.com/netbirdio/netbird/client/internal/profilemanager"
<<<<<<< HEAD
"github.com/netbirdio/netbird/client/mdm"
"github.com/netbirdio/netbird/client/proto"
=======
>>>>>>> main
nbnet "github.com/netbirdio/netbird/client/net"
"github.com/netbirdio/netbird/client/proto"
"github.com/netbirdio/netbird/client/server"
"github.com/netbirdio/netbird/client/system"
"github.com/netbirdio/netbird/shared/management/domain"
@@ -631,7 +635,7 @@ func setupLoginRequest(providedSetupKey string, customDNSAddressConverted []byte
NatExternalIPs: natExternalIPs,
CleanNATExternalIPs: natExternalIPs != nil && len(natExternalIPs) == 0,
CustomDNSAddress: customDNSAddressConverted,
IsUnixDesktopClient: isUnixRunningDesktop(),
IsUnixDesktopClient: util.HasGraphicalSession(),
Hostname: hostName,
ExtraIFaceBlacklist: extraIFaceBlackList,
DnsLabels: dnsLabels,