Restore the original code used for setting userDN based on the result of our query. (#9041) (#9047)

ncabatoff · web-flow · commit 88e64dfe8b32 · 2020-05-20T15:48:26.000-04:00
diff --git a/sdk/helper/ldaputil/client.go b/sdk/helper/ldaputil/client.go
@@ -171,10 +171,9 @@ func (c *Client) GetUserDN(cfg *ConfigEntry, conn Connection, bindDN, username s
 		if err != nil {
 			return userDN, errwrap.Wrapf("LDAP search failed for detecting user: {{err}}", err)
 		}
-		if len(result.Entries) != 1 {
-			return userDN, fmt.Errorf("LDAP search for userdn 0 or not unique")
+		for _, e := range result.Entries {
+			userDN = e.DN
 		}
-		userDN = result.Entries[0].DN
 	} else {
 		userDN = bindDN
 	}

Original file line number	Diff line number	Diff line change
`@@ -171,10 +171,9 @@ func (c Client) GetUserDN(cfg ConfigEntry, conn Connection, bindDN, username s`
`171`	`171`	`if err != nil {`
`172`	`172`	`return userDN, errwrap.Wrapf("LDAP search failed for detecting user: {{err}}", err)`
`173`	`173`	`}`
`174`		`- if len(result.Entries) != 1 {`
`175`		`- return userDN, fmt.Errorf("LDAP search for userdn 0 or not unique")`
	`174`	`+ for _, e := range result.Entries {`
	`175`	`+ userDN = e.DN`
`176`	`176`	`}`
`177`		`- userDN = result.Entries[0].DN`
`178`	`177`	`} else {`
`179`	`178`	`userDN = bindDN`
`180`	`179`	`}`