diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-05-09 08:53:48 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-05-09 08:53:48 +0200 |
| commit | bbfd1377b48ae8ce22dbc7e351daae2358da79f3 (patch) | |
| tree | 5692d50707797c157ea8bb89f6bdb2ea73700b9f /src | |
| parent | 3d474037ad7f28a127dd9208628f4292fe4adf52 (diff) | |
| download | NetworkManager-bbfd1377b48ae8ce22dbc7e351daae2358da79f3.tar.gz | |
Squashed 'src/n-dhcp4/' changes from f8fc48dc014d..b2a382ac4500
b2a382ac4500 test: use inet_pton() instead of inet_aton() in test tool
45df6a37a710 meson: no longer pass -Wl,--no-undefined explicitly
bb9bcdee5754 n-dhcp4-client: make n_dhcp4_client_set_log_level public
git-subtree-dir: src/n-dhcp4
git-subtree-split: b2a382ac4500dee1abfb7cd5acaa3678e47e9662
Diffstat (limited to 'src')
| -rw-r--r-- | src/libndhcp4.sym | 1 | ||||
| -rw-r--r-- | src/meson.build | 1 | ||||
| -rw-r--r-- | src/test-run-client.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/libndhcp4.sym b/src/libndhcp4.sym index c6e0dd8672..adaf6d6f0c 100644 --- a/src/libndhcp4.sym +++ b/src/libndhcp4.sym @@ -26,6 +26,7 @@ global: n_dhcp4_client_pop_event; n_dhcp4_client_update_mtu; n_dhcp4_client_probe; + n_dhcp4_client_set_log_level; n_dhcp4_client_probe_free; n_dhcp4_client_probe_get_userdata; diff --git a/src/meson.build b/src/meson.build index 2ac8ac1cb9..0a3685aa21 100644 --- a/src/meson.build +++ b/src/meson.build @@ -44,7 +44,6 @@ libndhcp4_shared = shared_library( soversion: 0, link_depends: libndhcp4_symfile, link_args: [ - '-Wl,--no-undefined', '-Wl,--version-script=@0@'.format(libndhcp4_symfile) ], ) diff --git a/src/test-run-client.c b/src/test-run-client.c index e558801470..259a960860 100644 --- a/src/test-run-client.c +++ b/src/test-run-client.c @@ -597,7 +597,7 @@ static int parse_argv(int argc, char **argv) { break; case ARG_REQUESTED_IP: - r = inet_aton(optarg, &main_arg_requested_ip); + r = inet_pton(AF_INET, optarg, &main_arg_requested_ip); if (r != 1) { fprintf(stderr, "%s: invalid requested IP -- '%s'\n", |