aboutsummaryrefslogtreecommitdiffstats
path: root/lib/sasl/src
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-11-07 10:30:28 +0100
committerFredrik Gustafsson <[email protected]>2013-11-07 10:30:28 +0100
commit945c8083c17f6f1d474aa26f5643174767f5bb76 (patch)
treef7242b27614f109651255016166677dd8e9d54f7 /lib/sasl/src
parent768a64354e3d69b3c0840a84dd072601c67ca39d (diff)
parente84e886d75698ab6af585959fead3fa3c0ca0168 (diff)
downloadotp-945c8083c17f6f1d474aa26f5643174767f5bb76.tar.gz
otp-945c8083c17f6f1d474aa26f5643174767f5bb76.tar.bz2
otp-945c8083c17f6f1d474aa26f5643174767f5bb76.zip
Merge branch 'richcarl/sasl-dont-add-undefined-handler/OTP-11464' into maint
* richcarl/sasl-dont-add-undefined-handler/OTP-11464: Don't try to add the log_mf_h handler in sasl unless configured to do so.
Diffstat (limited to 'lib/sasl/src')
-rw-r--r--lib/sasl/src/sasl.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sasl/src/sasl.erl b/lib/sasl/src/sasl.erl
index 989f99dc82..fdea6da13e 100644
--- a/lib/sasl/src/sasl.erl
+++ b/lib/sasl/src/sasl.erl
@@ -82,8 +82,8 @@ get_mf() ->
MaxB = get_mf_maxb(),
MaxF = get_mf_maxf(),
case {Dir, MaxB, MaxF} of
- {undefined,undefined,undefined} = R ->
- R;
+ {undefined,undefined,undefined} ->
+ undefined;
{undefined,_,_} ->
exit({missing_config, {sasl, error_logger_mf_dir}});
{_,undefined,_} ->