chiark / gitweb /
journal-remote: fix parsing of fd command line argument
authorLennart Poettering <lennart@poettering.net>
Mon, 11 Aug 2014 16:24:43 +0000 (18:24 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 11 Aug 2014 16:24:43 +0000 (18:24 +0200)
src/journal-remote/journal-remote.c

index c8e3c23..36c8e00 100644 (file)
@@ -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;