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

libnm-util: make property verification errors more descriptive

Browse Source 
- fix g_set_error()/g_set_error_literal() usage
- make the error messages translatable
- use g_prefix_error() to prepend property name
This commit is contained in:
Jiří Klimeš
2013-02-07 14:49:53 +01:00
parent cc66b547cf
commit df142a5dc4
22 changed files with 756 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

229
libnm-util/nm-setting-8021x.c
View File

@@ -19,12 +19,14 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2012 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-8021x.h" #include "nm-setting-8021x.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -2111,31 +2113,35 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
if (phase2) { if (phase2) {
if (!priv->phase2_client_cert) { if (!priv->phase2_client_cert) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_PHASE2_CLIENT_CERT); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT);
return FALSE; return FALSE;
} else if (!priv->phase2_client_cert->len) { } else if (!priv->phase2_client_cert->len) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_CLIENT_CERT); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT);
return FALSE; return FALSE;
} }
/* Private key is required for TLS */ /* Private key is required for TLS */
if (!priv->phase2_private_key) { if (!priv->phase2_private_key) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_PRIVATE_KEY);
return FALSE; return FALSE;
} else if (!priv->phase2_private_key->len) { } else if (!priv->phase2_private_key->len) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_PRIVATE_KEY);
return FALSE; return FALSE;
} }
@@ -2145,7 +2151,9 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_CLIENT_CERT); _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT);
return FALSE; return FALSE;
} }
@@ -2155,37 +2163,43 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_CLIENT_CERT); _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PHASE2_PRIVATE_KEY);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_CLIENT_CERT);
return FALSE; return FALSE;
} }
} }
} else { } else {
if (!priv->client_cert) { if (!priv->client_cert) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_CLIENT_CERT); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT);
return FALSE; return FALSE;
} else if (!priv->client_cert->len) { } else if (!priv->client_cert->len) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_CLIENT_CERT); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT);
return FALSE; return FALSE;
} }
/* Private key is required for TLS */ /* Private key is required for TLS */
if (!priv->private_key) { if (!priv->private_key) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_PRIVATE_KEY); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PRIVATE_KEY);
return FALSE; return FALSE;
} else if (!priv->private_key->len) { } else if (!priv->private_key->len) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PRIVATE_KEY); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PRIVATE_KEY);
return FALSE; return FALSE;
} }
@@ -2195,7 +2209,9 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_CLIENT_CERT); _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PRIVATE_KEY);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT);
return FALSE; return FALSE;
} }
@@ -2205,7 +2221,9 @@ verify_tls (NMSetting8021x *self, gboolean phase2, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_CLIENT_CERT); _("has to match '%s' property for PKCS#12"),
NM_SETTING_802_1X_PRIVATE_KEY);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_CLIENT_CERT);
return FALSE; return FALSE;
} }
} }
@@ -2222,25 +2240,29 @@ verify_ttls (NMSetting8021x *self, gboolean phase2, GError **error)
if ( (!priv->identity || !strlen (priv->identity)) if ( (!priv->identity || !strlen (priv->identity))
&& (!priv->anonymous_identity || !strlen (priv->anonymous_identity))) { && (!priv->anonymous_identity || !strlen (priv->anonymous_identity))) {
if (!priv->identity) { if (!priv->identity) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_IDENTITY); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY);
} else if (!strlen (priv->identity)) { } else if (!strlen (priv->identity)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_IDENTITY); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY);
} else if (!priv->anonymous_identity) { } else if (!priv->anonymous_identity) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_ANONYMOUS_IDENTITY); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_ANONYMOUS_IDENTITY);
} else { } else {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_ANONYMOUS_IDENTITY); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_ANONYMOUS_IDENTITY);
} }
return FALSE; return FALSE;
} }
@@ -2248,25 +2270,29 @@ verify_ttls (NMSetting8021x *self, gboolean phase2, GError **error)
if ( (!priv->phase2_auth || !strlen (priv->phase2_auth)) if ( (!priv->phase2_auth || !strlen (priv->phase2_auth))
&& (!priv->phase2_autheap || !strlen (priv->phase2_autheap))) { && (!priv->phase2_autheap || !strlen (priv->phase2_autheap))) {
if (!priv->phase2_auth) { if (!priv->phase2_auth) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_PHASE2_AUTH); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTH);
} else if (!strlen (priv->phase2_auth)) { } else if (!strlen (priv->phase2_auth)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_AUTH); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTH);
} else if (!priv->phase2_autheap) { } else if (!priv->phase2_autheap) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_PHASE2_AUTHEAP); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTHEAP);
} else { } else {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_AUTHEAP); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTHEAP);
} }
return FALSE; return FALSE;
} }
@@ -2280,15 +2306,17 @@ verify_identity (NMSetting8021x *self, gboolean phase2, GError **error)
NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self); NMSetting8021xPrivate *priv = NM_SETTING_802_1X_GET_PRIVATE (self);
if (!priv->identity) { if (!priv->identity) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_IDENTITY); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY);
} else if (!strlen (priv->identity)) { } else if (!strlen (priv->identity)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_IDENTITY); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_IDENTITY);
} }
return TRUE; return TRUE;
@@ -2428,10 +2456,11 @@ verify_cert (GByteArray *array, const char *prop_name, GError **error)
break; break;
} }
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
"%s", prop_name); _("property is invalid"));
g_prefix_error (error, "%s: ", prop_name);
return FALSE; return FALSE;
} }
@@ -2452,18 +2481,20 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_return_val_if_fail (*error == NULL, FALSE); g_return_val_if_fail (*error == NULL, FALSE);
if (!priv->eap) { if (!priv->eap) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_MISSING_PROPERTY, NM_SETTING_802_1X_ERROR_MISSING_PROPERTY,
NM_SETTING_802_1X_EAP); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_EAP);
return FALSE; return FALSE;
} }
if (!_nm_utils_string_slist_validate (priv->eap, valid_eap)) { if (!_nm_utils_string_slist_validate (priv->eap, valid_eap)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_EAP); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_EAP);
return FALSE; return FALSE;
} }
@@ -2487,7 +2518,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE1_PEAPVER); _("'%s' is not a valid value for the property"),
priv->phase1_peapver);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE1_PEAPVER);
return FALSE; return FALSE;
} }
@@ -2495,7 +2528,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE1_PEAPLABEL); _("'%s' is not a valid value for the property"),
priv->phase1_peaplabel);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE1_PEAPLABEL);
return FALSE; return FALSE;
} }
@@ -2503,7 +2538,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING); _("'%s' is not a valid value for the property"),
priv->phase1_fast_provisioning);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING);
return FALSE; return FALSE;
} }
@@ -2511,7 +2548,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_AUTH); _("'%s' is not a valid value for the property"),
priv->phase2_auth);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTH);
return FALSE; return FALSE;
} }
@@ -2519,7 +2558,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_802_1X_ERROR, NM_SETTING_802_1X_ERROR,
NM_SETTING_802_1X_ERROR_INVALID_PROPERTY, NM_SETTING_802_1X_ERROR_INVALID_PROPERTY,
NM_SETTING_802_1X_PHASE2_AUTHEAP); _("'%s' is not a valid value for the property"),
priv->phase2_autheap);
g_prefix_error (error, "%s: ", NM_SETTING_802_1X_PHASE2_AUTHEAP);
return FALSE; return FALSE;
} }

