Don't hide 'undef' exceptions during config validation

diff --git a/src/ejabberd_config.erl b/src/ejabberd_config.erl
index d1e7a2f454400d15674f1652db55399bc26c165b..48fdcefbcbba21ab9d16c971f7e0829c0a507ffb 100644 (file)
--- a/src/ejabberd_config.erl
+++ b/src/ejabberd_config.erl
@@ -1083,7 +1083,7 @@ validate_opts(#state{opts = Opts} = State, ModOpts) ->
                                                       [Opt, Error,
                                                        misc:format_val({yaml, Val})]),
                                            erlang:error(invalid_option);
-                                         _:_ ->
+                                         _:R when R /= undef ->
                                            ?ERROR_MSG("Invalid value for "
                                                       "option '~s': ~s",
                                                       [Opt, misc:format_val({yaml, Val})]),

diff --git a/src/ejabberd_listener.erl b/src/ejabberd_listener.erl
index 5b2981c2dc1c69a0d8b85b6af7a3401309eddb19..7c3d9e31e229b65001553144257ab062c4c58b31 100644 (file)
--- a/src/ejabberd_listener.erl
+++ b/src/ejabberd_listener.erl
@@ -586,7 +586,7 @@ validate_module_opt(Module, Opt, Val) ->
           catch _:_ -> listen_opt_type(Opt)
           end,
     try {Opt, VFun(Val)}
-    catch _:_ ->
+    catch _:R when R /= undef ->
            ?ERROR_MSG("Invalid value of listening option ~s: ~s",
                       [Opt, misc:format_val({yaml, Val})]),
            erlang:error(badarg)

diff --git a/src/gen_mod.erl b/src/gen_mod.erl
index 6575e1e8217e07f589cd4abc3af2382713a196ed..cf107f7b0bb9289eff8ac7b38f38964f7d81ecdb 100644 (file)
--- a/src/gen_mod.erl
+++ b/src/gen_mod.erl
@@ -620,7 +620,7 @@ validate_opt(Opt, Val, VFun) ->
        NewVal -> [{Opt, NewVal}]
     catch {invalid_syntax, Error} ->
            err_invalid_option(Opt, Val, Error);
-         _:_ ->
+         _:R when R /= undef ->
            err_invalid_option(Opt, Val)
     end.