diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-10-31 17:13:47 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-10-31 17:13:47 +0000 |
| commit | 4432dbba6559d3d88e18ecf2c33d9e5a39e82074 (patch) | |
| tree | f6db886523a04e0b45926336223ff8c32761dc43 /sysklogd/syslogd.c | |
| parent | bc09f29f78547856e2152dc47051aeed548f28e8 (diff) | |
| parent | 6bd3fff51aa74e2ee2d87887b12182a3b09792ef (diff) | |
| download | busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.gz busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.tar.bz2 busybox-w32-4432dbba6559d3d88e18ecf2c33d9e5a39e82074.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'sysklogd/syslogd.c')
| -rw-r--r-- | sysklogd/syslogd.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 288b29cf7..0ea557a6c 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
| @@ -936,11 +936,6 @@ static NOINLINE int create_socket(void) | |||
| 936 | int sock_fd; | 936 | int sock_fd; |
| 937 | char *dev_log_name; | 937 | char *dev_log_name; |
| 938 | 938 | ||
| 939 | #if ENABLE_FEATURE_SYSTEMD | ||
| 940 | if (sd_listen_fds() == 1) | ||
| 941 | return SD_LISTEN_FDS_START; | ||
| 942 | #endif | ||
| 943 | |||
| 944 | memset(&sunx, 0, sizeof(sunx)); | 939 | memset(&sunx, 0, sizeof(sunx)); |
| 945 | sunx.sun_family = AF_UNIX; | 940 | sunx.sun_family = AF_UNIX; |
| 946 | 941 | ||