diff options
| author | Dan Winship <danw@gnome.org> | 2014-04-04 11:19:40 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-04-14 10:11:05 -0400 |
| commit | ebc5ea0b80072b5026d8fb220208befd00bdd2c3 (patch) | |
| tree | 9b432d3a6407dd45c755cd0666ee652c21bbadd7 /src/ppp-manager | |
| parent | 3e58107fe04dc3949d98c5b962a3f3da8b453e71 (diff) | |
| download | NetworkManager-ebc5ea0b80072b5026d8fb220208befd00bdd2c3.tar.gz | |
ppp-manager: find pppd at build time, allow overriding
Add --with-pppd, just like --with-dnsmasq.
Also change "ppp" to "pppd" for clarity in a few places.
Diffstat (limited to 'src/ppp-manager')
| -rw-r--r-- | src/ppp-manager/nm-ppp-manager.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c index 822721531c..9ab140db10 100644 --- a/src/ppp-manager/nm-ppp-manager.c +++ b/src/ppp-manager/nm-ppp-manager.c @@ -651,16 +651,17 @@ static inline const char * nm_find_pppd (void) { static const char *pppd_binary_paths[] = { + PPPD_PATH, "/usr/local/sbin/pppd", "/usr/sbin/pppd", "/sbin/pppd", NULL }; - const char **pppd_binary = pppd_binary_paths; + const char **pppd_binary = pppd_binary_paths; while (*pppd_binary != NULL) { - if (g_file_test (*pppd_binary, G_FILE_TEST_EXISTS)) + if (**pppd_binary && g_file_test (*pppd_binary, G_FILE_TEST_EXISTS)) break; pppd_binary++; } @@ -787,22 +788,22 @@ create_pppd_cmd_line (NMPPPManager *self, GError **err) { NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (self); - const char *ppp_binary; + const char *pppd_binary; NMCmdLine *cmd; gboolean ppp_debug; g_return_val_if_fail (setting != NULL, NULL); - ppp_binary = nm_find_pppd (); - if (!ppp_binary) { + pppd_binary = nm_find_pppd (); + if (!pppd_binary) { g_set_error (err, NM_PPP_MANAGER_ERROR, NM_PPP_MANAGER_ERROR, - "Could not find ppp binary."); + "Could not find pppd binary."); return NULL; } /* Create pppd command line */ cmd = nm_cmd_line_new (); - nm_cmd_line_add_string (cmd, ppp_binary); + nm_cmd_line_add_string (cmd, pppd_binary); nm_cmd_line_add_string (cmd, "nodetach"); nm_cmd_line_add_string (cmd, "lock"); |