X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournal-qrcode.c;h=10a14e4deff10bfde14ad30003dff3b9e2a4e7b1;hp=b4dab8e86a7d01ccc74b3513b7a328cf62371588;hb=5522a1fa876f1ab94a2accaadca824799fdf2cab;hpb=f6a971bc0bf1252e9614919ccca0d53db5fc53d9

diff --git a/src/journal/journal-qrcode.c b/src/journal/journal-qrcode.c
index b4dab8e86..10a14e4de 100644
--- a/src/journal/journal-qrcode.c
+++ b/src/journal/journal-qrcode.c
@@ -46,7 +46,15 @@ static void print_border(FILE *output, unsigned width) {
         }
 }
 
-int print_qr_code(FILE *output, const void *seed, size_t seed_size, uint64_t start, uint64_t interval, const char *hn, sd_id128_t mahcine) {
+int print_qr_code(
+                FILE *output,
+                const void *seed,
+                size_t seed_size,
+                uint64_t start,
+                uint64_t interval,
+                const char *hn,
+                sd_id128_t machine) {
+
         FILE *f;
         char *url = NULL;
         size_t url_size = 0, i;
@@ -68,10 +76,13 @@ int print_qr_code(FILE *output, const void *seed, size_t seed_size, uint64_t sta
                 fprintf(f, "%02x", ((uint8_t*) seed)[i]);
         }
 
-        fprintf(f, "/%llx-%llx\n", (unsigned long long) start, (unsigned long long) interval);
+        fprintf(f, "/%llx-%llx?machine=" SD_ID128_FORMAT_STR,
+                (unsigned long long) start,
+                (unsigned long long) interval,
+                SD_ID128_FORMAT_VAL(machine));
 
         if (hn)
-                fprintf(f, "?hostname=%s", hn);
+                fprintf(f, ";hostname=%s", hn);
 
         if (ferror(f)) {
                 fclose(f);