From a6faceb5590e233b474bc65a55e2992afdefd07b Mon Sep 17 00:00:00 2001 From: Maximilien Richer Date: Sun, 2 Feb 2020 14:47:16 +0100 Subject: Import upstream lor00x/goldap reposity --- go.mod | 1 + go.sum | 4 ++-- ldapserver/client.go | 2 +- ldapserver/constants.go | 2 +- ldapserver/message.go | 2 +- ldapserver/packet.go | 2 +- ldapserver/responsemessage.go | 2 +- ldapserver/route.go | 2 +- main.go | 2 +- read.go | 2 +- write.go | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index b12d85e..75156e0 100644 --- a/go.mod +++ b/go.mod @@ -5,5 +5,6 @@ go 1.13 require ( github.com/google/uuid v1.1.1 github.com/hashicorp/consul/api v1.3.0 + github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 github.com/sirupsen/logrus v1.4.2 ) diff --git a/go.sum b/go.sum index 52d45b8..c2db0e1 100644 --- a/go.sum +++ b/go.sum @@ -11,7 +11,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c h1:964Od4U6p2jUkFxvCy github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hashicorp/consul v1.6.3 h1:sEgOSrj8ShtiDNJXNibn6dl5F0t+KBVbE1hDh+m3mPU= github.com/hashicorp/consul/api v1.3.0 h1:HXNYlRkkM/t+Y/Yhxtwcy02dlYwIaoxzvxPnS+cqy78= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= github.com/hashicorp/consul/sdk v0.3.0 h1:UOxjlb4xVNF93jak1mzzoBatyFju9nrkxpVwIp/QqxQ= @@ -45,6 +44,8 @@ github.com/hashicorp/serf v0.8.2 h1:YZ7UKsJv+hKjqGVUUbtE3HNj79Eln2oQ75tniF6iPt0= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3 h1:wIONC+HMNRqmWBjuMxhatuSzHaljStc4gjDeKycxy0A= +github.com/lor00x/goldap v0.0.0-20180618054307-a546dffdd1a3/go.mod h1:37YR9jabpiIxsb8X9VCIx8qFOjTDIIrIHHODa8C4gz0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/miekg/dns v1.0.14 h1:9jZdLNd/P4+SfEJ0TNyxYpsK8N4GtfylBLqtbYN1sbA= @@ -76,7 +77,6 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/vjeantet/goldap v0.0.0-20160521203625-ea702ca12a40 h1:qqi/eaiN//CWWafL3+nMcrRN/kZmYOYjVPL+jpWNYyI= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3 h1:KYQXGkl6vs02hK7pK4eIbw0NpNPedieTSTEiJ//bwGs= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= diff --git a/ldapserver/client.go b/ldapserver/client.go index 7ab043d..706f908 100644 --- a/ldapserver/client.go +++ b/ldapserver/client.go @@ -6,7 +6,7 @@ import ( "sync" "time" - ldap "github.com/vjeantet/goldap/message" + ldap "github.com/lor00x/goldap/message" ) type UserState interface{} diff --git a/ldapserver/constants.go b/ldapserver/constants.go index 75c632c..de6d229 100644 --- a/ldapserver/constants.go +++ b/ldapserver/constants.go @@ -1,6 +1,6 @@ package ldapserver -import ldap "github.com/vjeantet/goldap/message" +import ldap "github.com/lor00x/goldap/message" // LDAP Application Codes const ( diff --git a/ldapserver/message.go b/ldapserver/message.go index 1761a4a..f6e609f 100644 --- a/ldapserver/message.go +++ b/ldapserver/message.go @@ -3,7 +3,7 @@ package ldapserver import ( "fmt" - ldap "github.com/vjeantet/goldap/message" + ldap "github.com/lor00x/goldap/message" ) type Message struct { diff --git a/ldapserver/packet.go b/ldapserver/packet.go index a87035c..77b4926 100644 --- a/ldapserver/packet.go +++ b/ldapserver/packet.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - ldap "github.com/vjeantet/goldap/message" + ldap "github.com/lor00x/goldap/message" ) type messagePacket struct { diff --git a/ldapserver/responsemessage.go b/ldapserver/responsemessage.go index aaf2ede..23527b9 100644 --- a/ldapserver/responsemessage.go +++ b/ldapserver/responsemessage.go @@ -1,6 +1,6 @@ package ldapserver -import ldap "github.com/vjeantet/goldap/message" +import ldap "github.com/lor00x/goldap/message" func NewBindResponse(resultCode int) ldap.BindResponse { r := ldap.BindResponse{} diff --git a/ldapserver/route.go b/ldapserver/route.go index 6ced938..dfd5240 100644 --- a/ldapserver/route.go +++ b/ldapserver/route.go @@ -3,7 +3,7 @@ package ldapserver import ( "strings" - ldap "github.com/vjeantet/goldap/message" + ldap "github.com/lor00x/goldap/message" ) // Constant to LDAP Request protocol Type names diff --git a/main.go b/main.go index e29b282..7939733 100644 --- a/main.go +++ b/main.go @@ -19,8 +19,8 @@ import ( ldap "bottin/ldapserver" consul "github.com/hashicorp/consul/api" + message "github.com/lor00x/goldap/message" log "github.com/sirupsen/logrus" - message "github.com/vjeantet/goldap/message" ) const ATTR_USERPASSWORD = "userpassword" diff --git a/read.go b/read.go index 56211d1..d3bb359 100644 --- a/read.go +++ b/read.go @@ -6,7 +6,7 @@ import ( ldap "bottin/ldapserver" - message "github.com/vjeantet/goldap/message" + message "github.com/lor00x/goldap/message" ) // Compare request ------------------------- diff --git a/write.go b/write.go index b7f4e69..0af7ae5 100644 --- a/write.go +++ b/write.go @@ -6,7 +6,7 @@ import ( ldap "bottin/ldapserver" - message "github.com/vjeantet/goldap/message" + message "github.com/lor00x/goldap/message" ) // Add request ------------------------ -- cgit v1.2.3