45
libnm-util/nm-setting-adsl.c
View File

@@ -20,14 +20,16 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2008 Red Hat, Inc. * (C) Copyright 2011 - 2013 Red Hat, Inc.
*/ */
#include <string.h>
#include <glib/gi18n.h>
#include "nm-setting-adsl.h" #include "nm-setting-adsl.h"
#include "nm-setting-ppp.h" #include "nm-setting-ppp.h"
#include "nm-setting-private.h" #include "nm-setting-private.h"
#include "nm-utils.h" #include "nm-utils.h"
#include <string.h>
/** /**
* SECTION:nm-setting-adsl * SECTION:nm-setting-adsl
@@ -204,34 +206,39 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (setting); NMSettingAdslPrivate *priv = NM_SETTING_ADSL_GET_PRIVATE (setting);
if (!priv->username) { if (!priv->username) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_MISSING_PROPERTY, NM_SETTING_ADSL_ERROR_MISSING_PROPERTY,
NM_SETTING_ADSL_USERNAME); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_ADSL_USERNAME);
return FALSE; return FALSE;
} else if (!strlen (priv->username)) { } else if (!strlen (priv->username)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
NM_SETTING_ADSL_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_ADSL_USERNAME);
return FALSE; return FALSE;
} }
if (priv->password && !strlen (priv->password)) { if (priv->password && !strlen (priv->password)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
NM_SETTING_ADSL_PASSWORD); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_ADSL_PASSWORD);
return FALSE; return FALSE;
} }
if (strcmp (priv->protocol, NM_SETTING_ADSL_PROTOCOL_PPPOA) && if (strcmp (priv->protocol, NM_SETTING_ADSL_PROTOCOL_PPPOA) &&
strcmp (priv->protocol, NM_SETTING_ADSL_PROTOCOL_PPPOE) && strcmp (priv->protocol, NM_SETTING_ADSL_PROTOCOL_PPPOE) &&
strcmp (priv->protocol, NM_SETTING_ADSL_PROTOCOL_IPOATM)) { strcmp (priv->protocol, NM_SETTING_ADSL_PROTOCOL_IPOATM)) {
g_set_error (error, g_set_error (error,
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
NM_SETTING_ADSL_PROTOCOL); _("'%s' is not a valid value for the property"),
priv->protocol);
g_prefix_error (error, "%s: ", NM_SETTING_ADSL_PROTOCOL);
return FALSE; return FALSE;
} }
@@ -240,7 +247,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_ADSL_ERROR, NM_SETTING_ADSL_ERROR,
NM_SETTING_ADSL_ERROR_INVALID_PROPERTY, NM_SETTING_ADSL_ERROR_INVALID_PROPERTY,
NM_SETTING_ADSL_ENCAPSULATION); _("'%s' is not a valid value for the property"),
priv->encapsulation);
g_prefix_error (error, "%s: ", NM_SETTING_ADSL_ENCAPSULATION);
return FALSE; return FALSE;
} }

38
libnm-util/nm-setting-bluetooth.c
View File

@@ -20,12 +20,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2009 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <glib/gi18n.h>
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
@@ -146,33 +147,38 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingBluetoothPrivate *priv = NM_SETTING_BLUETOOTH_GET_PRIVATE (setting); NMSettingBluetoothPrivate *priv = NM_SETTING_BLUETOOTH_GET_PRIVATE (setting);
if (!priv->bdaddr) { if (!priv->bdaddr) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
NM_SETTING_BLUETOOTH_BDADDR); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_BDADDR);
return FALSE; return FALSE;
} }
if (priv->bdaddr && priv->bdaddr->len != ETH_ALEN) { if (priv->bdaddr && priv->bdaddr->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
NM_SETTING_BLUETOOTH_BDADDR); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_BDADDR);
return FALSE; return FALSE;
} }
if (!priv->type) { if (!priv->type) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_MISSING_PROPERTY,
NM_SETTING_BLUETOOTH_TYPE); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_TYPE);
return FALSE; return FALSE;
} else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) && } else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) &&
!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) {
g_set_error (error, g_set_error (error,
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,
NM_SETTING_BLUETOOTH_TYPE); _("'%s' is not a valid value for the property"),
priv->type);
g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_TYPE);
return FALSE; return FALSE;
} }
@@ -192,7 +198,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND, NM_SETTING_BLUETOOTH_ERROR_TYPE_SETTING_NOT_FOUND,
NM_SETTING_BLUETOOTH_TYPE); _("requires '%s' or '%s' setting"),
NM_SETTING_GSM_SETTING_NAME, NM_SETTING_CDMA_SETTING_NAME);
g_prefix_error (error, "%s: ", NM_SETTING_BLUETOOTH_TYPE);
return FALSE; return FALSE;
} }
} }

71
libnm-util/nm-setting-bond.c
View File

@@ -18,12 +18,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2011 - 2012 Red Hat, Inc. * (C) Copyright 2011 - 2013 Red Hat, Inc.
*/ */
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-bond.h" #include "nm-setting-bond.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -361,18 +362,20 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
const char *arp_ip_target = NULL; const char *arp_ip_target = NULL;
if (!priv->interface_name || !strlen(priv->interface_name)) { if (!priv->interface_name || !strlen(priv->interface_name)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_MISSING_PROPERTY, NM_SETTING_BOND_ERROR_MISSING_PROPERTY,
NM_SETTING_BOND_INTERFACE_NAME); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_BOND_INTERFACE_NAME);
return FALSE; return FALSE;
} }
if (!nm_utils_iface_valid_name (priv->interface_name)) { if (!nm_utils_iface_valid_name (priv->interface_name)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_PROPERTY, NM_SETTING_BOND_ERROR_INVALID_PROPERTY,
NM_SETTING_BOND_INTERFACE_NAME); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_BOND_INTERFACE_NAME);
return FALSE; return FALSE;
} }
@@ -382,10 +385,12 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
|| !value[0] || !value[0]
|| (strlen (value) > 200) || (strlen (value) > 200)
|| strchr (value, ' ')) { || strchr (value, ' ')) {
g_set_error_literal (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
key); _("invalid option '%s' or its value '%s'"),
key, value);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
} }
@@ -402,7 +407,10 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("only one of '%s' and '%s' can be set"),
NM_SETTING_BOND_OPTION_MIIMON,
NM_SETTING_BOND_OPTION_ARP_INTERVAL); NM_SETTING_BOND_OPTION_ARP_INTERVAL);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
} }
value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_MODE); value = g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_MODE);
@@ -410,14 +418,18 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_MISSING_OPTION, NM_SETTING_BOND_ERROR_MISSING_OPTION,
_("setting '%s' is required"),
NM_SETTING_BOND_OPTION_MODE); NM_SETTING_BOND_OPTION_MODE);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
if (!_nm_utils_string_in_list (value, valid_modes)) { if (!_nm_utils_string_in_list (value, valid_modes)) {
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_MODE); _("'%s' is not a valid value for '%s'"),
value, NM_SETTING_BOND_OPTION_MODE);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
@@ -428,7 +440,10 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_ARP_INTERVAL); _("'%s=%s' is incompatible with '%s > 0'"),
NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_BOND_OPTION_ARP_INTERVAL);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE;
} }
} }
if (g_slist_find_custom (all_settings, NM_SETTING_INFINIBAND_SETTING_NAME, find_setting_by_name)) { if (g_slist_find_custom (all_settings, NM_SETTING_INFINIBAND_SETTING_NAME, find_setting_by_name)) {
@@ -436,7 +451,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_MODE); _("'%s=%s' is not a valid configuration for '%s'"),
NM_SETTING_BOND_OPTION_MODE, value, NM_SETTING_INFINIBAND_SETTING_NAME);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
} }
@@ -447,14 +464,18 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_UPDELAY); _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_UPDELAY, NM_SETTING_BOND_OPTION_MIIMON);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
if (g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY)) { if (g_hash_table_lookup (priv->options, NM_SETTING_BOND_OPTION_DOWNDELAY)) {
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_DOWNDELAY); _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_DOWNDELAY, NM_SETTING_BOND_OPTION_MIIMON);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
} }
@@ -472,7 +493,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_MISSING_OPTION, NM_SETTING_BOND_ERROR_MISSING_OPTION,
NM_SETTING_BOND_OPTION_ARP_IP_TARGET); _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_ARP_INTERVAL, NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
@@ -482,7 +505,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
_("'%s' option is empty"),
NM_SETTING_BOND_OPTION_ARP_IP_TARGET); NM_SETTING_BOND_OPTION_ARP_IP_TARGET);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
@@ -492,7 +517,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_ARP_IP_TARGET); _("'%s' is not a valid IPv4 address for '%s' option"),
NM_SETTING_BOND_OPTION_ARP_IP_TARGET, addrs[i]);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
} }
@@ -502,7 +529,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BOND_ERROR, NM_SETTING_BOND_ERROR,
NM_SETTING_BOND_ERROR_INVALID_OPTION, NM_SETTING_BOND_ERROR_INVALID_OPTION,
NM_SETTING_BOND_OPTION_ARP_IP_TARGET); _("'%s' option requires setting '%s' option"),
NM_SETTING_BOND_OPTION_ARP_IP_TARGET, NM_SETTING_BOND_OPTION_ARP_INTERVAL);
g_prefix_error (error, "%s: ", NM_SETTING_BOND_OPTIONS);
return FALSE; return FALSE;
} }
} }

