luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Update go-ldap with our patch for control packets. (#3670) 

Fixes #3656
Fixes #3625
Fixes #3402
This commit is contained in:
Jeff Mitchell 2017-12-09 10:45:03 -05:00 committed by GitHub
parent 87154b1562
commit d70db5df9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/go-ldap/ldap/bind.go generated vendored
View File

@ -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
}

2
vendor/github.com/go-ldap/ldap/del.go generated vendored
View File

@ -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))
}

2
vendor/github.com/go-ldap/ldap/search.go generated vendored
View File

@ -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))
}

6
vendor/vendor.json vendored
View File

@ -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=",