From 24739b7b757d22a4b629d410a768e4e85fb02282 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Jun 2014 01:11:32 -0400 Subject: [PATCH] Allow addresses to be specified for --listen-... args Hostnames still aren't accepted. --- src/journal-remote/journal-remote.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 5b991e9a3..22f067aa1 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -698,10 +698,7 @@ static int fd_fd(const char *spec) { if (r < 0) return r; - if (fd >= 0) - return -ENOENT; - - return -fd; + return -1; } @@ -1118,14 +1115,8 @@ static int parse_argv(int argc, char *argv[]) { r = fd_fd(optarg); if (r >= 0) http_socket = r; - else if (r == -ENOENT) + else arg_listen_http = optarg; - else { - log_error("Invalid port/fd specification %s: %s", - optarg, strerror(-r)); - return -EINVAL; - } - break; case ARG_LISTEN_HTTPS: @@ -1137,13 +1128,8 @@ static int parse_argv(int argc, char *argv[]) { r = fd_fd(optarg); if (r >= 0) https_socket = r; - else if (r == -ENOENT) + else arg_listen_https = optarg; - else { - log_error("Invalid port/fd specification %s: %s", - optarg, strerror(-r)); - return -EINVAL; - } break; -- 2.30.2