11
libnm-util/nm-setting-bridge-port.c
View File

@@ -18,13 +18,14 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2012 Red Hat, Inc. * (C) Copyright 2012 - 2013 Red Hat, Inc.
*/ */
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-bridge-port.h" #include "nm-setting-bridge-port.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -151,7 +152,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BRIDGE_PORT_ERROR, NM_SETTING_BRIDGE_PORT_ERROR,
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
NM_SETTING_BRIDGE_PORT_PRIORITY); _("'%d' is not a valid value for the property (should be <= %d)"),
priv->priority, BR_MAX_PORT_PRIORITY);
g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_PORT_PRIORITY);
return FALSE; return FALSE;
} }
@@ -159,7 +162,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BRIDGE_PORT_ERROR, NM_SETTING_BRIDGE_PORT_ERROR,
NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_PORT_ERROR_INVALID_PROPERTY,
NM_SETTING_BRIDGE_PORT_PATH_COST); _("'%d' is not a valid value for the property (should be <= %d)"),
priv->path_cost, BR_MAX_PATH_COST);
g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_PORT_PATH_COST);
return FALSE; return FALSE;
} }

26
libnm-util/nm-setting-bridge.c
View File

@@ -18,13 +18,14 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2011 - 2012 Red Hat, Inc. * (C) Copyright 2011 - 2013 Red Hat, Inc.
*/ */
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <stdlib.h> #include <stdlib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-bridge.h" #include "nm-setting-bridge.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -244,10 +245,12 @@ check_range (guint32 val,
GError **error) GError **error)
{ {
if ((val != 0) && (val < min || val > max)) { if ((val != 0) && (val < min || val > max)) {
g_set_error_literal (error, g_set_error (error,
NM_SETTING_BRIDGE_ERROR, NM_SETTING_BRIDGE_ERROR,
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY,
prop); _("value '%d' is out of range <%d-%d>"),
val, min, max);
g_prefix_error (error, "%s: ", prop);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@@ -259,10 +262,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting); NMSettingBridgePrivate *priv = NM_SETTING_BRIDGE_GET_PRIVATE (setting);
if (!priv->interface_name || !strlen(priv->interface_name)) { if (!priv->interface_name || !strlen(priv->interface_name)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_BRIDGE_ERROR, NM_SETTING_BRIDGE_ERROR,
NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY, NM_SETTING_BRIDGE_ERROR_MISSING_PROPERTY,
NM_SETTING_BRIDGE_INTERFACE_NAME); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_INTERFACE_NAME);
return FALSE; return FALSE;
} }
@@ -270,7 +274,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_BRIDGE_ERROR, NM_SETTING_BRIDGE_ERROR,
NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY, NM_SETTING_BRIDGE_ERROR_INVALID_PROPERTY,
NM_SETTING_BRIDGE_INTERFACE_NAME); _("'%s' is not a valid interface name"),
priv->interface_name);
g_prefix_error (error, "%s: ", NM_SETTING_BRIDGE_INTERFACE_NAME);
return FALSE; return FALSE;
} }

40
libnm-util/nm-setting-cdma.c
View File

@@ -18,10 +18,12 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
*/ */
#include <string.h> #include <string.h>
#include <glib/gi18n.h>
#include "nm-setting-cdma.h" #include "nm-setting-cdma.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-setting-private.h" #include "nm-setting-private.h"
@@ -155,32 +157,36 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingCdmaPrivate *priv = NM_SETTING_CDMA_GET_PRIVATE (setting); NMSettingCdmaPrivate *priv = NM_SETTING_CDMA_GET_PRIVATE (setting);
if (!priv->number) { if (!priv->number) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_MISSING_PROPERTY, NM_SETTING_CDMA_ERROR_MISSING_PROPERTY,
NM_SETTING_CDMA_NUMBER); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_CDMA_NUMBER);
return FALSE; return FALSE;
} else if (!strlen (priv->number)) { } else if (!strlen (priv->number)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
NM_SETTING_CDMA_NUMBER); _("property is empty'"));
g_prefix_error (error, "%s: ", NM_SETTING_CDMA_NUMBER);
return FALSE; return FALSE;
} }
if (priv->username && !strlen (priv->username)) { if (priv->username && !strlen (priv->username)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
NM_SETTING_CDMA_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_CDMA_USERNAME);
return FALSE; return FALSE;
} }
if (priv->password && !strlen (priv->password)) { if (priv->password && !strlen (priv->password)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CDMA_ERROR, NM_SETTING_CDMA_ERROR,
NM_SETTING_CDMA_ERROR_INVALID_PROPERTY, NM_SETTING_CDMA_ERROR_INVALID_PROPERTY,
NM_SETTING_CDMA_PASSWORD); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_CDMA_PASSWORD);
return FALSE; return FALSE;
} }

75
libnm-util/nm-setting-connection.c
View File

