diff --git a/vendor/github.com/go-ldap/ldap/bind.go b/vendor/github.com/go-ldap/ldap/bind.go index 589a9d80b57c..2be0defddfbf 100644 --- a/vendor/github.com/go-ldap/ldap/bind.go +++ b/vendor/github.com/go-ldap/ldap/bind.go @@ -40,7 +40,9 @@ func (bindRequest *SimpleBindRequest) encode() *ber.Packet { request.AppendChild(ber.NewString(ber.ClassUniversal, ber.TypePrimitive, ber.TagOctetString, bindRequest.Username, "User Name")) request.AppendChild(ber.NewString(ber.ClassContext, ber.TypePrimitive, 0, bindRequest.Password, "Password")) - request.AppendChild(encodeControls(bindRequest.Controls)) + if len(bindRequest.Controls) > 0 { + request.AppendChild(encodeControls(bindRequest.Controls)) + } return request } diff --git a/vendor/github.com/go-ldap/ldap/del.go b/vendor/github.com/go-ldap/ldap/del.go index 4fd63dc3f25a..685a0ffd84e6 100644 --- a/vendor/github.com/go-ldap/ldap/del.go +++ b/vendor/github.com/go-ldap/ldap/del.go @@ -40,7 +40,7 @@ func (l *Conn) Del(delRequest *DelRequest) error { packet := ber.Encode(ber.ClassUniversal, ber.TypeConstructed, ber.TagSequence, nil, "LDAP Request") packet.AppendChild(ber.NewInteger(ber.ClassUniversal, ber.TypePrimitive, ber.TagInteger, l.nextMessageID(), "MessageID")) packet.AppendChild(delRequest.encode()) - if delRequest.Controls != nil { + if len(delRequest.Controls) > 0 { packet.AppendChild(encodeControls(delRequest.Controls)) } diff --git a/vendor/github.com/go-ldap/ldap/search.go b/vendor/github.com/go-ldap/ldap/search.go index 97ae95bf7913..d1f0386f9650 100644 --- a/vendor/github.com/go-ldap/ldap/search.go +++ b/vendor/github.com/go-ldap/ldap/search.go @@ -375,7 +375,7 @@ func (l *Conn) Search(searchRequest *SearchRequest) (*SearchResult, error) { } packet.AppendChild(encodedSearchRequest) // encode search controls - if searchRequest.Controls != nil { + if len(searchRequest.Controls) > 0 { packet.AppendChild(encodeControls(searchRequest.Controls)) } diff --git a/vendor/vendor.json b/vendor/vendor.json index aaf431a67ff6..070e4316b56b 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -817,10 +817,10 @@ "revisionTime": "2017-10-26T18:46:43Z" }, { - "checksumSHA1": "1AP23CNIbIxDH/auM59029H0CGY=", + "checksumSHA1": "3qxR+iktZ/aLpuq9by7pel2YM7w=", "path": "github.com/go-ldap/ldap", - "revision": "0ae9f2495c4a9e5d436bc9a2b13a71a2fb06ddf3", - "revisionTime": "2017-09-29T19:17:40Z" + "revision": "23c4ee25d1434f2231f92afaeebfbfa7900ebbb0", + "revisionTime": "2017-12-09T13:38:01Z" }, { "checksumSHA1": "6dTGC5A1Y1xnv+JSi9z8S6JfnH0=",