From 74bfc54aaa15b07cd3c09ba3aa0470d3c986cf6e Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 6 Nov 2018 11:38:50 +0100
Subject: ssh: Fix doc error in daemon 'exec' option

---
 lib/ssh/doc/src/ssh.xml | 11 +++++++++++
 lib/ssh/src/ssh.hrl     |  5 +++--
 2 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index b75b4a33c2..e31d630ebf 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -397,9 +397,20 @@
 
     <datatype>
       <name name="exec_daemon_option"/>
+      <name name="exec_spec"/>
+      <desc/>
+    </datatype>
+    <datatype>
+      <name name="exec_fun"/>
+      <desc/>
+    </datatype>
+    <datatype>
       <name name="'exec_fun/1'"/>
       <name name="'exec_fun/2'"/>
       <name name="'exec_fun/3'"/>
+      <desc/>
+    </datatype>
+    <datatype>
       <name name="exec_result"/>
       <desc>
 	<p>This option changes how the daemon execute exec-requests from clients. The term in the return value
diff --git a/lib/ssh/src/ssh.hrl b/lib/ssh/src/ssh.hrl
index 3ac74c4925..233f3caa5d 100644
--- a/lib/ssh/src/ssh.hrl
+++ b/lib/ssh/src/ssh.hrl
@@ -293,8 +293,9 @@
 -type 'shell_fun/1'() :: fun((User::string()) -> pid()) .
 -type 'shell_fun/2'() :: fun((User::string(),  PeerAddr::inet:ip_address()) -> pid()).
 
--type exec_daemon_option()      :: {exec, 'exec_fun/1'() | 'exec_fun/2'() | 'exec_fun/3'() }.
-
+-type exec_daemon_option()      :: {exec, exec_spec()} .
+-type exec_spec()               :: {direct, exec_fun()} .
+-type exec_fun()                :: 'exec_fun/1'() | 'exec_fun/2'() | 'exec_fun/3'().
 -type 'exec_fun/1'() :: fun((Cmd::string()) -> exec_result()) .
 -type 'exec_fun/2'() :: fun((Cmd::string(), User::string()) -> exec_result()) .
 -type 'exec_fun/3'() :: fun((Cmd::string(), User::string(), ClientAddr::ip_port()) -> exec_result()) .
-- 
cgit v1.2.3