@@ -19,11 +19,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2012 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <glib/gi18n.h>
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-dbus-glib-types.h" #include "nm-dbus-glib-types.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -647,44 +649,51 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting); NMSettingConnectionPrivate *priv = NM_SETTING_CONNECTION_GET_PRIVATE (setting);
if (!priv->id) { if (!priv->id) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
NM_SETTING_CONNECTION_ID); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_ID);
return FALSE; return FALSE;
} else if (!strlen (priv->id)) { } else if (!strlen (priv->id)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
NM_SETTING_CONNECTION_ID); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_ID);
return FALSE; return FALSE;
} }
if (!priv->uuid) { if (!priv->uuid) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
NM_SETTING_CONNECTION_UUID); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_UUID);
return FALSE; return FALSE;
} else if (!nm_utils_is_uuid (priv->uuid)) { } else if (!nm_utils_is_uuid (priv->uuid)) {
g_set_error (error, g_set_error (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
NM_SETTING_CONNECTION_UUID); _("'%s' is not a valid UUID"),
priv->uuid);
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_UUID);
return FALSE; return FALSE;
} }
if (!priv->type) { if (!priv->type) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY, NM_SETTING_CONNECTION_ERROR_MISSING_PROPERTY,
NM_SETTING_CONNECTION_TYPE); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE);
return FALSE; return FALSE;
} else if (!strlen (priv->type)) { } else if (!strlen (priv->type)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY, NM_SETTING_CONNECTION_ERROR_INVALID_PROPERTY,
NM_SETTING_CONNECTION_TYPE); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE);
return FALSE; return FALSE;
} }
@@ -693,7 +702,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND, NM_SETTING_CONNECTION_ERROR_TYPE_SETTING_NOT_FOUND,
NM_SETTING_CONNECTION_TYPE); _("requires presence of '%s' setting in the connection"),
priv->type);
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_TYPE);
return FALSE; return FALSE;
} }
@@ -712,10 +723,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (strcmp (nm_setting_ip4_config_get_method (s_ip4), if (strcmp (nm_setting_ip4_config_get_method (s_ip4),
NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) { NM_SETTING_IP4_CONFIG_METHOD_DISABLED)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED, NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
"No IP configuration allowed for bonding slave"); _("IPv4 configuration is not allowed for bonding slave"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_SLAVE_TYPE);
return FALSE; return FALSE;
} }
} }
@@ -728,10 +740,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (strcmp (nm_setting_ip6_config_get_method (s_ip6), if (strcmp (nm_setting_ip6_config_get_method (s_ip6),
NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) { NM_SETTING_IP6_CONFIG_METHOD_IGNORE)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_CONNECTION_ERROR, NM_SETTING_CONNECTION_ERROR,
NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED, NM_SETTING_CONNECTION_ERROR_IP_CONFIG_NOT_ALLOWED,
"No IPv6 configuration allowed for bonding slave"); _("IPv6 configuration is not allowed for bonding slave"));
g_prefix_error (error, "%s: ", NM_SETTING_CONNECTION_SLAVE_TYPE);
return FALSE; return FALSE;
} }
} }

47
libnm-util/nm-setting-gsm.c
View File

@@ -19,11 +19,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <glib/gi18n.h>
#include "nm-setting-gsm.h" #include "nm-setting-gsm.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "nm-setting-private.h" #include "nm-setting-private.h"
@@ -272,10 +274,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE (setting); NMSettingGsmPrivate *priv = NM_SETTING_GSM_GET_PRIVATE (setting);
if (priv->number && !priv->number[0]) { if (priv->number && !priv->number[0]) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_NUMBER); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_GSM_NUMBER);
return FALSE; return FALSE;
} }
@@ -287,7 +290,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_APN); _("property value '%s' is empty or too long (>64)"),
priv->apn);
g_prefix_error (error, "%s: ", NM_SETTING_GSM_APN);
return FALSE; return FALSE;
} }
@@ -317,25 +322,29 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_APN); _("'%s' contains invalid char(s) (use [A-Za-z._-])"),
priv->apn);
g_prefix_error (error, "%s: ", NM_SETTING_GSM_APN);
return FALSE; return FALSE;
} }
} }
} }
if (priv->username && !strlen (priv->username)) { if (priv->username && !strlen (priv->username)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_GSM_USERNAME);
return FALSE; return FALSE;
} }
if (priv->password && !strlen (priv->password)) { if (priv->password && !strlen (priv->password)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_GSM_USERNAME);
return FALSE; return FALSE;
} }
@@ -348,7 +357,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_NETWORK_ID); _("'%s' length is invalid (should be 5 or 6 digits)"),
priv->network_id);
g_prefix_error (error, "%s: ", NM_SETTING_GSM_NETWORK_ID);
return FALSE; return FALSE;
} }
@@ -357,7 +368,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_GSM_ERROR, NM_SETTING_GSM_ERROR,
NM_SETTING_GSM_ERROR_INVALID_PROPERTY, NM_SETTING_GSM_ERROR_INVALID_PROPERTY,
NM_SETTING_GSM_NETWORK_ID); _("'%s' is not a number"),
priv->network_id);
g_prefix_error (error, "%s: ", NM_SETTING_GSM_NETWORK_ID);
return FALSE; return FALSE;
} }
} }

25
libnm-util/nm-setting-infiniband.c
View File

@@ -16,11 +16,12 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* Copyright 2011 Red Hat, Inc. * Copyright 2011 - 2013 Red Hat, Inc.
*/ */
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <linux/if_infiniband.h> #include <linux/if_infiniband.h>
#include <glib/gi18n.h>
#include "nm-setting-infiniband.h" #include "nm-setting-infiniband.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -159,10 +160,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (setting); NMSettingInfinibandPrivate *priv = NM_SETTING_INFINIBAND_GET_PRIVATE (setting);
if (priv->mac_address && priv->mac_address->len != INFINIBAND_ALEN) { if (priv->mac_address && priv->mac_address->len != INFINIBAND_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR,
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
NM_SETTING_INFINIBAND_MAC_ADDRESS); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_INFINIBAND_MAC_ADDRESS);
return FALSE; return FALSE;
} }
@@ -173,10 +175,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (priv->mtu > 65520) if (priv->mtu > 65520)
priv->mtu = 65520; priv->mtu = 65520;
} else { } else {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR,
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
NM_SETTING_INFINIBAND_TRANSPORT_MODE); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_INFINIBAND_TRANSPORT_MODE);
return FALSE; return FALSE;
} }
@@ -184,7 +187,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_INFINIBAND_ERROR, NM_SETTING_INFINIBAND_ERROR,
NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY, NM_SETTING_INFINIBAND_ERROR_INVALID_PROPERTY,
NM_SETTING_INFINIBAND_CARRIER_DETECT); _("'%s' is not a valid value for the property"),
priv->carrier_detect);
g_prefix_error (error, "%s: ", NM_SETTING_INFINIBAND_CARRIER_DETECT);
return FALSE; return FALSE;
} }

78
libnm-util/nm-setting-ip4-config.c
View File

