Skip to content

Commit 22770c3

Browse files
zeripathzeripath
authored
Move to ldap.v3 to fix #5928 (#6105)
Signed-off-by: Andrew Thornton <[email protected]>
1 parent a380cfd commit 22770c3

24 files changed

+721
-433
lines changed

‎Gopkg.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ ignored = ["google.golang.org/appengine*"]
9595
version = "1.31.1"
9696

9797
[[constraint]]
98-
name = "gopkg.in/ldap.v2"
99-
version = "2.4.1"
98+
name = "gopkg.in/ldap.v3"
99+
version = "3.0.1"
100100

101101
[[constraint]]
102102
name = "gopkg.in/macaron.v1"

‎modules/auth/ldap/ldap.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"fmt"
1212
"strings"
1313

14-
"gopkg.in/ldap.v2"
15-
1614
"code.gitea.io/gitea/modules/log"
15+
16+
ldap "gopkg.in/ldap.v3"
1717
)
1818

1919
// SecurityProtocol protocol type

‎vendor/gopkg.in/ldap.v2/atomic_value.go

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎vendor/gopkg.in/ldap.v2/atomic_value_go13.go

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎vendor/gopkg.in/ldap.v2/error.go

Lines changed: 0 additions & 155 deletions
This file was deleted.

‎vendor/gopkg.in/ldap.v2/LICENSE renamed to ‎vendor/gopkg.in/ldap.v3/LICENSE

File renamed without changes.

‎vendor/gopkg.in/ldap.v2/add.go renamed to ‎vendor/gopkg.in/ldap.v3/add.go

Lines changed: 11 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)