colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: make nm_auth_get_caller_uid() error description non-const

Browse Source 
For consistency with the next commit, so we don't need to remember
when to free the description or not.
This commit is contained in:
Dan Williams
2010-11-18 13:47:04 -06:00
parent c3c9d93b1d
commit eccca738aa
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nm-manager-auth.c
View File

@@ -327,7 +327,7 @@ gboolean
nm_auth_get_caller_uid (DBusGMethodInvocation *context,
NMDBusManager *dbus_mgr,
gulong *out_uid,
const char **out_error_desc)
char **out_error_desc)
{
DBusConnection *connection;
char *sender = NULL;
@@ -348,14 +348,14 @@ nm_auth_get_caller_uid (DBusGMethodInvocation *context,
sender = dbus_g_method_get_sender (context);
if (!sender) {
if (out_error_desc)
*out_error_desc = "Could not determine D-Bus requestor";
*out_error_desc = g_strdup ("Could not determine D-Bus requestor");
goto out;
}
connection = nm_dbus_manager_get_dbus_connection (dbus_mgr);
if (!connection) {
if (out_error_desc)
*out_error_desc = "Could not get the D-Bus system bus";
*out_error_desc = g_strdup ("Could not get the D-Bus system bus");
goto out;
}
@@ -364,7 +364,7 @@ nm_auth_get_caller_uid (DBusGMethodInvocation *context,
*out_uid = dbus_bus_get_unix_user (connection, sender, &dbus_error);
if (dbus_error_is_set (&dbus_error)) {
if (out_error_desc)
*out_error_desc = "Could not determine the user ID of the requestor";
*out_error_desc = g_strdup_printf ("Could not determine the user ID of the requestor");
dbus_error_free (&dbus_error);
*out_uid = G_MAXULONG;
} else