@@ -19,13 +19,14 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2010 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-ip4-config.h" #include "nm-setting-ip4-config.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -686,19 +687,21 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
int i; int i;
if (!priv->method) { if (!priv->method) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
NM_SETTING_IP4_CONFIG_METHOD); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_METHOD);
return FALSE; return FALSE;
} }
if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) { if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_MANUAL)) {
if (!priv->addresses) { if (!priv->addresses) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_MISSING_PROPERTY,
NM_SETTING_IP4_CONFIG_ADDRESSES); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }
} else if ( !strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL) } else if ( !strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_LINK_LOCAL)
@@ -708,7 +711,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
NM_SETTING_IP4_CONFIG_DNS); _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DNS);
return FALSE; return FALSE;
} }
@@ -716,7 +721,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
NM_SETTING_IP4_CONFIG_DNS_SEARCH); _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DNS_SEARCH);
return FALSE; return FALSE;
} }
@@ -724,32 +731,37 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP4_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
NM_SETTING_IP4_CONFIG_ADDRESSES); _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }
} else if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) { } else if (!strcmp (priv->method, NM_SETTING_IP4_CONFIG_METHOD_AUTO)) {
/* nothing to do */ /* nothing to do */
} else { } else {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_METHOD); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_METHOD);
return FALSE; return FALSE;
} }
if (priv->dhcp_client_id && !strlen (priv->dhcp_client_id)) { if (priv->dhcp_client_id && !strlen (priv->dhcp_client_id)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID);
return FALSE; return FALSE;
} }
if (priv->dhcp_hostname && !strlen (priv->dhcp_hostname)) { if (priv->dhcp_hostname && !strlen (priv->dhcp_hostname)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME);
return FALSE; return FALSE;
} }
@@ -762,7 +774,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_ADDRESSES); _("%d. IPv4 address is invalid"),
i+1);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }
@@ -770,7 +784,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_ADDRESSES); _("%d. IPv4 address has invalid prefix"),
i+1);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }
} }
@@ -784,7 +800,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_ROUTES); _("%d. route is invalid"),
i+1);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ROUTES);
return FALSE; return FALSE;
} }
@@ -792,7 +810,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP4_CONFIG_ERROR, NM_SETTING_IP4_CONFIG_ERROR,
NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP4_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP4_CONFIG_ROUTES); _("%d. route has invalid prefix"),
i+1);
g_prefix_error (error, "%s: ", NM_SETTING_IP4_CONFIG_ROUTES);
return FALSE; return FALSE;
} }
} }

54
libnm-util/nm-setting-ip6-config.c
View File

@@ -19,12 +19,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2012 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
*/ */
#include <string.h> #include <string.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-ip6-config.h" #include "nm-setting-ip6-config.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -668,19 +669,21 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting); NMSettingIP6ConfigPrivate *priv = NM_SETTING_IP6_CONFIG_GET_PRIVATE (setting);
if (!priv->method) { if (!priv->method) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
NM_SETTING_IP6_CONFIG_METHOD); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_METHOD);
return FALSE; return FALSE;
} }
if (!strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) { if (!strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) {
if (!priv->addresses) { if (!priv->addresses) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_MISSING_PROPERTY,
NM_SETTING_IP6_CONFIG_ADDRESSES); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }
} else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE) } else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_IGNORE)
@@ -690,7 +693,10 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
NM_SETTING_IP6_CONFIG_DNS); _("'%s' not allowed for %s=%s"),
_("this property is not allowed for '%s=%s'"),
NM_SETTING_IP6_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_DNS);
return FALSE; return FALSE;
} }
@@ -698,7 +704,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
NM_SETTING_IP6_CONFIG_DNS_SEARCH); _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP6_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_DNS_SEARCH);
return FALSE; return FALSE;
} }
@@ -706,25 +714,29 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD, NM_SETTING_IP6_CONFIG_ERROR_NOT_ALLOWED_FOR_METHOD,
NM_SETTING_IP6_CONFIG_ADDRESSES); _("this property is not allowed for '%s=%s'"),
NM_SETTING_IP4_CONFIG_METHOD, priv->method);
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_ADDRESSES);
return FALSE; return FALSE;
} }
} else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO) } else if ( !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_AUTO)
|| !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) { || !strcmp (priv->method, NM_SETTING_IP6_CONFIG_METHOD_DHCP)) {
/* nothing to do */ /* nothing to do */
} else { } else {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP6_CONFIG_METHOD); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_METHOD);
return FALSE; return FALSE;
} }
if (priv->dhcp_hostname && !strlen (priv->dhcp_hostname)) { if (priv->dhcp_hostname && !strlen (priv->dhcp_hostname)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_IP6_CONFIG_ERROR, NM_SETTING_IP6_CONFIG_ERROR,
NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY, NM_SETTING_IP6_CONFIG_ERROR_INVALID_PROPERTY,
NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME);
return FALSE; return FALSE;
} }

34
libnm-util/nm-setting-olpc-mesh.c
View File

@@ -20,7 +20,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2008 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
* (C) Copyright 2009 One Laptop per Child * (C) Copyright 2009 One Laptop per Child
*/ */
@@ -28,6 +28,7 @@
#include <string.h> #include <string.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "NetworkManager.h" #include "NetworkManager.h"
#include "nm-setting-olpc-mesh.h" #include "nm-setting-olpc-mesh.h"
@@ -121,18 +122,20 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingOlpcMeshPrivate *priv = NM_SETTING_OLPC_MESH_GET_PRIVATE (setting); NMSettingOlpcMeshPrivate *priv = NM_SETTING_OLPC_MESH_GET_PRIVATE (setting);
if (!priv->ssid) { if (!priv->ssid) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_MISSING_PROPERTY,
NM_SETTING_OLPC_MESH_SSID); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_SSID);
return FALSE; return FALSE;
} }
if (!priv->ssid->len || priv->ssid->len > 32) { if (!priv->ssid->len || priv->ssid->len > 32) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
NM_SETTING_OLPC_MESH_SSID); _("SSID length is out of range <1-32> bytes"));
g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_SSID);
return FALSE; return FALSE;
} }
@@ -140,15 +143,18 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
NM_SETTING_OLPC_MESH_CHANNEL); _("'%d' is not a valid channel"),
priv->channel);
g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_CHANNEL);
return FALSE; return FALSE;
} }
if (priv->dhcp_anycast_addr && priv->dhcp_anycast_addr->len != ETH_ALEN) { if (priv->dhcp_anycast_addr && priv->dhcp_anycast_addr->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_OLPC_MESH_ERROR, NM_SETTING_OLPC_MESH_ERROR,
NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY, NM_SETTING_OLPC_MESH_ERROR_INVALID_PROPERTY,
NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_OLPC_MESH_DHCP_ANYCAST_ADDRESS);
return FALSE; return FALSE;
} }

12
libnm-util/nm-setting-ppp.c
View File

@@ -19,10 +19,12 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2008 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <glib/gi18n.h>
#include "nm-setting-ppp.h" #include "nm-setting-ppp.h"
#include "nm-setting-private.h" #include "nm-setting-private.h"
@@ -385,7 +387,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_PPP_ERROR, NM_SETTING_PPP_ERROR,
NM_SETTING_PPP_ERROR_INVALID_PROPERTY, NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
NM_SETTING_PPP_MRU); _("'%d' is out of valid range <128-16384>"),
priv->mru);
g_prefix_error (error, "%s: ", NM_SETTING_PPP_MRU);
return FALSE; return FALSE;
} }
} }
@@ -396,7 +400,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_PPP_ERROR, NM_SETTING_PPP_ERROR,
NM_SETTING_PPP_ERROR_INVALID_PROPERTY, NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
NM_SETTING_PPP_LCP_ECHO_FAILURE); _("setting this property requires non-zero '%s' property"),
NM_SETTING_PPP_LCP_ECHO_INTERVAL);
g_prefix_error (error, "%s: ", NM_SETTING_PPP_LCP_ECHO_FAILURE);
return FALSE; return FALSE;
} }
} }

