Move to ldap.v3 to fix go-gitea#5928

Signed-off-by: Andrew Thornton <art27@cantab.net>
zeripath · Feb 17, 2019 · c23f166 · c23f166
1 parent 11e3166
commit c23f166
Show file tree

Hide file tree

Showing 24 changed files with 721 additions and 433 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -97,8 +97,8 @@ ignored = ["google.golang.org/appengine*"]
   version = "1.31.1"
 
 [[constraint]]
-  name = "gopkg.in/ldap.v2"
-  version = "2.4.1"
+  name = "gopkg.in/ldap.v3"
+  version = "3.0.1"
 
 [[constraint]]
   name = "gopkg.in/macaron.v1"

diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go
@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/ldap.v2"
-
 	"code.gitea.io/gitea/modules/log"
+
+	ldap "gopkg.in/ldap.v3"
 )
 
 // SecurityProtocol protocol type

diff --git a/vendor/gopkg.in/ldap.v2/atomic_value.go b/vendor/gopkg.in/ldap.v2/atomic_value.go
diff --git a/vendor/gopkg.in/ldap.v2/atomic_value_go13.go b/vendor/gopkg.in/ldap.v2/atomic_value_go13.go
diff --git a/vendor/gopkg.in/ldap.v2/error.go b/vendor/gopkg.in/ldap.v2/error.go
diff --git a/vendor/gopkg.in/ldap.v2/LICENSE → vendor/gopkg.in/ldap.v3/LICENSE b/vendor/gopkg.in/ldap.v2/LICENSE → vendor/gopkg.in/ldap.v3/LICENSE
diff --git a/vendor/gopkg.in/ldap.v2/add.go → vendor/gopkg.in/ldap.v3/add.go b/vendor/gopkg.in/ldap.v2/add.go → vendor/gopkg.in/ldap.v3/add.go