From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 1 Oct 2015 12:05:02 +0000 (+0100)
Subject: Replace build-time prefix with installation prefix when including config files
X-Git-Tag: dbus-1.11.0~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b8f844e10eae8d50c32ce800d8ce6735195162e;p=thirdparty%2Fdbus.git

Replace build-time prefix with installation prefix when including config files

This was already done for the contents of .service files, but not
config files.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92028
Tested-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/bus/config-parser.c b/bus/config-parser.c
index 3cd17cc75..a0fc47c0b 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -2122,7 +2122,8 @@ make_full_path (const DBusString *basedir,
 {
   if (_dbus_path_is_absolute (filename))
     {
-      return _dbus_string_copy (filename, 0, full_path, 0);
+      if (!_dbus_string_copy (filename, 0, full_path, 0))
+        return FALSE;
     }
   else
     {
@@ -2131,9 +2132,12 @@ make_full_path (const DBusString *basedir,
       
       if (!_dbus_concat_dir_and_file (full_path, filename))
         return FALSE;
-
-      return TRUE;
     }
+
+  if (!_dbus_replace_install_prefix (full_path))
+    return FALSE;
+
+  return TRUE;
 }
 
 static dbus_bool_t