Skip to content

Commit 1972b41

Browse files
authored
Handling nil errors on addDefaultLDAPResponseDescriptions (#219)
* Handling nil errors on addDefaultLDAPResponseDescriptions * Moving changes to v3 * Reconvering the changes from root directory
1 parent 0e14253 commit 1972b41

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

ldap.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,18 @@ func addRequestDescriptions(packet *ber.Packet) error {
269269
}
270270

271271
func addDefaultLDAPResponseDescriptions(packet *ber.Packet) error {
272-
err := GetLDAPError(packet)
273-
if err == nil {
274-
return nil
272+
resultCode := uint16(LDAPResultSuccess)
273+
matchedDN := ""
274+
description := "Success"
275+
if err := GetLDAPError(packet); err != nil {
276+
resultCode = err.(*Error).ResultCode
277+
matchedDN = err.(*Error).MatchedDN
278+
description = "Error Message"
275279
}
276-
packet.Children[1].Children[0].Description = "Result Code (" + LDAPResultCodeMap[err.(*Error).ResultCode] + ")"
277-
packet.Children[1].Children[1].Description = "Matched DN (" + err.(*Error).MatchedDN + ")"
278-
packet.Children[1].Children[2].Description = "Error Message"
280+
281+
packet.Children[1].Children[0].Description = "Result Code (" + LDAPResultCodeMap[resultCode] + ")"
282+
packet.Children[1].Children[1].Description = "Matched DN (" + matchedDN + ")"
283+
packet.Children[1].Children[2].Description = description
279284
if len(packet.Children[1].Children) > 3 {
280285
packet.Children[1].Children[3].Description = "Referral"
281286
}

v3/ldap.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -269,13 +269,18 @@ func addRequestDescriptions(packet *ber.Packet) error {
269269
}
270270

271271
func addDefaultLDAPResponseDescriptions(packet *ber.Packet) error {
272-
err := GetLDAPError(packet)
273-
if err == nil {
274-
return nil
272+
resultCode := uint16(LDAPResultSuccess)
273+
matchedDN := ""
274+
description := "Success"
275+
if err := GetLDAPError(packet); err != nil {
276+
resultCode = err.(*Error).ResultCode
277+
matchedDN = err.(*Error).MatchedDN
278+
description = "Error Message"
275279
}
276-
packet.Children[1].Children[0].Description = "Result Code (" + LDAPResultCodeMap[err.(*Error).ResultCode] + ")"
277-
packet.Children[1].Children[1].Description = "Matched DN (" + err.(*Error).MatchedDN + ")"
278-
packet.Children[1].Children[2].Description = "Error Message"
280+
281+
packet.Children[1].Children[0].Description = "Result Code (" + LDAPResultCodeMap[resultCode] + ")"
282+
packet.Children[1].Children[1].Description = "Matched DN (" + matchedDN + ")"
283+
packet.Children[1].Children[2].Description = description
279284
if len(packet.Children[1].Children) > 3 {
280285
packet.Children[1].Children[3].Description = "Referral"
281286
}

0 commit comments

Comments
 (0)