[git commit] telnet: "-a" + "-l USER" should respect USER

Denys Vlasenko vda.linux at googlemail.com
Thu Aug 17 11:37:51 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=fb8348b36457e5287646e11c1ec45365c112fd3c
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 networking/telnet.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/networking/telnet.c b/networking/telnet.c
index e1c2595..1f8a444 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -44,7 +44,7 @@
 //config:	Setting this option will forward the USER environment variable to the
 //config:	remote host you are connecting to. This is useful when you need to
 //config:	log into a machine without telling the username (autologin). This
-//config:	option enables '-a' and '-l USER' arguments.
+//config:	option enables '-a' and '-l USER' options.
 //config:
 //config:config FEATURE_TELNET_WIDTH
 //config:	bool "Enable window size autodetection"
@@ -643,8 +643,10 @@ int telnet_main(int argc UNUSED_PARAM, char **argv)
 	}
 
 #if ENABLE_FEATURE_TELNET_AUTOLOGIN
-	if (1 & getopt32(argv, "al:", &G.autologin))
+	if (1 == getopt32(argv, "al:", &G.autologin)) {
+		/* Only -a without -l USER picks $USER from envvar */
 		G.autologin = getenv("USER");
+	}
 	argv += optind;
 #else
 	argv++;


More information about the busybox-cvs mailing list