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

libnm-util: deprecate GSM PUK property

Browse Source 
Unused anyway, and PUK is dangerous enough that it should be handled
by the client explicitly and not by NM.
This commit is contained in:
Dan Williams
2009-09-18 17:08:30 -07:00
parent 99fb844657
commit e4ed9764b5
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,6 @@ typedef struct {
int band; int band;
char *pin; char *pin;
char *puk;
} NMSettingGsmPrivate; } NMSettingGsmPrivate;
enum { enum {
@@ -180,9 +179,8 @@ nm_setting_gsm_get_pin (NMSettingGsm *setting)
const char * const char *
nm_setting_gsm_get_puk (NMSettingGsm *setting) nm_setting_gsm_get_puk (NMSettingGsm *setting)
{ {
g_return_val_if_fail (NM_IS_SETTING_GSM (setting), NULL); g_warning ("Tried to set deprecated property " NM_SETTING_GSM_SETTING_NAME "/" NM_SETTING_GSM_PUK);
return NULL;
return NM_SETTING_GSM_GET_PRIVATE (setting)->puk;
} }
static gboolean static gboolean
@@ -299,7 +297,6 @@ finalize (GObject *object)
g_free (priv->apn); g_free (priv->apn);
g_free (priv->network_id); g_free (priv->network_id);
g_free (priv->pin); g_free (priv->pin);
g_free (priv->puk);
G_OBJECT_CLASS (nm_setting_gsm_parent_class)->finalize (object); G_OBJECT_CLASS (nm_setting_gsm_parent_class)->finalize (object);
} }
@@ -342,8 +339,7 @@ set_property (GObject *object, guint prop_id,
priv->pin = g_value_dup_string (value); priv->pin = g_value_dup_string (value);
break; break;
case PROP_PUK: case PROP_PUK:
g_free (priv->puk); g_warning ("Tried to set deprecated property " NM_SETTING_GSM_SETTING_NAME "/" NM_SETTING_GSM_PUK);
priv->puk = g_value_dup_string (value);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -383,7 +379,7 @@ get_property (GObject *object, guint prop_id,
g_value_set_string (value, nm_setting_gsm_get_pin (setting)); g_value_set_string (value, nm_setting_gsm_get_pin (setting));
break; break;
case PROP_PUK: case PROP_PUK:
g_value_set_string (value, nm_setting_gsm_get_puk (setting)); g_warning ("Tried to get deprecated property " NM_SETTING_GSM_SETTING_NAME "/" NM_SETTING_GSM_PUK);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -476,8 +472,8 @@ nm_setting_gsm_class_init (NMSettingGsmClass *setting_class)
g_object_class_install_property g_object_class_install_property
(object_class, PROP_PUK, (object_class, PROP_PUK,
g_param_spec_string (NM_SETTING_GSM_PUK, g_param_spec_string (NM_SETTING_GSM_PUK,
"PUK", "PUK (DEPRECATED and UNUSED)",
"PUK", "PUK (DEPRECATED and UNUSED)",
NULL, NULL,
G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET)); G_PARAM_READWRITE | NM_SETTING_PARAM_SERIALIZE | NM_SETTING_PARAM_SECRET));
} }

2
libnm-util/nm-setting-gsm.h
View File

@@ -61,6 +61,8 @@ GQuark nm_setting_gsm_error_quark (void);
#define NM_SETTING_GSM_NETWORK_TYPE "network-type" #define NM_SETTING_GSM_NETWORK_TYPE "network-type"
#define NM_SETTING_GSM_BAND "band" #define NM_SETTING_GSM_BAND "band"
#define NM_SETTING_GSM_PIN "pin" #define NM_SETTING_GSM_PIN "pin"
/* DEPRECATED & UNUSED */
#define NM_SETTING_GSM_PUK "puk" #define NM_SETTING_GSM_PUK "puk"
enum { enum {

2
src/modem-manager/nm-modem-gsm.c
View File

@@ -169,8 +169,6 @@ stage1_prepare_done (DBusGProxy *proxy, DBusGProxyCall *call_id, gpointer user_d
if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PIN)) if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PIN))
required_secret = NM_SETTING_GSM_PIN; required_secret = NM_SETTING_GSM_PIN;
else if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_PUK))
required_secret = NM_SETTING_GSM_PUK;
else if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_WRONG)) { else if (dbus_g_error_has_name (error, MM_MODEM_ERROR_SIM_WRONG)) {
clear_pin (device); clear_pin (device);
required_secret = NM_SETTING_GSM_PIN; required_secret = NM_SETTING_GSM_PIN;