Do not override StructuredData=

In case StructuredData= is set, actually use it and do not override it
with the SYSLOG_STRUCTURED_DATA= parsed data.

Fixes: 205dbe6 ("Actually respect UseSysLogStructuredData= and UseSysLogMsgId= settings")

Author: cgzones

src/netlog/netlog-manager.c

@@ -198,7 +198,7 @@ static int manager_read_journal_input(Manager *m) {
                                        message, hostname,
                                        pid,
                                        r >= 0 ? &tv : NULL,
-                                       m->structured_data ? structured_data : NULL,
+                                       structured_data,
                                        m->syslog_msgid ? msgid : NULL);
 }
 

src/netlog/netlog-protocol.c

@@ -150,7 +150,7 @@ int format_rfc5424(Manager *m,
         /* Eighth: [structured-data] */
         if (m->structured_data)
                 IOVEC_SET_STRING(iov[n++], m->structured_data);
-        else if (syslog_structured_data)
+        else if (m->syslog_structured_data && syslog_structured_data)
                 IOVEC_SET_STRING(iov[n++], syslog_structured_data);
         else
                 IOVEC_SET_STRING(iov[n++], RFC_5424_NILVALUE);