From 1af346afd2d8cabc48bf9673dc62672e36b7b8a2 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 6 Mar 2017 16:24:03 +0100
Subject: ssh: Host and Profile info returned in ssh:daemon_info

---
 lib/ssh/src/ssh.erl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 53aba14458..e2a289d737 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -200,11 +200,13 @@ daemon(Host0, Port, UserOptions0) ->
 daemon_info(Pid) ->
     case catch ssh_system_sup:acceptor_supervisor(Pid) of
 	AsupPid when is_pid(AsupPid) ->
-	    [Port] =
-		[Prt || {{ssh_acceptor_sup,any,Prt,default},
+	    [{ListenAddr,Port,Profile}] =
+		[{LA,Prt,Prf} || {{ssh_acceptor_sup,LA,Prt,Prf},
 			 _WorkerPid,worker,[ssh_acceptor]} <- supervisor:which_children(AsupPid)],
-	    {ok, [{port,Port}]};
-
+	    {ok, [{port,Port},
+                  {listen_address,ListenAddr},
+                  {profile,Profile}
+                 ]};
 	_ ->
 	    {error,bad_daemon_ref}
     end.
-- 
cgit v1.2.3


From 5d560441709eb1faa6a223b237da65f1d70da6d2 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Wed, 8 Mar 2017 18:34:43 +0100
Subject: ssh: documents ssh:daemon_info/1

---
 lib/ssh/doc/src/ssh.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index f6e26f5ee8..1f07e826ce 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -726,9 +726,10 @@
     </func>
 
     <func>
-      <name>daemon_info(Daemon) -> {ok, [{port,Port}]} | {error,Error}</name>
+      <name>daemon_info(Daemon) -> {ok, [DaemonInfo]} | {error,Error}</name>
       <fsummary>Get info about a daemon</fsummary>
       <type>
+	<v>DaemonInfo = {port,Port::pos_integer()} | {listen_address, any|ip_address()} | {profile,atom()}</v>
         <v>Port = integer()</v>
 	<v>Error = bad_daemon_ref</v>
       </type>
-- 
cgit v1.2.3