From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 11 Aug 2014 16:24:43 +0000 (+0200)
Subject: journal-remote: fix parsing of fd command line argument
X-Git-Tag: v216~206
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d7bf74d9cccdc6ffa567ea0e08f814863610f88e;p=elogind.git

journal-remote: fix parsing of fd command line argument
---

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index c8e3c235a..36c8e00e6 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -795,11 +795,12 @@ static int fd_fd(const char *spec) {
         r = safe_atoi(spec, &fd);
         if (r < 0)
                 return r;
+        if (fd < 0)
+                return -EINVAL;
 
-        return -1;
+        return fd;
 }
 
-
 static int remoteserver_init(RemoteServer *s,
                              const char* key,
                              const char* cert,
@@ -809,7 +810,6 @@ static int remoteserver_init(RemoteServer *s,
 
         assert(s);
 
-
         if ((arg_listen_raw || arg_listen_http) && trust) {
                 log_error("Option --trust makes all non-HTTPS connections untrusted.");
                 return -EINVAL;