luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-24 13:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

_g_dbus_get_machine_id(): check /etc/machine-id too

Browse Source 
machine-id can be in /etc or in /var/lib/dbus.

[amended with slightly revised error handling -smcv]

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=663928
This commit is contained in:
Alexandre Rostovtsev 2011-11-16 15:05:46 +00:00 committed by Matthias Clasen
parent 8d9f600aea
commit dc89b51c2d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/gdbusprivate.c
View File

@ -1983,17 +1983,26 @@ gchar *
_g_dbus_get_machine_id (GError **error) _g_dbus_get_machine_id (GError **error)
{ {
gchar *ret; gchar *ret;
GError *first_error;
/* TODO: use PACKAGE_LOCALSTATEDIR ? */ /* TODO: use PACKAGE_LOCALSTATEDIR ? */
ret = NULL; ret = NULL;
first_error = NULL;
if (!g_file_get_contents ("/var/lib/dbus/machine-id", if (!g_file_get_contents ("/var/lib/dbus/machine-id",
&ret, &ret,
NULL, NULL,
error)) &first_error) &&
!g_file_get_contents ("/etc/machine-id",
&ret,
NULL,
NULL))
{ {
g_prefix_error (error, _("Unable to load /var/lib/dbus/machine-id: ")); g_propagate_prefixed_error (error, first_error,
_("Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "));
} }
else else
{ {
/* ignore the error from the first try, if any */
g_clear_error (&first_error);
/* TODO: validate value */ /* TODO: validate value */
g_strstrip (ret); g_strstrip (ret);
} }