Commit 5ca888d6 authored by Beniamino Galvani's avatar Beniamino Galvani

device: ppp: check that connection has a PPPoE parent

NMDevicePPP only handles connections with the pppoe.parent property
set. match_connection() already checks this when we creating a new
device. We should also perform the same check in

Fixes: 6c319593 ('core: implement activation of PPP devices')

(cherry picked from commit 17f4a1e7)
parent 9fe7ef6c
Pipeline #46399 passed with stage
in 52 minutes and 33 seconds
......@@ -117,6 +117,25 @@ ppp_ip4_config (NMPPPManager *ppp_manager,
static gboolean
check_connection_compatible (NMDevice *device, NMConnection *connection, GError **error)
NMSettingPppoe *s_pppoe;
if (!NM_DEVICE_CLASS (nm_device_ppp_parent_class)->check_connection_compatible (device, connection, error))
return FALSE;
s_pppoe = nm_connection_get_setting_pppoe (connection);
if ( !s_pppoe
|| !nm_setting_pppoe_get_parent (s_pppoe)) {
"the connection doesn't specify a PPPoE parent interface");
return FALSE;
return TRUE;
static NMActStageReturn
act_stage2_config (NMDevice *device, NMDeviceStateReason *out_failure_reason)
......@@ -280,6 +299,7 @@ nm_device_ppp_class_init (NMDevicePppClass *klass)
device_class->act_stage2_config = act_stage2_config;
device_class->act_stage3_ip_config_start = act_stage3_ip_config_start;
device_class->check_connection_compatible = check_connection_compatible;
device_class->create_and_realize = create_and_realize;
device_class->deactivate = deactivate;
device_class->get_generic_capabilities = get_generic_capabilities;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment