Merge pull request #2783 from scottd018/fix-missing-port

k8s-ci-robot · web-flow · commit 1de31c2daaeb · 2022-06-15T01:27:17.000-07:00
fix: remove split of host/port
diff --git a/provider/rfc2136/rfc2136.go b/provider/rfc2136/rfc2136.go
@@ -134,12 +134,8 @@ func (r rfc2136Provider) KeyData() (keyName string, handle *gss.Client, err erro
 		return keyName, handle, err
 	}
 
-	rawHost, _, err := net.SplitHostPort(r.nameserver)
-	if err != nil {
-		return keyName, handle, err
-	}
+	keyName, _, err = handle.NegotiateContextWithCredentials(r.nameserver, r.krb5Realm, r.krb5Username, r.krb5Password)
 
-	keyName, _, err = handle.NegotiateContextWithCredentials(rawHost, r.krb5Realm, r.krb5Username, r.krb5Password)
 	return keyName, handle, err
 }
 

Original file line number	Diff line number	Diff line change
`@@ -134,12 +134,8 @@ func (r rfc2136Provider) KeyData() (keyName string, handle *gss.Client, err erro`
`134`	`134`	`return keyName, handle, err`
`135`	`135`	`}`
`136`	`136`
`137`		`- rawHost, _, err := net.SplitHostPort(r.nameserver)`
`138`		`- if err != nil {`
`139`		`- return keyName, handle, err`
`140`		`- }`
	`137`	`+ keyName, _, err = handle.NegotiateContextWithCredentials(r.nameserver, r.krb5Realm, r.krb5Username, r.krb5Password)`
`141`	`138`
`142`		`- keyName, _, err = handle.NegotiateContextWithCredentials(rawHost, r.krb5Realm, r.krb5Username, r.krb5Password)`
`143`	`139`	`return keyName, handle, err`
`144`	`140`	`}`
`145`	`141`