Browse Source

upgrade go-ldap

tags/v2.1.0-rc1
Shivaram Lingamneni 4 years ago
parent
commit
f168ec3411
4 changed files with 15 additions and 8 deletions
  1. 1
    1
      go.mod
  2. 2
    0
      go.sum
  3. 11
    6
      vendor/github.com/go-ldap/ldap/v3/ldap.go
  4. 1
    1
      vendor/modules.txt

+ 1
- 1
go.mod View File

@@ -5,7 +5,7 @@ go 1.14
5 5
 require (
6 6
 	code.cloudfoundry.org/bytefmt v0.0.0-20190819182555-854d396b647c
7 7
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
8
-	github.com/go-ldap/ldap/v3 v3.1.6
8
+	github.com/go-ldap/ldap/v3 v3.1.7
9 9
 	github.com/go-sql-driver/mysql v1.5.0
10 10
 	github.com/goshuirc/e-nfa v0.0.0-20160917075329-7071788e3940 // indirect
11 11
 	github.com/goshuirc/irc-go v0.0.0-20190713001546-05ecc95249a0

+ 2
- 0
go.sum View File

@@ -10,6 +10,8 @@ github.com/go-asn1-ber/asn1-ber v1.3.1 h1:gvPdv/Hr++TRFCl0UbPFHC54P9N9jgsRPnmnr4
10 10
 github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
11 11
 github.com/go-ldap/ldap/v3 v3.1.6 h1:VTihvB7egSAvU6KOagaiA/EvgJMR2jsjRAVIho2ydBo=
12 12
 github.com/go-ldap/ldap/v3 v3.1.6/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
13
+github.com/go-ldap/ldap/v3 v3.1.7 h1:aHjuWTgZsnxjMgqzx0JHwNqz4jBYZTcNarbPFkW1Oww=
14
+github.com/go-ldap/ldap/v3 v3.1.7/go.mod h1:5Zun81jBTabRaI8lzN7E1JjyEl1g6zI6u9pd8luAK4Q=
13 15
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
14 16
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
15 17
 github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=

+ 11
- 6
vendor/github.com/go-ldap/ldap/v3/ldap.go View File

@@ -269,13 +269,18 @@ func addRequestDescriptions(packet *ber.Packet) error {
269 269
 }
270 270
 
271 271
 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"
275 279
 	}
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
279 284
 	if len(packet.Children[1].Children) > 3 {
280 285
 		packet.Children[1].Children[3].Description = "Referral"
281 286
 	}

+ 1
- 1
vendor/modules.txt View File

@@ -6,7 +6,7 @@ code.cloudfoundry.org/bytefmt
6 6
 github.com/docopt/docopt-go
7 7
 # github.com/go-asn1-ber/asn1-ber v1.3.1
8 8
 github.com/go-asn1-ber/asn1-ber
9
-# github.com/go-ldap/ldap/v3 v3.1.6
9
+# github.com/go-ldap/ldap/v3 v3.1.7
10 10
 ## explicit
11 11
 github.com/go-ldap/ldap/v3
12 12
 # github.com/go-sql-driver/mysql v1.5.0

Loading…
Cancel
Save