Remove debugging statement.

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index 9f5fc93b1f21745bc3130f6b8c57c4d0b1cc4c03..d334c50c9b3b72d0bf48f5ab65abb522ed1e574d 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -55,7 +55,7 @@
 #define __LOG_FILE "/var/log/messages"
 
 /* Path to the unix socket */
-static char lfile[BUFSIZ] = "";
+static char lfile[BUFSIZ];
 
 static char *logFilePath = __LOG_FILE;
 
@@ -155,8 +155,6 @@ void ipcsyslog_init(void){
                    perror_msg_and_die("semget");
                }else
                        perror_msg_and_die("semget");
-           } else {
-                   sem_up(s_semid);
            }
        }else{
                printf("Buffer already allocated just grab the semaphore?");
@@ -372,7 +370,7 @@ static const int IOV_COUNT = 2;
 
 static void quit_signal(int sig)
 {
-       logMessage(0, "System log daemon exiting.");
+       logMessage(LOG_SYSLOG | LOG_INFO, "System log daemon exiting.");
        unlink(lfile);
 #ifdef BB_FEATURE_IPC_SYSLOG
        ipcsyslog_cleanup();
@@ -389,7 +387,9 @@ static void domark(int sig)
        }
 }
 
-static const int BUFSIZE = 1023;
+/* This must be a #define, since when DODEBUG and BUFFERS_GO_IN_BSS are
+ * enabled, we otherwise get a "storage size isn't constant error. */
+#define BUFSIZE 1023
 static int serveConnection (int conn)
 {
        RESERVE_BB_BUFFER(tmpbuf, BUFSIZE + 1);
@@ -450,11 +450,7 @@ static void init_RemoteLog (void){
     error_msg_and_die("syslogd: cannot create socket");
   }
 
-  hostinfo = (struct hostent *) gethostbyname(RemoteHost);
-
-  if (!hostinfo) {
-    error_msg_and_die("syslogd: cannot resolve remote host name [%s]", RemoteHost);
-  }
+  hostinfo = xgethostbyname(RemoteHost);
 
   remoteaddr.sin_family = AF_INET;
   remoteaddr.sin_addr = *(struct in_addr *) *hostinfo->h_addr_list;
@@ -494,17 +490,14 @@ static void doSyslogd (void)
        alarm (MarkInterval);
 
        /* Create the syslog file so realpath() can work. */
-       close (open (_PATH_LOG, O_RDWR | O_CREAT, 0644));
-       if (realpath (_PATH_LOG, lfile) == NULL)
-               perror_msg_and_die ("Could not resolve path to " _PATH_LOG);
-
-       unlink (lfile);
+       if (realpath (_PATH_LOG, lfile) != NULL)
+               unlink (lfile);
 
        memset (&sunx, 0, sizeof (sunx));
        sunx.sun_family = AF_UNIX;
        strncpy (sunx.sun_path, lfile, sizeof (sunx.sun_path));
        if ((sock_fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
-               perror_msg_and_die ("Couldn't obtain descriptor for socket " _PATH_LOG);
+               perror_msg_and_die ("Couldn't get file descriptor for socket " _PATH_LOG);
 
        addrLength = sizeof (sunx.sun_family) + strlen (sunx.sun_path);
        if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) || (listen (sock_fd, 5)))
@@ -528,7 +521,7 @@ static void doSyslogd (void)
         }
         #endif
 
-       logMessage (0, "syslogd started: " BB_BANNER);
+       logMessage (LOG_SYSLOG | LOG_INFO, "syslogd started: " BB_BANNER);
 
        for (;;) {