@@ -1230,32 +1230,30 @@ config NSH_LOGIN
12301230config NSH_CONSOLE_LOGIN
12311231 bool "Console Login"
12321232 default n
1233+ depends on FSUTILS_PASSWD
12331234 select NSH_LOGIN
12341235 ---help---
12351236 If defined, then the console user will be required to provide a
1236- username and password to start the NSH shell.
1237+ username and password to start the NSH shell. Requires
1238+ CONFIG_FSUTILS_PASSWD so credentials are verified against the
1239+ encrypted password file (for example ROMFS /etc/passwd).
12371240
12381241config NSH_TELNET_LOGIN
12391242 bool "Telnet Login"
12401243 default n
1241- depends on NSH_TELNET
1244+ depends on NSH_TELNET && FSUTILS_PASSWD
12421245 select NSH_LOGIN
12431246 ---help---
12441247 If defined, then the Telnet user will be required to provide a
1245- username and password to start the NSH shell.
1248+ username and password to start the NSH shell. Requires
1249+ CONFIG_FSUTILS_PASSWD so credentials are verified against the
1250+ encrypted password file (for example ROMFS /etc/passwd).
12461251
12471252if NSH_LOGIN
12481253
12491254choice
12501255 prompt "Verification method"
1251- default NSH_LOGIN_PASSWD if FSUTILS_PASSWD
1252- default NSH_LOGIN_FIXED if !FSUTILS_PASSWD
1253-
1254- config NSH_LOGIN_FIXED
1255- bool "Fixed username/password"
1256- ---help---
1257- Verify user credentials by matching to fixed username and password
1258- strings
1256+ default NSH_LOGIN_PASSWD
12591257
12601258config NSH_LOGIN_PLATFORM
12611259 bool "Platform username/password"
@@ -1292,16 +1290,6 @@ config NSH_LOGIN_USERNAME
12921290 ---help---
12931291 Login user name. Default: "root"
12941292
1295- config NSH_LOGIN_PASSWORD
1296- string "Login password"
1297- depends on NSH_LOGIN_FIXED
1298- ---help---
1299- The plaintext login password used when fixed username/password
1300- verification is selected (CONFIG_NSH_LOGIN_FIXED). There is no
1301- default; set CONFIG_NSH_LOGIN_PASSWORD in the board defconfig,
1302- via menuconfig, or enter it when prompted during an interactive
1303- build.
1304-
13051293config NSH_LOGIN_FAILDELAY
13061294 int "Login failure delay"
13071295 default 0
0 commit comments