From dd088ed595197662f89a9c5ddadd5e7fbfe66544 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 4 Dec 2015 14:19:51 +0100 Subject: [PATCH] ppp-manager: fix crash in create_pppd_cmd_line() for ADSL with PPPOE protocol Failed to lookup pppoe_binary, which results in a failed assertion NetworkManager:ERROR:ppp-manager/nm-ppp-manager.c:949:create_pppd_cmd_line: assertion failed: (pppoe_binary != NULL) https://bugzilla.gnome.org/show_bug.cgi?id=759001 Fixes: 7955806a02db64b20079267743056d7d9d45af3b --- src/ppp-manager/nm-ppp-manager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 73528aa9d5..d27b262e0e 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -865,7 +865,8 @@ create_pppd_cmd_line (NMPPPManager *self, return NULL; if ( pppoe - || (adsl && strcmp (nm_setting_adsl_get_protocol (adsl), NM_SETTING_ADSL_PROTOCOL_PPPOE))) { + || ( adsl + && !strcmp (nm_setting_adsl_get_protocol (adsl), NM_SETTING_ADSL_PROTOCOL_PPPOE))) { pppoe_binary = nm_utils_find_helper ("pppoe", NULL, err); if (!pppoe_binary) return NULL;