aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-02-26 12:20:43 +0100
committerHans Nilsson <[email protected]>2016-02-26 12:20:43 +0100
commite76103a4549bc25937af5cdccbe43c1683613d07 (patch)
tree8fc1fec1a5ad4a78f9ecef4e73b3e89b4fa96156 /lib
parent5058b37d878f8cdf43c351ab4f05985196630c2b (diff)
parent6945d1266486d546aa1a591799591fa1e28e1b1d (diff)
downloadotp-e76103a4549bc25937af5cdccbe43c1683613d07.tar.gz
otp-e76103a4549bc25937af5cdccbe43c1683613d07.tar.bz2
otp-e76103a4549bc25937af5cdccbe43c1683613d07.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/eldap/src/eldap.erl2
-rw-r--r--lib/eldap/vsn.mk2
-rw-r--r--lib/ssh/vsn.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl
index 5d9718f00c..dc236f8a44 100644
--- a/lib/eldap/src/eldap.erl
+++ b/lib/eldap/src/eldap.erl
@@ -697,7 +697,7 @@ exec_simple_bind_reply(Data, {ok,Msg}) when
{bindResponse, Result} ->
case Result#'BindResponse'.resultCode of
success -> {ok,Data};
- referral -> {{ok, {referral,Msg#'BindResponse'.referral}}, Data};
+ referral -> {{ok, {referral,Result#'BindResponse'.referral}}, Data};
Error -> {error, Error}
end;
Other -> {error, Other}
diff --git a/lib/eldap/vsn.mk b/lib/eldap/vsn.mk
index 105a2bcdbb..99c474d588 100644
--- a/lib/eldap/vsn.mk
+++ b/lib/eldap/vsn.mk
@@ -1 +1 @@
-ELDAP_VSN = 1.2
+ELDAP_VSN = 1.2.1
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 55d12abffe..41b42d454b 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.2.1
+SSH_VSN = 4.2.2
APP_VSN = "ssh-$(SSH_VSN)"