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

ifcfg-rh: return valid errors to dbus-glib (rh #581794)

Browse Source
This commit is contained in:
Dan Williams
2010-04-22 14:19:50 -07:00
parent eeca251a27
commit 5a9b7b42d1
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
system-settings/plugins/ifcfg-rh/plugin.c
View File

@@ -38,6 +38,7 @@
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
#include <nm-setting-connection.h> #include <nm-setting-connection.h>
#include <nm-settings-interface.h>
#include "common.h" #include "common.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
@@ -535,31 +536,46 @@ impl_ifcfgrh_get_ifcfg_details (SCPluginIfcfg *plugin,
const char *path; const char *path;
if (!g_path_is_absolute (in_ifcfg)) { if (!g_path_is_absolute (in_ifcfg)) {
g_set_error (error, 0, 0, "ifcfg path '%s' is not absolute", in_ifcfg); g_set_error (error,
NM_SETTINGS_INTERFACE_ERROR,
NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION,
"ifcfg path '%s' is not absolute", in_ifcfg);
return FALSE; return FALSE;
} }
connection = g_hash_table_lookup (priv->connections, in_ifcfg); connection = g_hash_table_lookup (priv->connections, in_ifcfg);
if (!connection) { if (!connection) {
g_set_error (error, 0, 0, "ifcfg file '%s' unknown", in_ifcfg); g_set_error (error,
NM_SETTINGS_INTERFACE_ERROR,
NM_SETTINGS_INTERFACE_ERROR_INVALID_CONNECTION,
"ifcfg file '%s' unknown", in_ifcfg);
return FALSE; return FALSE;
} }
s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION); s_con = (NMSettingConnection *) nm_connection_get_setting (NM_CONNECTION (connection), NM_TYPE_SETTING_CONNECTION);
if (!s_con) { if (!s_con) {
g_set_error_literal (error, 0, 0, "unable to retrieve the connection setting"); g_set_error (error,
NM_SETTINGS_INTERFACE_ERROR,
NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
"unable to retrieve the connection setting");
return FALSE; return FALSE;
} }
uuid = nm_setting_connection_get_uuid (s_con); uuid = nm_setting_connection_get_uuid (s_con);
if (!uuid) { if (!uuid) {
g_set_error_literal (error, 0, 0, "unable to get the UUID"); g_set_error (error,
NM_SETTINGS_INTERFACE_ERROR,
NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
"unable to get the UUID");
return FALSE; return FALSE;
} }
path = nm_connection_get_path (NM_CONNECTION (connection)); path = nm_connection_get_path (NM_CONNECTION (connection));
if (!path) { if (!path) {
g_set_error_literal (error, 0, 0, "unable to get the connection D-Bus path"); g_set_error (error,
NM_SETTINGS_INTERFACE_ERROR,
NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
"unable to get the connection D-Bus path");
return FALSE; return FALSE;
} }