Skip to content

[Vendor] Update go-ldap to v3.2.4 #13163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 15, 2020
Merged

[Vendor] Update go-ldap to v3.2.4 #13163

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f34757e
[Vendor] update go-ldap to v3.0.3
6543 Oct 15, 2020
67cb89b
update go-ldap to v3.2.4
6543 Oct 15, 2020
8708279
Merge branch 'master' into vendor_go-ldap
techknowlogick Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ require (
github.com/go-enry/go-enry/v2 v2.5.2
github.com/go-git/go-billy/v5 v5.0.0
github.com/go-git/go-git/v5 v5.1.0
github.com/go-ldap/ldap v3.0.3+incompatible
github.com/go-redis/redis/v7 v7.4.0
github.com/go-sql-driver/mysql v1.5.0
github.com/go-swagger/go-swagger v0.25.0
Expand Down Expand Up @@ -112,10 +113,9 @@ require (
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
golang.org/x/tools v0.0.0-20200921210052-fa0125251cc4
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
gopkg.in/ini.v1 v1.61.0
gopkg.in/ldap.v3 v3.0.2
gopkg.in/yaml.v2 v2.3.0
mvdan.cc/xurls/v2 v2.1.0
strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ github.com/go-git/go-git/v5 v5.1.0 h1:HxJn9g/E7eYvKW3Fm7Jt4ee8LXfPOm/H1cdDu8vEss
github.com/go-git/go-git/v5 v5.1.0/go.mod h1:ZKfuPUoY1ZqIG4QG9BDBh3G4gLM5zvPuSJAozQrZuyM=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk=
github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI=
Expand Down Expand Up @@ -1148,8 +1150,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk=
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk=
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 h1:nn6Zav2sOQHCFJHEspya8KqxhFwKci30UxHy3HXPTyQ=
gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand All @@ -1170,8 +1172,6 @@ gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.60.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ini.v1 v1.61.0 h1:LBCdW4FmFYL4s/vDZD1RQYX7oAR6IjujCYgMdbHBR10=
gopkg.in/ini.v1 v1.61.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
gopkg.in/ldap.v3 v3.0.2 h1:R6RBtabK6e1GO0eQKtkyOFbAHO73QesLzI2w2DZ6b9w=
gopkg.in/ldap.v3 v3.0.2/go.mod h1:oxD7NyBuxchC+SgJDE1Q5Od05eGt29SDQVBmV+HYbzw=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
Expand Down
2 changes: 1 addition & 1 deletion modules/auth/ldap/ldap.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"code.gitea.io/gitea/modules/log"

"gopkg.in/ldap.v3"
"github.com/go-ldap/ldap"
)

// SecurityProtocol protocol type
Expand Down
0 vendor/gopkg.in/ldap.v3/.gitignore → vendor/github.com/go-ldap/ldap/.gitignore
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion vendor/gopkg.in/ldap.v3/.travis.yml → vendor/github.com/go-ldap/ldap/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/gopkg.in/ldap.v3/CONTRIBUTING.md → ...r/github.com/go-ldap/ldap/CONTRIBUTING.md
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/LICENSE → vendor/github.com/go-ldap/ldap/LICENSE
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/Makefile → vendor/github.com/go-ldap/ldap/Makefile
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/README.md → vendor/github.com/go-ldap/ldap/README.md
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/add.go → vendor/github.com/go-ldap/ldap/add.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/bind.go → vendor/github.com/go-ldap/ldap/bind.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/client.go → vendor/github.com/go-ldap/ldap/client.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/compare.go → vendor/github.com/go-ldap/ldap/compare.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/conn.go → vendor/github.com/go-ldap/ldap/conn.go
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion vendor/gopkg.in/ldap.v3/control.go → vendor/github.com/go-ldap/ldap/control.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/gopkg.in/ldap.v3/debug.go → vendor/github.com/go-ldap/ldap/debug.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/del.go → vendor/github.com/go-ldap/ldap/del.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/dn.go → vendor/github.com/go-ldap/ldap/dn.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/doc.go → vendor/github.com/go-ldap/ldap/doc.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/error.go → vendor/github.com/go-ldap/ldap/error.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/filter.go → vendor/github.com/go-ldap/ldap/filter.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/ldap.go → vendor/github.com/go-ldap/ldap/ldap.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/moddn.go → vendor/github.com/go-ldap/ldap/moddn.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/modify.go → vendor/github.com/go-ldap/ldap/modify.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/passwdmodify.go → ...r/github.com/go-ldap/ldap/passwdmodify.go
View file
Open in desktop
File renamed without changes.
0 vendor/gopkg.in/ldap.v3/search.go → vendor/github.com/go-ldap/ldap/search.go
View file
Open in desktop
File renamed without changes.
35 changes: 28 additions & 7 deletions vendor/gopkg.in/asn1-ber.v1/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 19 additions & 24 deletions vendor/gopkg.in/asn1-ber.v1/LICENSE
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions vendor/gopkg.in/asn1-ber.v1/ber.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions vendor/gopkg.in/asn1-ber.v1/header.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 26 additions & 17 deletions vendor/gopkg.in/asn1-ber.v1/identifier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions vendor/gopkg.in/asn1-ber.v1/length.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,9 @@ github.com/go-git/go-git/v5/utils/merkletrie/filesystem
github.com/go-git/go-git/v5/utils/merkletrie/index
github.com/go-git/go-git/v5/utils/merkletrie/internal/frame
github.com/go-git/go-git/v5/utils/merkletrie/noder
# github.com/go-ldap/ldap v3.0.3+incompatible
## explicit
github.com/go-ldap/ldap
# github.com/go-openapi/analysis v0.19.10
github.com/go-openapi/analysis
github.com/go-openapi/analysis/internal
Expand Down Expand Up @@ -935,7 +938,7 @@ google.golang.org/protobuf/runtime/protoimpl
# gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
## explicit
gopkg.in/alexcesaro/quotedprintable.v3
# gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175
# gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d
## explicit
gopkg.in/asn1-ber.v1
# gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
Expand All @@ -944,9 +947,6 @@ gopkg.in/gomail.v2
# gopkg.in/ini.v1 v1.61.0
## explicit
gopkg.in/ini.v1
# gopkg.in/ldap.v3 v3.0.2
## explicit
gopkg.in/ldap.v3
# gopkg.in/warnings.v0 v0.1.2
gopkg.in/warnings.v0
# gopkg.in/yaml.v2 v2.3.0
Expand Down