In Bug 78, shortkey points out:

[oweals/busybox.git] / networking / telnetd.c

diff --git a/networking/telnetd.c b/networking/telnetd.c
index efb2988b30b8978c4a17b07413073f2057e7790e..491c66fd151abc186acf5a3966da4d5b0b348d24 100644 (file)
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -1,4 +1,4 @@
-/* $Id: telnetd.c,v 1.11 2004/03/15 08:28:53 andersen Exp $
+/* $Id: telnetd.c,v 1.13 2004/09/14 17:24:58 bug1 Exp $
  *
  * Simple telnet server
  * Bjorn Wesen, Axis Communications AB (bjornw@axis.com)
@@ -49,11 +49,10 @@
 
 #define BUFSIZE 4000
 
-static const char *loginpath
 #ifdef CONFIG_LOGIN
- = "/bin/login";
+static const char *loginpath = "/bin/login";
 #else
-;
+static const char *loginpath;
 #endif
 static const char *issuefile = "/etc/issue.net";
 
@@ -269,7 +268,7 @@ make_new_session(int sockfd)
        pty = getpty(tty_name);
 
        if (pty < 0) {
-               syslog_msg(LOG_USER, LOG_ERR, "All network ports in use!");
+               syslog(LOG_ERR, "All network ports in use!");
                return 0;
        }
 
@@ -292,7 +291,7 @@ make_new_session(int sockfd)
 
 
        if ((pid = fork()) < 0) {
-               syslog_msg(LOG_USER, LOG_ERR, "Can`t forking");
+               syslog(LOG_ERR, "Can`t forking");
        }
        if (pid == 0) {
                /* In child, open the child's side of the tty.  */
@@ -304,7 +303,7 @@ make_new_session(int sockfd)
                setsid();
 
                if (open(tty_name, O_RDWR /*| O_NOCTTY*/) < 0) {
-                       syslog_msg(LOG_USER, LOG_ERR, "Could not open tty");
+                       syslog(LOG_ERR, "Could not open tty");
                        exit(1);
                        }
                dup(0);
@@ -330,7 +329,7 @@ make_new_session(int sockfd)
                execv(loginpath, (char *const *)argv_init);
 
                /* NOT REACHED */
-               syslog_msg(LOG_USER, LOG_ERR, "execv error");
+               syslog(LOG_ERR, "execv error");
                exit(1);
        }
 
@@ -401,10 +400,10 @@ telnetd_main(int argc, char **argv)
                if (c == EOF) break;
                switch (c) {
                        case 'f':
-                               issuefile = strdup (optarg);
+                               issuefile = optarg;
                                break;
                        case 'l':
-                               loginpath = strdup (optarg);
+                               loginpath = optarg;
                                break;
 #ifndef CONFIG_FEATURE_TELNETD_INETD
                        case 'p':
@@ -422,6 +421,8 @@ telnetd_main(int argc, char **argv)
 
        argv_init[0] = loginpath;
 
+       openlog(bb_applet_name, 0, LOG_USER);
+
 #ifdef CONFIG_FEATURE_TELNETD_INETD
        maxfd = 1;
        sessions = make_new_session();