31
libnm-util/nm-setting-pppoe.c
View File

@@ -19,11 +19,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <glib/gi18n.h>
#include "nm-setting-pppoe.h" #include "nm-setting-pppoe.h"
#include "nm-setting-ppp.h" #include "nm-setting-ppp.h"
#include "nm-setting-private.h" #include "nm-setting-private.h"
@@ -157,24 +159,27 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting); NMSettingPPPOEPrivate *priv = NM_SETTING_PPPOE_GET_PRIVATE (setting);
if (!priv->username) { if (!priv->username) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR,
NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY, NM_SETTING_PPPOE_ERROR_MISSING_PROPERTY,
NM_SETTING_PPPOE_USERNAME); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_PPPOE_USERNAME);
return FALSE; return FALSE;
} else if (!strlen (priv->username)) { } else if (!strlen (priv->username)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR,
NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
NM_SETTING_PPPOE_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_PPPOE_USERNAME);
return FALSE; return FALSE;
} }
if (priv->service && !strlen (priv->service)) { if (priv->service && !strlen (priv->service)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_PPPOE_ERROR, NM_SETTING_PPPOE_ERROR,
NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY, NM_SETTING_PPPOE_ERROR_INVALID_PROPERTY,
NM_SETTING_PPPOE_SERVICE); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_PPPOE_SERVICE);
return FALSE; return FALSE;
} }

32
libnm-util/nm-setting-vlan.c
View File

@@ -18,12 +18,13 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2011 - 2012 Red Hat, Inc. * (C) Copyright 2011 - 2013 Red Hat, Inc.
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-vlan.h" #include "nm-setting-vlan.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -482,7 +483,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
NM_SETTING_VLAN_INTERFACE_NAME); _("'%s' is not a valid interface name"),
priv->iface_name);
g_prefix_error (error, "%s: ", NM_SETTING_VLAN_INTERFACE_NAME);
return FALSE; return FALSE;
} }
@@ -502,7 +505,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_INVALID_PARENT, NM_SETTING_VLAN_ERROR_INVALID_PARENT,
NM_SETTING_CONNECTION_MASTER); _("'%s' value doesn't match '%s=%s'"),
priv->parent, NM_SETTING_CONNECTION_MASTER, master);
g_prefix_error (error, "%s: ", NM_SETTING_VLAN_PARENT);
return FALSE; return FALSE;
} }
} }
@@ -511,7 +516,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
NM_SETTING_VLAN_PARENT); _("'%s' is neither an UUID nor an interface name"),
priv->parent);
g_prefix_error (error, "%s: ", NM_SETTING_VLAN_PARENT);
return FALSE; return FALSE;
} }
} else { } else {
@@ -522,7 +529,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_MISSING_PROPERTY, NM_SETTING_VLAN_ERROR_MISSING_PROPERTY,
NM_SETTING_VLAN_PARENT); _("property is not specified and neither is '%s:%s'"),
NM_SETTING_WIRED_SETTING_NAME, NM_SETTING_WIRED_MAC_ADDRESS);
g_prefix_error (error, "%s: ", NM_SETTING_VLAN_PARENT);
return FALSE; return FALSE;
} }
} }
@@ -530,10 +539,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
if (priv->flags & ~(NM_VLAN_FLAG_REORDER_HEADERS | if (priv->flags & ~(NM_VLAN_FLAG_REORDER_HEADERS |
NM_VLAN_FLAG_GVRP | NM_VLAN_FLAG_GVRP |
NM_VLAN_FLAG_LOOSE_BINDING)) { NM_VLAN_FLAG_LOOSE_BINDING)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
NM_SETTING_VLAN_FLAGS); _("flags are invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_VLAN_FLAGS);
return FALSE; return FALSE;
} }
@@ -541,7 +551,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_VLAN_ERROR, NM_SETTING_VLAN_ERROR,
NM_SETTING_VLAN_ERROR_INVALID_PROPERTY, NM_SETTING_VLAN_ERROR_INVALID_PROPERTY,
NM_SETTING_VLAN_CARRIER_DETECT); _("'%s' is not a valid value for the property"),
priv->carrier_detect);
g_prefix_error (error, "%s: ", NM_SETTING_VLAN_CARRIER_DETECT);
return FALSE; return FALSE;
} }

31
libnm-util/nm-setting-vpn.c
View File

@@ -18,7 +18,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2012 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
@@ -26,6 +26,8 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-vpn.h" #include "nm-setting-vpn.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
#include "nm-utils.h" #include "nm-utils.h"
@@ -380,27 +382,30 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting); NMSettingVPNPrivate *priv = NM_SETTING_VPN_GET_PRIVATE (setting);
if (!priv->service_type) { if (!priv->service_type) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR,
NM_SETTING_VPN_ERROR_MISSING_PROPERTY, NM_SETTING_VPN_ERROR_MISSING_PROPERTY,
NM_SETTING_VPN_SERVICE_TYPE); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_VPN_SERVICE_TYPE);
return FALSE; return FALSE;
} }
if (!strlen (priv->service_type)) { if (!strlen (priv->service_type)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR,
NM_SETTING_VPN_ERROR_INVALID_PROPERTY, NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
NM_SETTING_VPN_SERVICE_TYPE); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_VPN_SERVICE_TYPE);
return FALSE; return FALSE;
} }
/* default username can be NULL, but can't be zero-length */ /* default username can be NULL, but can't be zero-length */
if (priv->user_name && !strlen (priv->user_name)) { if (priv->user_name && !strlen (priv->user_name)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_VPN_ERROR, NM_SETTING_VPN_ERROR,
NM_SETTING_VPN_ERROR_INVALID_PROPERTY, NM_SETTING_VPN_ERROR_INVALID_PROPERTY,
NM_SETTING_VPN_USER_NAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_VPN_USER_NAME);
return FALSE; return FALSE;
} }

32
libnm-util/nm-setting-wimax.c
View File

@@ -16,13 +16,14 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2011 Red Hat, Inc. * (C) Copyright 2011 - 2013 Red Hat, Inc.
* (C) Copyright 2009 Novell, Inc. * (C) Copyright 2009 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-wimax.h" #include "nm-setting-wimax.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -130,28 +131,29 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NMSettingWimaxPrivate *priv = NM_SETTING_WIMAX_GET_PRIVATE (setting); NMSettingWimaxPrivate *priv = NM_SETTING_WIMAX_GET_PRIVATE (setting);
if (!priv->network_name) { if (!priv->network_name) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR,
NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY, NM_SETTING_WIMAX_ERROR_MISSING_PROPERTY,
NM_SETTING_WIMAX_NETWORK_NAME); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_WIMAX_NETWORK_NAME);
return FALSE; return FALSE;
} }
if (!strlen (priv->network_name)) { if (!strlen (priv->network_name)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR,
NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
NM_SETTING_WIMAX_NETWORK_NAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_WIMAX_NETWORK_NAME);
return FALSE; return FALSE;
} }
if (priv->mac_address && priv->mac_address->len != ETH_ALEN) { if (priv->mac_address && priv->mac_address->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIMAX_ERROR, NM_SETTING_WIMAX_ERROR,
NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY, NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
NM_SETTING_WIMAX_MAC_ADDRESS); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIMAX_MAC_ADDRESS);
return FALSE; return FALSE;
} }

