projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute "safe applets" exev if not standalone shell
[oweals/busybox.git]
/
sysklogd
/
syslogd.c
diff --git
a/sysklogd/syslogd.c
b/sysklogd/syslogd.c
index 3b511490f21ec223368fc7bd4edaa20c12c0dcbc..aa7d516d6ed63c37914c9697c661a068cd939607 100644
(file)
--- a/
sysklogd/syslogd.c
+++ b/
sysklogd/syslogd.c
@@
-262,8
+262,6
@@
static void log_to_shmem(const char *msg, int len)
void ipcsyslog_cleanup(void);
void ipcsyslog_init(void);
void log_to_shmem(const char *msg);
void ipcsyslog_cleanup(void);
void ipcsyslog_init(void);
void log_to_shmem(const char *msg);
-
-
#endif /* FEATURE_IPC_SYSLOG */
#endif /* FEATURE_IPC_SYSLOG */
@@
-271,7
+269,6
@@
void log_to_shmem(const char *msg);
static void log_locally(char *msg)
{
static time_t last;
static void log_locally(char *msg)
{
static time_t last;
-
struct flock fl;
int len = strlen(msg);
struct flock fl;
int len = strlen(msg);
@@
-447,8
+444,8
@@
static void split_escape_and_log(char *tmpbuf, int len)
static void quit_signal(int sig)
{
static void quit_signal(int sig)
{
- timestamp_and_log(LOG_SYSLOG | LOG_INFO, "
System log daemon
exiting", 0);
- puts("
System log daemon
exiting");
+ timestamp_and_log(LOG_SYSLOG | LOG_INFO, "
syslogd
exiting", 0);
+ puts("
syslogd
exiting");
unlink(dev_log_name);
if (ENABLE_FEATURE_IPC_SYSLOG)
ipcsyslog_cleanup();
unlink(dev_log_name);
if (ENABLE_FEATURE_IPC_SYSLOG)
ipcsyslog_cleanup();
@@
-574,10
+571,9
@@
int syslogd_main(int argc, char **argv)
*p++ = '\0';
port = xatou16(p);
}
*p++ = '\0';
port = xatou16(p);
}
- remoteAddr.sin_family = AF_INET;
/* FIXME: looks ip4-specific. need to do better */
/* FIXME: looks ip4-specific. need to do better */
-
remoteAddr.sin_addr = *(struct in_addr *) *(xgethostbyname(opt_R)->h_addr_list
);
- remoteAddr.sin_port =
htons(
port);
+
bb_lookup_host(&remoteAddr, opt_R
);
+ remoteAddr.sin_port =
bb_lookup_port(port, "udp",
port);
}
//if (option_mask32 & OPT_locallog) // -L
#endif
}
//if (option_mask32 & OPT_locallog) // -L
#endif