summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/journal-remote/journal-remote.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 5b991e9a36..22f067aa1a 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;