telnetd: do not send stray \r\n before /etc/issue.net

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/libbb/login.c b/libbb/login.c
index af860c277..ca0da70b4 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -28,8 +28,6 @@ void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
         time(&t);
         uname(&uts);
 
-        puts("\r");  /* start a new line */
-
         fp = fopen_for_read(issue_file);
         if (!fp)
                 return;
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 67a08f487..232fa2b84 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -471,8 +471,10 @@ static char *get_logname(void)
         do {
                 /* Write issue file and prompt */
 #ifdef ISSUE
-                if (!(option_mask32 & F_NOISSUE))
+                if (!(option_mask32 & F_NOISSUE)) {
+                        puts("\r");  /* start a new line */
                         print_login_issue(G.issue, G.tty_name);
+                }
 #endif
                 print_login_prompt();