From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 24 Jan 2016 06:49:04 +0000 (+0900)
Subject: journal-remote: output file name is determined by the remote hostname
X-Git-Tag: v229~94^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d10accb0b1af1950882fd91f19dc7df4b0e11aa6;p=thirdparty%2Fsystemd.git

journal-remote: output file name is determined by the remote hostname

When --url option is specified, e.g. --url='http://some.host:19531/entries'
retrieved remote journal entries will be stored to
/var/log/journal/remote/remote-some.host.journal
---

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index fa0cc99b89e..68237be643b 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -898,7 +898,8 @@ static int remoteserver_init(RemoteServer *s,
         }
 
         if (arg_url) {
-                const char *url, *hostname;
+                const char *url;
+                char *hostname, *p;
 
                 if (!strstr(arg_url, "/entries")) {
                         if (endswith(arg_url, "/"))
@@ -924,7 +925,15 @@ static int remoteserver_init(RemoteServer *s,
                         startswith(arg_url, "http://") ?:
                         arg_url;
 
-                r = add_source(s, fd, (char*) hostname, false);
+                hostname = strdupa(hostname);
+                if (!hostname)
+                        return log_oom();
+                if ((p = strchr(hostname, '/')))
+                        *p = '\0';
+                if ((p = strchr(hostname, ':')))
+                        *p = '\0';
+
+                r = add_source(s, fd, hostname, false);
                 if (r < 0)
                         return r;
         }