65
libnm-util/nm-setting-wired.c
View File

@@ -19,14 +19,15 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <string.h> #include <string.h>
#include <net/ethernet.h> #include <net/ethernet.h>
#include <dbus/dbus-glib.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-wired.h" #include "nm-setting-wired.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -452,7 +453,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_PORT); _("'%s' is not a valid ethernet port value"),
priv->port);
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_PORT);
return FALSE; return FALSE;
} }
@@ -460,15 +463,18 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_DUPLEX); _("'%s' is not a valid duplex value"),
priv->duplex);
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_DUPLEX);
return FALSE; return FALSE;
} }
if (priv->device_mac_address && priv->device_mac_address->len != ETH_ALEN) { if (priv->device_mac_address && priv->device_mac_address->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_MAC_ADDRESS); _("is not a valid MAC address"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_MAC_ADDRESS);
return FALSE; return FALSE;
} }
@@ -480,25 +486,29 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST); _("'%s' is not a valid MAC address"),
(const char *) mac_blacklist_iter->data);
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST);
return FALSE; return FALSE;
} }
} }
if ( priv->s390_subchannels if ( priv->s390_subchannels
&& !(priv->s390_subchannels->len == 3 || priv->s390_subchannels->len == 2)) { && !(priv->s390_subchannels->len == 3 || priv->s390_subchannels->len == 2)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_S390_SUBCHANNELS); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_S390_SUBCHANNELS);
return FALSE; return FALSE;
} }
if (priv->s390_nettype && !_nm_utils_string_in_list (priv->s390_nettype, valid_nettype)) { if (priv->s390_nettype && !_nm_utils_string_in_list (priv->s390_nettype, valid_nettype)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_S390_NETTYPE); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_S390_NETTYPE);
return FALSE; return FALSE;
} }
@@ -508,18 +518,21 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
|| !strlen (value) || !strlen (value)
|| (strlen (value) > 200)) { || (strlen (value) > 200)) {
g_set_error (error, g_set_error (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_S390_OPTIONS); _("invalid '%s' or its value '%s'"),
key, value);
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_S390_OPTIONS);
return FALSE; return FALSE;
} }
} }
if (priv->cloned_mac_address && priv->cloned_mac_address->len != ETH_ALEN) { if (priv->cloned_mac_address && priv->cloned_mac_address->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_CLONED_MAC_ADDRESS); _("is not a valid MAC address"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_CLONED_MAC_ADDRESS);
return FALSE; return FALSE;
} }
@@ -527,7 +540,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRED_ERROR, NM_SETTING_WIRED_ERROR,
NM_SETTING_WIRED_ERROR_INVALID_PROPERTY, NM_SETTING_WIRED_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRED_CARRIER_DETECT); _("'%s' is not a valid value for the property"),
priv->carrier_detect);
g_prefix_error (error, "%s: ", NM_SETTING_WIRED_CARRIER_DETECT);
return FALSE; return FALSE;
} }

154
libnm-util/nm-setting-wireless-security.c
View File

@@ -19,13 +19,15 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2011 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
#include <config.h> #include <config.h>
#include <string.h> #include <string.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "nm-setting-wireless-security.h" #include "nm-setting-wireless-security.h"
#include "nm-setting-8021x.h" #include "nm-setting-8021x.h"
#include "nm-param-spec-specialized.h" #include "nm-param-spec-specialized.h"
@@ -784,10 +786,11 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
const char *valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL }; const char *valid_groups[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
if (!priv->key_mgmt) { if (!priv->key_mgmt) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT);
return FALSE; return FALSE;
} }
@@ -795,7 +798,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); _("'%s' is not a valid value for the property"),
priv->key_mgmt);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT);
return FALSE; return FALSE;
} }
@@ -805,21 +810,25 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X, NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_802_1X,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); _("'%s' security requires '%s=%s'"),
"leap", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "ieee8021x");
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG);
return FALSE; return FALSE;
} }
if (!priv->leap_username) { if (!priv->leap_username) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME, NM_SETTING_WIRELESS_SECURITY_ERROR_LEAP_REQUIRES_USERNAME,
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME);
return FALSE; return FALSE;
} }
if (priv->leap_password && !strlen (priv->leap_password)) { if (priv->leap_password && !strlen (priv->leap_password)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD);
return FALSE; return FALSE;
} }
} else { } else {
@@ -830,17 +839,20 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING, NM_SETTING_WIRELESS_SECURITY_ERROR_MISSING_802_1X_SETTING,
NULL); _("'%s' security requires '%s' setting presence"),
priv->key_mgmt, NM_SETTING_802_1X_SETTING_NAME);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT);
return FALSE; return FALSE;
} }
} }
} }
if (priv->leap_username && !strlen (priv->leap_username)) { if (priv->leap_username && !strlen (priv->leap_username)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); _("property is empty"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME);
return FALSE; return FALSE;
} }
@@ -848,68 +860,78 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX); _("'%d' value is out of range <0-3>"),
priv->wep_tx_keyidx);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX);
return FALSE; return FALSE;
} }
if (priv->wep_key_type > NM_WEP_KEY_TYPE_LAST) { if (priv->wep_key_type > NM_WEP_KEY_TYPE_LAST) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE);
return FALSE; return FALSE;
} }
if (priv->wep_key0 && !nm_utils_wep_key_valid (priv->wep_key0, priv->wep_key_type)) { if (priv->wep_key0 && !nm_utils_wep_key_valid (priv->wep_key0, priv->wep_key_type)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY0);
return FALSE; return FALSE;
} }
if (priv->wep_key1 && !nm_utils_wep_key_valid (priv->wep_key1, priv->wep_key_type)) { if (priv->wep_key1 && !nm_utils_wep_key_valid (priv->wep_key1, priv->wep_key_type)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY1); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY1);
return FALSE; return FALSE;
} }
if (priv->wep_key2 && !nm_utils_wep_key_valid (priv->wep_key2, priv->wep_key_type)) { if (priv->wep_key2 && !nm_utils_wep_key_valid (priv->wep_key2, priv->wep_key_type)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY2); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY2);
return FALSE; return FALSE;
} }
if (priv->wep_key3 && !nm_utils_wep_key_valid (priv->wep_key3, priv->wep_key_type)) { if (priv->wep_key3 && !nm_utils_wep_key_valid (priv->wep_key3, priv->wep_key_type)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_WEP_KEY3); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_WEP_KEY3);
return FALSE; return FALSE;
} }
if (priv->auth_alg && !_nm_utils_string_in_list (priv->auth_alg, valid_auth_algs)) { if (priv->auth_alg && !_nm_utils_string_in_list (priv->auth_alg, valid_auth_algs)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG);
return FALSE; return FALSE;
} }
if (priv->psk && !nm_utils_wpa_psk_valid (priv->psk)) { if (priv->psk && !nm_utils_wpa_psk_valid (priv->psk)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_PSK); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PSK);
return FALSE; return FALSE;
} }
if (priv->proto && !_nm_utils_string_slist_validate (priv->proto, valid_protos)) { if (priv->proto && !_nm_utils_string_slist_validate (priv->proto, valid_protos)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_PROTO); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PROTO);
return FALSE; return FALSE;
} }
@@ -935,23 +957,27 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_PAIRWISE); _("'%s' connections require '%s' in this property"),
NM_SETTING_WIRELESS_MODE_ADHOC, "none");
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PAIRWISE);
return FALSE; return FALSE;
} }
} else if (!_nm_utils_string_slist_validate (priv->pairwise, valid_pairwise)) { } else if (!_nm_utils_string_slist_validate (priv->pairwise, valid_pairwise)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_PAIRWISE); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_PAIRWISE);
return FALSE; return FALSE;
} }
} }
if (priv->group && !_nm_utils_string_slist_validate (priv->group, valid_groups)) { if (priv->group && !_nm_utils_string_slist_validate (priv->group, valid_groups)) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_SECURITY_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SECURITY_GROUP); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_GROUP);
return FALSE; return FALSE;
} }
@@ -961,7 +987,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_SECURITY_ERROR, NM_SETTING_WIRELESS_SECURITY_ERROR,
NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP, NM_SETTING_WIRELESS_SECURITY_ERROR_SHARED_KEY_REQUIRES_WEP,
NM_SETTING_WIRELESS_SECURITY_AUTH_ALG); _("'%s' can only be used with '%s=%s' (WEP)"),
"shared", NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "none");
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SECURITY_AUTH_ALG);
return FALSE; return FALSE;
} }
} }

