Avoid to set an entrypoint when possible

moul · Jul 15, 2016 · 4ac4dd0 · 4ac4dd0
1 parent 1cd3a85
commit 4ac4dd0
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/client.go b/client.go
@@ -255,7 +255,7 @@ func (c *Client) HandleChannelRequests(channel ssh.Channel, requests <-chan *ssh
 				}
 				ok = true
 
-				entrypoint := c.Server.DefaultShell
+				entrypoint := ""
 				if c.Config.EntryPoint != "" {
 					entrypoint = c.Config.EntryPoint
 				}
@@ -265,6 +265,10 @@ func (c *Client) HandleChannelRequests(channel ssh.Channel, requests <-chan *ssh
 					args = c.Config.Command
 				}
 
+				if entrypoint == "" && len(args) == 0 {
+					args = []string{c.Server.DefaultShell}
+				}
+
 				c.runCommand(channel, entrypoint, args)
 
 			case "exec":