X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=src%2Fcypherpunks.ru%2Fgovpn%2Fcommon.go;h=72873d05f17e716f4064315979dcf7b6ce475727;hb=3fdd922de75e1901e37f75ab182d434f20d64c85;hp=3fe31651baaeecce97feac2ca017aa70f34e9524;hpb=ca13f5e54da2d88a65b99814e13c23834ae44342;p=govpn.git

diff --git a/src/cypherpunks.ru/govpn/common.go b/src/cypherpunks.ru/govpn/common.go
index 3fe3165..72873d0 100644
--- a/src/cypherpunks.ru/govpn/common.go
+++ b/src/cypherpunks.ru/govpn/common.go
@@ -121,8 +121,10 @@ func (p *Protocol) UnmarshalYAML(unmarshal func(interface{}) error) error {
 
 // NewProtocolFromString converts a string into a govpn.Protocol
 func NewProtocolFromString(p string) (Protocol, error) {
+	var k Protocol
+	var v string
 	lowP := strings.ToLower(p)
-	for k, v := range protocolText {
+	for k, v = range protocolText {
 		if strings.ToLower(v) == lowP {
 			return k, nil
 		}
@@ -130,17 +132,14 @@ func NewProtocolFromString(p string) (Protocol, error) {
 
 	choices := make([]string, len(protocolText))
 	var index = 0
-	for k, v := range protocolText {
-		if v == p {
-			z := k
-			p = &z
-			return nil
-		}
-		choices[index] = v
+	for k = range protocolText {
+		choices[index] = protocolText[k]
 		index++
 	}
 
-	return Protocol(-1), errors.Errorf("Invalid protocol %q: %s", p, strings.Join(choices, ","))
+	return Protocol(-1), errors.Errorf(
+		"Invalid protocol %q: %s", p, strings.Join(choices, ","),
+	)
 }
 
 // SliceZero zeros each byte.