From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Mon, 30 Jun 2014 05:11:32 +0000 (-0400)
Subject: Allow addresses to be specified for --listen-... args
X-Git-Tag: v216~589
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=24739b7b757d22a4b629d410a768e4e85fb02282

Allow addresses to be specified for --listen-... args

Hostnames still aren't accepted.
---

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;