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 | 581eb33ecf16cea14ff0fec729f66232b38e3fb6 (patch) | |
| tree | eec339c4464d27cbed200311b561d8494edbfee4 | |
| parent | 7e03f9c1ba417c429628429a98ea53e3becaa242 (diff) | |
| parent | bbfd1377b48ae8ce22dbc7e351daae2358da79f3 (diff) | |
| download | NetworkManager-581eb33ecf16cea14ff0fec729f66232b38e3fb6.tar.gz | |
n-dhcp4: re-import git-subtree for 'src/n-dhcp4'
git subtree pull --prefix src/n-dhcp4 git@github.com:nettools/n-dhcp4.git master --squash
| -rw-r--r-- | src/n-dhcp4/src/libndhcp4.sym | 1 | ||||
| -rw-r--r-- | src/n-dhcp4/src/meson.build | 1 | ||||
| -rw-r--r-- | src/n-dhcp4/src/test-run-client.c | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/n-dhcp4/src/libndhcp4.sym b/src/n-dhcp4/src/libndhcp4.sym index c6e0dd8672..adaf6d6f0c 100644 --- a/src/n-dhcp4/src/libndhcp4.sym +++ b/src/n-dhcp4/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/n-dhcp4/src/meson.build b/src/n-dhcp4/src/meson.build index 2ac8ac1cb9..0a3685aa21 100644 --- a/src/n-dhcp4/src/meson.build +++ b/src/n-dhcp4/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/n-dhcp4/src/test-run-client.c b/src/n-dhcp4/src/test-run-client.c index e558801470..259a960860 100644 --- a/src/n-dhcp4/src/test-run-client.c +++ b/src/n-dhcp4/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", |