From 17194f2edf0c517de04b80e708a0b03b50e81e75 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Mon, 7 Dec 2020 22:44:32 +0530
Subject: [PATCH] MM-30708: Fix racy TestLdapConnect/STARTTLS_connection
 (#16448)

```release-note
NONE
```

https://mattermost.atlassian.net/browse/MM-30708

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
---
 go.mod                                    | 2 +-
 go.sum                                    | 4 ++--
 vendor/github.com/mattermost/ldap/conn.go | 2 --
 vendor/modules.txt                        | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 7acdcd35d9..2b8885598f 100644
--- a/go.mod
+++ b/go.mod
@@ -67,7 +67,7 @@ require (
 	github.com/mattermost/go-i18n v1.11.0
 	github.com/mattermost/gorp v1.6.2-0.20200624165429-2595d5e54111
 	github.com/mattermost/gosaml2 v0.3.2
-	github.com/mattermost/ldap v0.0.0-20191128190019-9f62ba4b8d4d
+	github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d
 	github.com/mattermost/logr v1.0.13
 	github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0
 	github.com/mattn/go-colorable v0.1.8 // indirect
diff --git a/go.sum b/go.sum
index 02d98f5b69..30b7486397 100644
--- a/go.sum
+++ b/go.sum
@@ -524,8 +524,8 @@ github.com/mattermost/gorp v1.6.2-0.20200624165429-2595d5e54111 h1:32+lDqjkY8hvc
 github.com/mattermost/gorp v1.6.2-0.20200624165429-2595d5e54111/go.mod h1:QCQ3U0M9T/BlAdjKFJo0I1oe/YAgbyjNdhU8bpOLafk=
 github.com/mattermost/gosaml2 v0.3.2 h1:kq2dY5qUe6fPPHra171GVlgo+ycBsEog0gZMetxL8ow=
 github.com/mattermost/gosaml2 v0.3.2/go.mod h1:Z429EIOiEi9kbq6yHoApfzlcXpa6dzRDc6pO+Vy2Ksk=
-github.com/mattermost/ldap v0.0.0-20191128190019-9f62ba4b8d4d h1:2DV7VIlEv6J5R5o6tUcb3ZMKJYeeZuWZL7Rv1m23TgQ=
-github.com/mattermost/ldap v0.0.0-20191128190019-9f62ba4b8d4d/go.mod h1:HLbgMEI5K131jpxGazJ97AxfPDt31osq36YS1oxFQPQ=
+github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d h1:/RJ/UV7M5c7L2TQ0KNm4yZxxFvC1nvRz/gY/Daa35aI=
+github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d/go.mod h1:HLbgMEI5K131jpxGazJ97AxfPDt31osq36YS1oxFQPQ=
 github.com/mattermost/logr v1.0.13 h1:6F/fM3csvH6Oy5sUpJuW7YyZSzZZAhJm5VcgKMxA2P8=
 github.com/mattermost/logr v1.0.13/go.mod h1:Mt4DPu1NXMe6JxPdwCC0XBoxXmN9eXOIRPoZarU2PXs=
 github.com/mattermost/rsc v0.0.0-20160330161541-bbaefb05eaa0 h1:G9tL6JXRBMzjuD1kkBtcnd42kUiT6QDwxfFYu7adM6o=
diff --git a/vendor/github.com/mattermost/ldap/conn.go b/vendor/github.com/mattermost/ldap/conn.go
index 5b7ac47870..9e55a5d0cb 100644
--- a/vendor/github.com/mattermost/ldap/conn.go
+++ b/vendor/github.com/mattermost/ldap/conn.go
@@ -120,7 +120,6 @@ func Dial(network, addr string) (*Conn, error) {
 		return nil, NewError(ErrorNetwork, err)
 	}
 	conn := NewConn(c, false)
-	conn.Start()
 	return conn, nil
 }
 
@@ -132,7 +131,6 @@ func DialTLS(network, addr string, config *tls.Config) (*Conn, error) {
 		return nil, NewError(ErrorNetwork, err)
 	}
 	conn := NewConn(c, true)
-	conn.Start()
 	return conn, nil
 }
 
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 5d2325b461..8c6ef76152 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -371,7 +371,7 @@ github.com/mattermost/gorp
 github.com/mattermost/gosaml2
 github.com/mattermost/gosaml2/types
 github.com/mattermost/gosaml2/uuid
-# github.com/mattermost/ldap v0.0.0-20191128190019-9f62ba4b8d4d
+# github.com/mattermost/ldap v0.0.0-20201202150706-ee0e6284187d
 ## explicit
 github.com/mattermost/ldap
 # github.com/mattermost/logr v1.0.13