From: Simon McVittie <smcv@collabora.com>
Date: Tue, 16 Jan 2018 13:15:34 +0000 (+0000)
Subject: _dbus_credentials_to_string_append: Remove useless join = FALSE
X-Git-Tag: dbus-1.13.4~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de5979188296fa087a12948a89bccd982d0ccbb0;p=thirdparty%2Fdbus.git

_dbus_credentials_to_string_append: Remove useless join = FALSE

It can't actually matter in practice, because we never know the
Unix uid and Unix groups but not pid, and we never have a Windows SID
and also a Linux security label; but resetting join to FALSE can only
ever result in us outputting something like "foo=123bar=456" instead
of the intended form with a space in the middle.

Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103737
---

diff --git a/dbus/dbus-credentials.c b/dbus/dbus-credentials.c
index 63c4b90fd..927f79d5f 100644
--- a/dbus/dbus-credentials.c
+++ b/dbus/dbus-credentials.c
@@ -681,8 +681,6 @@ _dbus_credentials_to_string_append (DBusCredentials    *credentials,
         goto oom;
       join = TRUE;
     }
-  else
-    join = FALSE;
 
   if (credentials->unix_gids != NULL)
     {
@@ -705,8 +703,6 @@ _dbus_credentials_to_string_append (DBusCredentials    *credentials,
         goto oom;
       join = TRUE;
     }
-  else
-    join = FALSE;
 
   if (credentials->linux_security_label != NULL)
     {