aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-03-05 12:18:54 +0100
committerHans Nilsson <[email protected]>2018-03-05 12:18:54 +0100
commit45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04 (patch)
tree563ffc46d0de9defdcc68545e939332b1ebeb27f /lib
parent073829d18ada35a18ff681f891b0d4fbfbff5c2f (diff)
parentba3710484344ed57124574abcd0f19fbe251389c (diff)
downloadotp-45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04.tar.gz
otp-45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04.tar.bz2
otp-45e2b4aba7fa8bc5a7ae94f5f0f593d0a0159f04.zip
Merge branch 'maint-18' into maint
* maint-18: Updated OTP version Update release notes Update version numbers ssh: Fix cli ssh: Test for disabled shell Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/src/ssh.erl lib/ssh/src/ssh_cli.erl lib/ssh/vsn.mk otp_versions.table
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/doc/src/notes.xml17
-rw-r--r--lib/ssh/src/ssh.erl3
-rw-r--r--lib/ssh/vsn.mk1
3 files changed, 15 insertions, 6 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index df2e04c92a..5fc5ebda24 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -95,7 +95,6 @@
</list>
</section>
-
<section><title>Improvements and New Features</title>
<list>
<item>
@@ -125,7 +124,6 @@
</section>
<section><title>Ssh 4.6.2</title>
-
<section><title>Fixed Bugs and Malfunctions</title>
<list>
<item>
@@ -791,6 +789,21 @@
</section>
+<section><title>Ssh 4.2.2.5</title>
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Default exec is disabled when a user-defined shell is
+ enabled.</p>
+ <p>
+ Own Id: OTP-14881</p>
+ </item>
+ </list>
+ </section>
+</section>
+
+
<section><title>Ssh 4.2.2.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 032d87bdad..25d537c624 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -184,7 +184,6 @@ channel_info(ConnectionRef, ChannelId, Options) ->
daemon(Port) ->
daemon(Port, []).
-
daemon(Socket, UserOptions) when is_port(Socket) ->
try
#{} = Options = ssh_options:handle_options(server, UserOptions),
@@ -267,8 +266,6 @@ daemon(Host0, Port0, UserOptions0) when 0 =< Port0, Port0 =< 65535,
daemon(_, _, _) ->
{error, badarg}.
-
-
%%--------------------------------------------------------------------
-spec daemon_info(daemon_ref()) -> ok_error( [{atom(), term()}] ).
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 6aaa22a6b4..480e955ec4 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
SSH_VSN = 4.6.5
-
APP_VSN = "ssh-$(SSH_VSN)"