From 2f0f5ac504bd0cc153b26c79e945cdd83b0d412a Mon Sep 17 00:00:00 2001
From: Anthony Romano <anthony.romano@coreos.com>
Date: Mon, 12 Sep 2016 19:45:35 -0700
Subject: [PATCH] Revert "Merge pull request #6365 from
 heyitsanthony/fix-dns-bind"

This reverts commit af5ab7b3515cf023af7af94bc6e9063945802be0, reversing
changes made to da6a0f0594f352539349013336614e08033a7eb3.
---
 etcdmain/config.go | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/etcdmain/config.go b/etcdmain/config.go
index 9df9374d8..3d987b766 100644
--- a/etcdmain/config.go
+++ b/etcdmain/config.go
@@ -20,7 +20,6 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
-	"net"
 	"net/url"
 	"os"
 	"runtime"
@@ -411,13 +410,6 @@ func (cfg *config) configFromFile() error {
 }
 
 func (cfg *config) validateConfig(isSet func(field string) bool) error {
-	if err := checkBindURLs(cfg.lpurls); err != nil {
-		return err
-	}
-	if err := checkBindURLs(cfg.lcurls); err != nil {
-		return err
-	}
-
 	// when etcd runs in member mode user needs to set --advertise-client-urls if --listen-client-urls is set.
 	// TODO(yichengq): check this for joining through discovery service case
 	mayFallbackToProxy := isSet("discovery") && cfg.fallback.String() == fallbackFlagProxy
@@ -464,22 +456,3 @@ func (cfg config) isReadonlyProxy() bool       { return cfg.proxy.String() == pr
 func (cfg config) shouldFallbackToProxy() bool { return cfg.fallback.String() == fallbackFlagProxy }
 
 func (cfg config) electionTicks() int { return int(cfg.ElectionMs / cfg.TickMs) }
-
-// checkBindURLs returns an error if any URL uses a domain name.
-func checkBindURLs(urls []url.URL) error {
-	for _, url := range urls {
-		if url.Scheme == "unix" || url.Scheme == "unixs" {
-			continue
-		}
-		host := strings.Split(url.Host, ":")[0]
-		if host == "localhost" {
-			// special case for local address
-			// TODO: support /etc/hosts ?
-			continue
-		}
-		if net.ParseIP(host) == nil {
-			return fmt.Errorf("expected IP in URL for binding (%s)", url.String())
-		}
-	}
-	return nil
-}