74
libnm-util/nm-setting-wireless.c
View File

@@ -19,7 +19,7 @@
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301 USA. * Boston, MA 02110-1301 USA.
* *
* (C) Copyright 2007 - 2012 Red Hat, Inc. * (C) Copyright 2007 - 2013 Red Hat, Inc.
* (C) Copyright 2007 - 2008 Novell, Inc. * (C) Copyright 2007 - 2008 Novell, Inc.
*/ */
@@ -27,6 +27,7 @@
#include <net/ethernet.h> #include <net/ethernet.h>
#include <netinet/ether.h> #include <netinet/ether.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
#include "NetworkManager.h" #include "NetworkManager.h"
#include "nm-setting-wireless.h" #include "nm-setting-wireless.h"
@@ -603,18 +604,20 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
GSList *iter; GSList *iter;
if (!priv->ssid) { if (!priv->ssid) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY, NM_SETTING_WIRELESS_ERROR_MISSING_PROPERTY,
NM_SETTING_WIRELESS_SSID); _("property is missing"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SSID);
return FALSE; return FALSE;
} }
if (!priv->ssid->len || priv->ssid->len > 32) { if (!priv->ssid->len || priv->ssid->len > 32) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SSID); _("SSID length is out of range <1-32> bytes"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SSID);
return FALSE; return FALSE;
} }
@@ -622,7 +625,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_MODE); _("'%s' is not a valid Wi-Fi mode"),
priv->mode);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_MODE);
return FALSE; return FALSE;
} }
@@ -630,7 +635,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_BAND); _("'%s' is not a valid band"),
priv->band);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_BAND);
return FALSE; return FALSE;
} }
@@ -638,7 +645,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND, NM_SETTING_WIRELESS_ERROR_CHANNEL_REQUIRES_BAND,
_("requires setting '%s' property"),
NM_SETTING_WIRELESS_BAND); NM_SETTING_WIRELESS_BAND);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_CHANNEL);
return FALSE; return FALSE;
} }
@@ -647,32 +656,37 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_CHANNEL); _("'%d' is not a valid channel"),
priv->channel);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_CHANNEL);
return FALSE; return FALSE;
} }
} }
if (priv->bssid && priv->bssid->len != ETH_ALEN) { if (priv->bssid && priv->bssid->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_BSSID); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_BSSID);
return FALSE; return FALSE;
} }
if (priv->device_mac_address && priv->device_mac_address->len != ETH_ALEN) { if (priv->device_mac_address && priv->device_mac_address->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_MAC_ADDRESS); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_MAC_ADDRESS);
return FALSE; return FALSE;
} }
if (priv->cloned_mac_address && priv->cloned_mac_address->len != ETH_ALEN) { if (priv->cloned_mac_address && priv->cloned_mac_address->len != ETH_ALEN) {
g_set_error (error, g_set_error_literal (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS); _("property is invalid"));
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS);
return FALSE; return FALSE;
} }
@@ -683,7 +697,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST); _("'%s' is not a valid MAC address"),
(const char *) iter->data);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST);
return FALSE; return FALSE;
} }
} }
@@ -695,7 +711,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY, NM_SETTING_WIRELESS_ERROR_INVALID_PROPERTY,
NM_SETTING_WIRELESS_SEEN_BSSIDS); _("'%s' is not a valid MAC address"),
(const char *) iter->data);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SEEN_BSSIDS);
return FALSE; return FALSE;
} }
} }
@@ -705,7 +723,9 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
g_set_error (error, g_set_error (error,
NM_SETTING_WIRELESS_ERROR, NM_SETTING_WIRELESS_ERROR,
NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING, NM_SETTING_WIRELESS_ERROR_MISSING_SECURITY_SETTING,
NULL); _("'%s' setting is required for the connection when the property is set"),
priv->security);
g_prefix_error (error, "%s: ", NM_SETTING_WIRELESS_SEC);
return FALSE; return FALSE;
} }

21
po/POTFILES.in
View File

@@ -11,6 +11,27 @@ cli/src/utils.c
libnm-util/crypto.c libnm-util/crypto.c
libnm-util/crypto_gnutls.c libnm-util/crypto_gnutls.c
libnm-util/crypto_nss.c libnm-util/crypto_nss.c
libnm-util/nm-setting-8021x.c
libnm-util/nm-setting-adsl.c
libnm-util/nm-setting-bluetooth.c
libnm-util/nm-setting-bond.c
libnm-util/nm-setting-bridge-port.c
libnm-util/nm-setting-bridge.c
libnm-util/nm-setting-cdma.c
libnm-util/nm-setting-connection.c
libnm-util/nm-setting-gsm.c
libnm-util/nm-setting-infiniband.c
libnm-util/nm-setting-ip4-config.c
libnm-util/nm-setting-ip6-config.c
libnm-util/nm-setting-olpc-mesh.c
libnm-util/nm-setting-ppp.c
libnm-util/nm-setting-pppoe.c
libnm-util/nm-setting-vlan.c
libnm-util/nm-setting-vpn.c
libnm-util/nm-setting-wimax.c
libnm-util/nm-setting-wired.c
libnm-util/nm-setting-wireless-security.c
libnm-util/nm-setting-wireless.c
libnm-util/nm-utils.c libnm-util/nm-utils.c
policy/org.freedesktop.NetworkManager.policy.in.in policy/org.freedesktop.NetworkManager.policy.in.in
src/main.c src/main.c