dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-24 00:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #40366 from arkodg/check-cidr-ipv6

Browse Source 
Handle the error case when fixed-cidr-ipv6 is empty and ipv6 is enabled
This commit is contained in:
Sebastiaan van Stijn
2020-01-14 13:53:45 +01:00
committed by GitHub
parent c766501979 bdad16b0ee
commit be095a1859
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/daemon_unix.go
View File

@@ -1023,7 +1023,9 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *config.Co
ipamV6Conf *libnetwork.IpamConf
)
if config.BridgeConfig.FixedCIDRv6 != "" {
if config.BridgeConfig.EnableIPv6 && config.BridgeConfig.FixedCIDRv6 == "" {
return errdefs.InvalidParameter(errors.New("IPv6 is enabled for the default bridge, but no subnet is configured. Specify an IPv6 subnet using --fixed-cidr-v6"))
} else if config.BridgeConfig.FixedCIDRv6 != "" {
_, fCIDRv6, err := net.ParseCIDR(config.BridgeConfig.FixedCIDRv6)
if err != nil {
return err