You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/08/09 15:17:34 UTC
[incubator-nuttx-apps] 04/04: system:nsh : Apply CONFIG_NSH_DISABLE_TELNETSTART to nsh_main.c
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
commit 41fe4f177ab49e81c8c8088b787f1ead1dc465c1
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Mon Aug 8 10:26:19 2022 +0900
system:nsh : Apply CONFIG_NSH_DISABLE_TELNETSTART to nsh_main.c
Summary:
- This commit applies CONFIG_NSH_DISABLE_TELNETSTART to nsh_main.c
Impact:
- None
Testing:
- Tested with sabre-6quad:netknsh (will be updated later)
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
system/nsh/nsh_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c
index 87fa48a08..5db22980f 100644
--- a/system/nsh/nsh_main.c
+++ b/system/nsh/nsh_main.c
@@ -127,7 +127,8 @@ int main(int argc, FAR char *argv[])
nsh_initialize();
-#if defined(CONFIG_NSH_TELNET) && !defined(CONFIG_NETINIT_NETLOCAL)
+#if defined(CONFIG_NSH_TELNET) && !defined(CONFIG_NSH_DISABLE_TELNETSTART) && \
+ !defined(CONFIG_NETINIT_NETLOCAL)
/* If the Telnet console is selected as a front-end, then start the
* Telnet daemon UNLESS network initialization is deferred via
* CONFIG_NETINIT_NETLOCAL. In that case, the telnet daemon must be