diff options
| author | Hans Nilsson <[email protected]> | 2016-02-26 12:20:04 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-02-26 12:20:04 +0100 |
| commit | 6945d1266486d546aa1a591799591fa1e28e1b1d (patch) | |
| tree | 00472d182dee73849ef6289e78dfce1629ceac01 /lib | |
| parent | 0b58c464447024770b601b38cf9e35ceb2e49883 (diff) | |
| parent | 1db90f772346e355ac9b58a3c08899321adb612c (diff) | |
| download | otp-6945d1266486d546aa1a591799591fa1e28e1b1d.tar.gz otp-6945d1266486d546aa1a591799591fa1e28e1b1d.tar.bz2 otp-6945d1266486d546aa1a591799591fa1e28e1b1d.zip | |
Merge branch 'hans/eldap/prepare_release' into maint
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/eldap/src/eldap.erl | 2 | ||||
| -rw-r--r-- | lib/eldap/vsn.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/eldap/src/eldap.erl b/lib/eldap/src/eldap.erl index 3ab96ffeb5..0c03021bd0 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 |