diff options
| author | Michael Biebl <biebl@debian.org> | 2015-12-24 00:25:15 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-12-24 00:25:15 +0100 |
| commit | 95fc418c29eaf71c43ee0dddc4515580b9ec1461 (patch) | |
| tree | c785190da048e63173bd573d7e8c565f3d28488d /src/ppp-manager | |
| parent | 46654959ce8acc3b92a92e931920365c3b2dab0d (diff) | |
| parent | 54f6333410ffd570e62717d9e77c5c987175e397 (diff) | |
Merge tag 'upstream/1.0.10'
Upstream version 1.0.10
Diffstat (limited to 'src/ppp-manager')
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 73528aa9..d27b262e 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; |