From 731cacc944752ef8e90c9233147855477aa21a57 Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Wed, 19 Mar 2008 15:27:59 +0000 Subject: [PATCH] Author: Tambet Ingo Date: Tue Mar 18 21:46:10 2008 -0600 2008-03-18 Tambet Ingo * src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_update_secrets): Don't print out username and password, it's supposed to be a secret. * src/nm-device-802-3-ethernet.c (ppp_state_changed): Handle authentication request and set the device state accordingly. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3481 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/nm-device-802-3-ethernet.c | 3 +++ src/ppp-manager/nm-ppp-manager.c | 2 -- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ef0f2a60e..41e65f980a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,14 @@ profiles. DNS servers and searches must now be stored in the ifcfg files themselves +2008-03-18 Tambet Ingo + + * src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_update_secrets): Don't + print out username and password, it's supposed to be a secret. + + * src/nm-device-802-3-ethernet.c (ppp_state_changed): Handle authentication + request and set the device state accordingly. + 2008-03-18 Tambet Ingo * src/nm-device-802-3-ethernet.c: Implement wired 802.1x authentication. diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index fc963bd399..eb753b15a4 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -1019,6 +1019,9 @@ ppp_state_changed (NMPPPManager *ppp_manager, NMPPPStatus status, gpointer user_ else nm_device_state_changed (device, NM_DEVICE_STATE_FAILED); break; + case NM_PPP_STATUS_AUTHENTICATE: + nm_device_state_changed (device, NM_DEVICE_STATE_NEED_AUTH); + break; default: break; } diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 142a257b88..25053831b8 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -709,8 +709,6 @@ nm_ppp_manager_update_secrets (NMPPPManager *manager, pppoe_setting = NM_SETTING_PPPOE (nm_connection_get_setting (connection, NM_TYPE_SETTING_PPPOE)); g_assert (pppoe_setting); - nm_info ("Sending secrets: %s %s", pppoe_setting->username, pppoe_setting->password); - /* FIXME: Do we have to strdup the values here? */ dbus_g_method_return (priv->pending_secrets_context, g_strdup (pppoe_setting->username),