verdnatura-mirror
/
node-ldapjs
mirror of https://github.com/ldapjs/node-ldapjs.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert redundant changes

This commit is contained in:
Martin Cizek 2020-09-17 16:58:16 +02:00
parent 23e44b2959
commit f0c864ca85
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/client/client.js
View File

@ -798,9 +798,9 @@ Client.prototype.connect = function connect () {
self.url = self.urls[self._nextServer] self.url = self.urls[self._nextServer]
if (self.url) { if (self.url) {
self.host = url.hostname self.host = self.url.hostname
self.port = url.port self.port = self.url.port
self.secure = url.secure self.secure = self.url.secure
} }
cb = once(cb) cb = once(cb)
@ -831,13 +831,12 @@ Client.prototype.connect = function connect () {
setupClient(cb) setupClient(cb)
} }
var port = (self.urls.length && self.urls[self._nextServer].port) || self.socketPath var port = (self.port || self.socketPath)
var hostname = (self.urls.length && self.urls[self._nextServer].hostname) || undefined
if (self.secure) { if (self.secure) {
socket = tls.connect(port, hostname, self.tlsOptions) socket = tls.connect(port, self.host, self.tlsOptions)
socket.once('secureConnect', onConnect) socket.once('secureConnect', onConnect)
} else { } else {
socket = net.connect(port, hostname) socket = net.connect(port, self.host)
socket.once('connect', onConnect) socket.once('connect', onConnect)
} }
socket.once('error', onResult) socket.once('error', onResult)