mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-12-16 18:37:25 +00:00
Update go-ldap with our patch for control packets. (#3670)
Fixes #3656 Fixes #3625 Fixes #3402
This commit is contained in:
4
vendor/github.com/go-ldap/ldap/bind.go
generated
vendored
4
vendor/github.com/go-ldap/ldap/bind.go
generated
vendored
@@ -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
2
vendor/github.com/go-ldap/ldap/del.go
generated
vendored
@@ -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
2
vendor/github.com/go-ldap/ldap/search.go
generated
vendored
@@ -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))
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user