X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Factivate%2Factivate.c;h=8c582739976a2e4116b99cb1721c95083575db1c;hp=23c484ca968e96ed42a6af481815f22a68322e43;hb=638ca89c53e2b897cfb3f627f4acbc7d09af2f4c;hpb=892213bf1fd23e48d64a407ece6e10b07bef1926 diff --git a/src/activate/activate.c b/src/activate/activate.c index 23c484ca9..8c5827399 100644 --- a/src/activate/activate.c +++ b/src/activate/activate.c @@ -59,25 +59,6 @@ static int add_epoll(int epoll_fd, int fd) { return 0; } -static int make_socket_fd(const char* address, int flags) { - SocketAddress a; - int fd, r; - - r = socket_address_parse(&a, address); - if (r < 0) { - log_error("Failed to parse socket: %s", strerror(-r)); - return r; - } - - fd = socket_address_listen(&a, flags, SOMAXCONN, SOCKET_ADDRESS_DEFAULT, NULL, false, false, 0755, 0644, NULL); - if (fd < 0) { - log_error("Failed to listen: %s", strerror(-r)); - return fd; - } - - return fd; -} - static int open_sockets(int *epoll_fd, bool accept) { char **address; int n, fd, r; @@ -119,7 +100,7 @@ static int open_sockets(int *epoll_fd, bool accept) { STRV_FOREACH(address, arg_listen) { - fd = make_socket_fd(*address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC)); + fd = make_socket_fd(LOG_DEBUG, *address, SOCK_STREAM | (arg_accept*SOCK_CLOEXEC)); if (fd < 0) { log_open(); log_error("Failed to open '%s': %s", *address, strerror(-fd));