diff options
| -rw-r--r-- | doc/Makefile | 18 | ||||
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/doc/Makefile b/doc/Makefile index a67148798..40c7a4652 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -11,16 +11,16 @@ CONTRIBUTED_MODULES = "" all: release pdf html release: - @echo "Notes for the releaser:" - @echo "* Do not forget to add a link to the release notes in guide.tex" - @echo "* Do not forget to update the version number in ebin/ejabberd.app!" - @echo "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)." - @echo "Press any key to continue" + @printf '%s\n' "Notes for the releaser:" + @printf '%s\n' "* Do not forget to add a link to the release notes in guide.tex" + @printf '%s\n' "* Do not forget to update the version number in ebin/ejabberd.app!" + @printf '%s\n' "* Do not forget to update the features in introduction.tex (including \new{} and \improved{} tags)." + @printf '%s\n' "Press any key to continue" ##@read foo - @echo "% ejabberd version (automatically generated)." > version.tex - @echo "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../ebin/ejabberd.app`"}" >> version.tex - @echo -n "% Contributed modules (automatically generated)." > contributed_modules.tex - @echo -e "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex + @printf '%s\n' "% ejabberd version (automatically generated)." > version.tex + @printf '%s\n' "\newcommand{\version}{"`sed '/vsn/!d;s/\(.*\)"\(.*\)"\(.*\)/\2/' ../ebin/ejabberd.app`"}" >> version.tex + @printf '%s' "% Contributed modules (automatically generated)." > contributed_modules.tex + @printf '%b\n' "$(CONTRIBUTED_MODULES)" >> contributed_modules.tex html: guide.html dev.html features.html diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 4fde814fe..6c594185a 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -374,8 +374,8 @@ wait_for_feature_request({xmlstreamelement, El}, #xmlel{name = <<"success">>, attrs = [{<<"xmlns">>, ?NS_SASL}], children = []}), - ?DEBUG("(~w) Accepted s2s authentication for ~s", - [StateData#state.socket, AuthDomain]), + ?INFO_MSG("Accepted s2s EXTERNAL authentication for ~s (TLS=~p)", + [AuthDomain, StateData#state.tls_enabled]), change_shaper(StateData, <<"">>, jlib:make_jid(<<"">>, AuthDomain, <<"">>)), {next_state, wait_for_stream, @@ -515,6 +515,8 @@ stream_established({valid, From, To}, StateData) -> [{<<"from">>, To}, {<<"to">>, From}, {<<"type">>, <<"valid">>}], children = []}), + ?INFO_MSG("Accepted s2s dialback authentication for ~s (TLS=~p)", + [From, StateData#state.tls_enabled]), LFrom = jlib:nameprep(From), LTo = jlib:nameprep(To), NSD = StateData#state{connections = |