diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:52 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-08 17:44:52 +0200 |
| commit | d8cad4490d54acb162ad218a8a682ab379bb8bcc (patch) | |
| tree | 140abd545d62a1b0144be27c93ad8edb021e4311 /src/ppp | |
| parent | e3bc109cd0eb97346c448f591af518d85dbee21b (diff) | |
| parent | 8f7a3cbbdd0c0a48277c341dd3a8ec8743ae9735 (diff) | |
Update upstream source from tag 'upstream/1.13.90'
Update to upstream version '1.13.90' with Debian dir d7d3d98e1240df49343a72511602da7099232e10
Diffstat (limited to 'src/ppp')
| -rw-r--r-- | src/ppp/meson.build | 1 | ||||
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/ppp/meson.build b/src/ppp/meson.build index 38f9a0f1..20ed64ed 100644 --- a/src/ppp/meson.build +++ b/src/ppp/meson.build @@ -31,7 +31,6 @@ core_plugins += shared_module( name, sources: 'nm-ppp-manager.c', dependencies: deps, - c_args: '-DPPPD_PLUGIN_DIR="@0@"'.format(pppd_plugin_dir), link_args: [ '-Wl,--version-script,@0@'.format(linker_script), ], diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index 5e893c85..fdec4763 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -695,7 +695,7 @@ nm_cmd_line_to_str (NMCmdLine *cmd) char *str; g_ptr_array_add (cmd->array, NULL); - str = g_strjoinv (" ", (gchar **) cmd->array->pdata); + str = g_strjoinv (" ", (char **) cmd->array->pdata); g_ptr_array_remove_index (cmd->array, cmd->array->len - 1); return str; @@ -874,13 +874,13 @@ create_pppd_cmd_line (NMPPPManager *self, nm_cmd_line_add_string (cmd, pppoe_service); } } else if (adsl) { - const gchar *protocol = nm_setting_adsl_get_protocol (adsl); + const char *protocol = nm_setting_adsl_get_protocol (adsl); if (!strcmp (protocol, NM_SETTING_ADSL_PROTOCOL_PPPOA)) { guint32 vpi = nm_setting_adsl_get_vpi (adsl); guint32 vci = nm_setting_adsl_get_vci (adsl); const char *encaps = nm_setting_adsl_get_encapsulation (adsl); - gchar *vpivci; + char *vpivci; nm_cmd_line_add_string (cmd, "plugin"); nm_cmd_line_add_string (cmd, "pppoatm.so"); |