Merge pull request #23 from alfrunes/master

Inform session if terminal feature is enabled
mendersoftware · Mar 17, 2021 · 3da9357 · 3da9357
2 parents 3080fd1 + 86ea2cf
commit 3da9357
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/app/daemon.go b/app/daemon.go
@@ -92,6 +92,11 @@ func NewDaemon(conf *config.MenderShellConfig) *MenderShellDaemon {
 
 	// Setup ProtoMsg routes.
 	routes := make(session.ProtoRoutes)
+	if !conf.Terminal.Disable {
+		// Shell message is not handled by the Session, but the map
+		// entry must be set to give the correct 'accept' response.
+		routes[ws.ProtoTypeShell] = nil
+	}
 	if !conf.FileTransfer.Disable {
 		routes[ws.ProtoTypeFileTransfer] = session.FileTransfer()
 	}