From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- Makefile.am | 291 +- Makefile.in | 938 ++- NEWS | 13 + clients/cli/connections.c | 256 +- clients/cli/devices.c | 1 + clients/cli/general.c | 4 +- clients/cli/meson.build | 2 +- clients/cli/settings.c | 261 +- clients/cli/settings.h | 13 +- clients/cli/utils.c | 3 +- clients/common/meson.build | 4 +- clients/common/nm-client-utils.c | 4 + clients/common/nm-client-utils.h | 8 +- clients/common/nm-meta-setting-access.c | 16 + clients/common/nm-meta-setting-access.h | 2 + clients/common/nm-meta-setting-desc.c | 4128 +++++------ clients/common/nm-meta-setting-desc.h | 83 +- clients/common/nm-secret-agent-simple.c | 49 +- clients/common/nm-vpn-helpers.c | 67 +- clients/common/settings-docs.h | 4 + clients/common/settings-docs.h.in | 4 + clients/common/tests/meson.build | 2 +- clients/meson.build | 2 +- .../test-client.check-on-disk/test_001.expected | 92 +- .../test-client.check-on-disk/test_002.expected | 52 +- .../test-client.check-on-disk/test_003.expected | 1474 ++-- .../test-client.check-on-disk/test_004.expected | 3542 ++++++---- clients/tests/test-client.py | 4 + clients/tui/meson.build | 3 +- clients/tui/nmt-editor.c | 4 + clients/tui/nmt-mac-entry.c | 2 +- configure | 34 +- configure.ac | 10 +- dispatcher/meson.build | 2 +- dispatcher/nm-dispatcher-utils.c | 2 +- dispatcher/nm-dispatcher.c | 2 +- dispatcher/tests/meson.build | 2 +- dispatcher/tests/test-dispatcher-envp.c | 262 +- docs/api/html/index.html | 2 +- docs/api/html/ix01.html | 1462 ++-- docs/api/html/nm-settings-ifcfg-rh.html | 32 + docs/api/html/nm-settings.html | 28 + docs/api/html/settings-bridge-port.html | 6 + docs/api/html/settings-bridge.html | 18 + docs/api/meson.build | 8 +- docs/api/settings-spec.xml | 4 + docs/api/version.xml | 2 +- docs/libnm-glib/html/index.html | 2 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/html/index.html | 2 +- docs/libnm-util/version.xml | 2 +- docs/libnm/html/NMDevice.html | 54 +- docs/libnm/html/NMSettingBridge.html | 1056 ++- docs/libnm/html/NMSettingBridgePort.html | 279 + docs/libnm/html/NMSettingIPConfig.html | 3647 +++++++--- docs/libnm/html/NMSettingSriov.html | 22 + docs/libnm/html/NMSettingTCConfig.html | 133 + docs/libnm/html/api-index-full.html | 400 ++ docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-dbus-interface.html | 72 +- docs/libnm/html/libnm-nm-utils.html | 6 +- docs/libnm/html/libnm-nm-version.html | 32 + docs/libnm/html/libnm.devhelp2 | 110 +- docs/libnm/html/object-tree.html | 3 + docs/libnm/html/usage.html | 2 +- docs/libnm/libnm-sections.txt | 106 +- docs/libnm/libnm.types | 3 + docs/libnm/version.xml | 2 +- examples/C/glib/meson.build | 2 +- examples/nm-conf.d/31-mac-addr-change.conf | 13 +- introspection/meson.build | 11 +- libnm-core/meson.build | 92 +- libnm-core/nm-connection.c | 51 +- libnm-core/nm-core-internal.h | 81 +- libnm-core/nm-crypto-gnutls.c | 2 +- libnm-core/nm-crypto-nss.c | 2 +- libnm-core/nm-crypto.c | 4 +- libnm-core/nm-dbus-interface.h | 18 +- libnm-core/nm-json.h | 2 +- libnm-core/nm-keyfile.c | 614 +- libnm-core/nm-setting-8021x.c | 2 +- libnm-core/nm-setting-bridge-port.c | 319 +- libnm-core/nm-setting-bridge-port.h | 18 + libnm-core/nm-setting-bridge.c | 863 ++- libnm-core/nm-setting-bridge.h | 59 + libnm-core/nm-setting-connection.c | 7 +- libnm-core/nm-setting-ethtool.c | 2 +- libnm-core/nm-setting-infiniband.c | 25 +- libnm-core/nm-setting-ip-config.c | 2465 ++++++- libnm-core/nm-setting-ip-config.h | 166 + libnm-core/nm-setting-ip-tunnel.c | 4 +- libnm-core/nm-setting-macsec.c | 2 +- libnm-core/nm-setting-private.h | 4 + libnm-core/nm-setting-sriov.c | 6 +- libnm-core/nm-setting-tc-config.c | 197 +- libnm-core/nm-setting-tc-config.h | 10 + libnm-core/nm-setting-team-port.c | 27 +- libnm-core/nm-setting-team.c | 123 +- libnm-core/nm-setting-vlan.c | 122 +- libnm-core/nm-setting-vpn.c | 16 +- libnm-core/nm-setting-wifi-p2p.c | 2 +- libnm-core/nm-setting-wired.c | 18 +- libnm-core/nm-setting-wireguard.c | 2 +- libnm-core/nm-setting-wireless.c | 2 +- libnm-core/nm-utils-private.h | 80 +- libnm-core/nm-utils.c | 422 +- libnm-core/nm-version.h | 14 + libnm-core/tests/meson.build | 2 +- libnm-core/tests/test-general.c | 516 +- libnm-core/tests/test-keyfile.c | 98 + libnm-core/tests/test-setting.c | 368 +- libnm-glib/meson.build | 4 +- libnm-glib/nm-client.c | 2 +- libnm-glib/nm-device.c | 2 +- libnm-glib/tests/meson.build | 2 +- libnm-util/meson.build | 4 +- libnm-util/tests/meson.build | 2 +- libnm/libnm.ver | 86 + libnm/meson.build | 8 +- libnm/nm-dbus-helpers.h | 2 +- libnm/nm-device.c | 66 +- libnm/nm-device.h | 8 +- libnm/nm-manager.c | 2 +- libnm/nm-property-docs.xml | 4 + libnm/nm-secret-agent-old.c | 3 +- libnm/nm-settings-docs.xml | 4 + libnm/nm-settings-ifcfg-rh-docs.xml | 4 + libnm/nm-vpn-service-plugin.c | 2 +- libnm/tests/meson.build | 4 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 6 +- man/nm-initrd-generator.8 | 6 +- man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-ifcfg-rh.5 | 54 +- man/nm-settings-ifcfg-rh.xml | 14 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 46 +- man/nm-settings.xml | 6 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- meson.build | 10 +- po/POTFILES.in | 2 +- po/ar.po | 2 +- po/as.po | 2 +- po/be@latin.po | 2 +- po/bg.po | 2 +- po/bn_IN.po | 2 +- po/bs.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 4 +- po/dz.po | 2 +- po/el.po | 2 +- po/en_CA.po | 2 +- po/en_GB.po | 2 +- po/eo.po | 2 +- po/es.po | 6041 ++++++++-------- po/et.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 4 +- po/gd.po | 2 +- po/gl.po | 2 +- po/gu.po | 2 +- po/he.po | 2 +- po/hi.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/id.po | 4 +- po/it.po | 7386 ++++++++++---------- po/ja.po | 4 +- po/ka.po | 2 +- po/kn.po | 2 +- po/ko.po | 2 +- po/ku.po | 2 +- po/lt.po | 2 +- po/lv.po | 2 +- po/mk.po | 2 +- po/ml.po | 2 +- po/mr.po | 2 +- po/nb.po | 2 +- po/ne.po | 2 +- po/nl.po | 2 +- po/oc.po | 2 +- po/or.po | 2 +- po/pa.po | 1797 +++-- po/pl.po | 2319 +++--- po/pt.po | 2 +- po/pt_BR.po | 4663 ++++++------ po/ru.po | 2 +- po/rw.po | 2 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sq.po | 2 +- po/sr.po | 2 +- po/sr@latin.po | 2 +- po/sv.po | 4 +- po/ta.po | 2 +- po/te.po | 2 +- po/th.po | 2 +- po/tr.po | 2 +- po/uk.po | 4 +- po/vi.po | 2 +- po/wa.po | 2 +- po/zh_CN.po | 4 +- po/zh_HK.po | 2 +- po/zh_TW.po | 2 +- shared/c-rbtree/src/c-rbtree.c | 1 + shared/meson.build | 125 +- shared/n-acd/src/n-acd-probe.c | 1 + shared/n-acd/src/util/timer.c | 2 + shared/nm-common-macros.h | 62 - shared/nm-dbus-compat.h | 74 - shared/nm-default.h | 8 +- shared/nm-dispatcher-api.h | 61 - shared/nm-ethtool-utils.c | 225 - shared/nm-ethtool-utils.h | 120 - shared/nm-glib-aux/nm-c-list.h | 117 + shared/nm-glib-aux/nm-dedup-multi.c | 1092 +++ shared/nm-glib-aux/nm-dedup-multi.h | 437 ++ shared/nm-glib-aux/nm-enum-utils.c | 372 + shared/nm-glib-aux/nm-enum-utils.h | 48 + shared/nm-glib-aux/nm-errno.c | 198 + shared/nm-glib-aux/nm-errno.h | 185 + shared/nm-glib-aux/nm-glib.h | 567 ++ shared/nm-glib-aux/nm-hash-utils.c | 196 + shared/nm-glib-aux/nm-hash-utils.h | 315 + shared/nm-glib-aux/nm-io-utils.c | 439 ++ shared/nm-glib-aux/nm-io-utils.h | 63 + shared/nm-glib-aux/nm-jansson.h | 49 + shared/nm-glib-aux/nm-logging-fwd.h | 113 + shared/nm-glib-aux/nm-macros-internal.h | 1855 +++++ shared/nm-glib-aux/nm-obj.h | 82 + shared/nm-glib-aux/nm-random-utils.c | 165 + shared/nm-glib-aux/nm-random-utils.h | 27 + shared/nm-glib-aux/nm-secret-utils.c | 168 + shared/nm-glib-aux/nm-secret-utils.h | 178 + shared/nm-glib-aux/nm-shared-utils.c | 2941 ++++++++ shared/nm-glib-aux/nm-shared-utils.h | 1191 ++++ shared/nm-glib-aux/nm-time-utils.c | 273 + shared/nm-glib-aux/nm-time-utils.h | 45 + shared/nm-libnm-core-aux/nm-dispatcher-api.h | 65 + shared/nm-libnm-core-intern/nm-common-macros.h | 62 + shared/nm-libnm-core-intern/nm-ethtool-utils.c | 225 + shared/nm-libnm-core-intern/nm-ethtool-utils.h | 120 + shared/nm-libnm-core-intern/nm-libnm-core-utils.c | 76 + shared/nm-libnm-core-intern/nm-libnm-core-utils.h | 113 + shared/nm-meta-setting.c | 8 + shared/nm-meta-setting.h | 12 + shared/nm-std-aux/c-list-util.c | 209 + shared/nm-std-aux/c-list-util.h | 66 + shared/nm-std-aux/nm-dbus-compat.h | 74 + shared/nm-std-aux/unaligned.h | 99 + shared/nm-test-utils-impl.c | 2 +- shared/nm-udev-aux/nm-udev-utils.c | 291 + shared/nm-udev-aux/nm-udev-utils.h | 48 + shared/nm-utils/c-list-util.c | 209 - shared/nm-utils/c-list-util.h | 43 - shared/nm-utils/nm-c-list.h | 117 - shared/nm-utils/nm-dedup-multi.c | 1092 --- shared/nm-utils/nm-dedup-multi.h | 437 -- shared/nm-utils/nm-enum-utils.c | 372 - shared/nm-utils/nm-enum-utils.h | 48 - shared/nm-utils/nm-errno.c | 198 - shared/nm-utils/nm-errno.h | 185 - shared/nm-utils/nm-glib.h | 567 -- shared/nm-utils/nm-hash-utils.c | 196 - shared/nm-utils/nm-hash-utils.h | 290 - shared/nm-utils/nm-io-utils.c | 439 -- shared/nm-utils/nm-io-utils.h | 63 - shared/nm-utils/nm-jansson.h | 49 - shared/nm-utils/nm-logging-fwd.h | 113 - shared/nm-utils/nm-macros-internal.h | 1707 ----- shared/nm-utils/nm-obj.h | 82 - shared/nm-utils/nm-random-utils.c | 165 - shared/nm-utils/nm-random-utils.h | 27 - shared/nm-utils/nm-secret-utils.c | 161 - shared/nm-utils/nm-secret-utils.h | 178 - shared/nm-utils/nm-shared-utils.c | 2741 -------- shared/nm-utils/nm-shared-utils.h | 1158 --- shared/nm-utils/nm-test-utils.h | 11 +- shared/nm-utils/nm-time-utils.c | 273 - shared/nm-utils/nm-time-utils.h | 45 - shared/nm-utils/nm-udev-utils.c | 291 - shared/nm-utils/nm-udev-utils.h | 48 - shared/nm-utils/nm-vpn-editor-plugin-call.h | 2 +- shared/nm-utils/tests/test-shared-general.c | 203 +- shared/nm-utils/unaligned.h | 99 - shared/nm-version-macros.h | 3 +- shared/nm-version-macros.h.in | 1 + shared/systemd/nm-logging-stub.c | 2 +- shared/systemd/nm-sd-utils-shared.c | 5 +- shared/systemd/nm-sd-utils-shared.h | 6 +- shared/systemd/sd-adapt-shared/missing.h | 2 + shared/systemd/sd-adapt-shared/missing_socket.h | 3 - shared/systemd/sd-adapt-shared/namespace-util.h | 3 + .../systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 +- shared/systemd/sd-adapt-shared/nulstr-util.h | 3 + shared/systemd/sd-adapt-shared/strxcpyx.h | 3 + shared/systemd/sd-adapt-shared/unaligned.h | 2 +- shared/systemd/src/basic/alloc-util.c | 20 +- shared/systemd/src/basic/alloc-util.h | 14 +- shared/systemd/src/basic/env-file.c | 2 +- shared/systemd/src/basic/errno-util.h | 69 + shared/systemd/src/basic/fd-util.c | 11 + shared/systemd/src/basic/fd-util.h | 12 - shared/systemd/src/basic/fileio.c | 104 +- shared/systemd/src/basic/fileio.h | 20 +- shared/systemd/src/basic/fs-util.c | 104 +- shared/systemd/src/basic/fs-util.h | 4 +- shared/systemd/src/basic/hashmap.c | 7 +- shared/systemd/src/basic/hashmap.h | 2 + shared/systemd/src/basic/hexdecoct.c | 77 +- shared/systemd/src/basic/hexdecoct.h | 5 +- shared/systemd/src/basic/in-addr-util.c | 134 +- shared/systemd/src/basic/in-addr-util.h | 2 + shared/systemd/src/basic/log.h | 22 +- shared/systemd/src/basic/memory-util.c | 59 + shared/systemd/src/basic/memory-util.h | 84 + shared/systemd/src/basic/mempool.c | 1 + shared/systemd/src/basic/missing_socket.h | 66 + shared/systemd/src/basic/missing_stat.h | 53 + shared/systemd/src/basic/path-util.c | 51 +- shared/systemd/src/basic/process-util.c | 53 +- shared/systemd/src/basic/process-util.h | 4 + shared/systemd/src/basic/random-util.c | 11 +- shared/systemd/src/basic/refcnt.h | 54 - shared/systemd/src/basic/socket-util.c | 72 +- shared/systemd/src/basic/socket-util.h | 3 + shared/systemd/src/basic/sort-util.h | 70 + shared/systemd/src/basic/stat-util.c | 46 - shared/systemd/src/basic/stat-util.h | 3 +- shared/systemd/src/basic/stdio-util.h | 2 +- shared/systemd/src/basic/string-table.h | 8 +- shared/systemd/src/basic/string-util.c | 35 +- shared/systemd/src/basic/string-util.h | 43 +- shared/systemd/src/basic/strv.c | 7 +- shared/systemd/src/basic/strv.h | 2 +- shared/systemd/src/basic/time-util.c | 2 +- shared/systemd/src/basic/utf8.c | 38 +- shared/systemd/src/basic/utf8.h | 2 +- shared/systemd/src/basic/util.c | 339 - shared/systemd/src/basic/util.h | 181 +- src/NetworkManagerUtils.c | 48 +- src/NetworkManagerUtils.h | 8 + src/devices/adsl/nm-atm-manager.c | 2 +- src/devices/bluetooth/nm-bluez-manager.c | 2 +- src/devices/nm-acd-manager.c | 48 +- src/devices/nm-acd-manager.h | 7 +- src/devices/nm-device-bond.c | 18 +- src/devices/nm-device-bridge.c | 174 +- src/devices/nm-device-ethernet.c | 2 +- src/devices/nm-device-private.h | 3 +- src/devices/nm-device-wireguard.c | 2 +- src/devices/nm-device.c | 197 +- src/devices/nm-device.h | 2 + src/devices/nm-lldp-listener.c | 357 +- src/devices/ovs/nm-device-ovs-port.c | 6 + src/devices/ovs/nm-ovs-factory.c | 2 +- src/devices/ovs/nm-ovsdb.c | 2 +- src/devices/team/nm-device-team.c | 8 +- src/devices/tests/test-acd.c | 26 +- src/devices/tests/test-lldp.c | 76 +- src/devices/wifi/nm-device-iwd.c | 4 +- src/devices/wifi/nm-device-wifi.c | 2 +- src/devices/wifi/nm-iwd-manager.c | 2 +- src/devices/wwan/nm-modem-broadband.c | 13 - src/devices/wwan/nm-modem-manager.c | 2 +- src/devices/wwan/nm-modem.c | 2 +- src/dhcp/meson.build | 2 +- src/dhcp/nm-dhcp-client.c | 4 +- src/dhcp/nm-dhcp-dhclient-utils.c | 181 +- src/dhcp/nm-dhcp-dhclient.c | 2 +- src/dhcp/nm-dhcp-manager.c | 2 +- src/dhcp/nm-dhcp-systemd.c | 4 +- src/dhcp/nm-dhcp-utils.c | 103 +- src/dhcp/tests/test-dhcp-dhclient.c | 2 +- src/dhcp/tests/test-dhcp-utils.c | 2 +- src/dns/nm-dns-manager.c | 11 +- src/dns/nm-dns-systemd-resolved.c | 283 +- src/dns/nm-dns-systemd-resolved.h | 2 + src/initrd/meson.build | 4 +- src/initrd/nm-initrd-generator.c | 2 +- src/meson.build | 11 +- src/nm-active-connection.c | 2 +- src/nm-auth-subject.c | 7 +- src/nm-auth-utils.c | 2 +- src/nm-checkpoint.c | 299 +- src/nm-connectivity.c | 23 +- src/nm-core-utils.c | 8 +- src/nm-core-utils.h | 2 +- src/nm-dbus-manager.c | 296 +- src/nm-dbus-manager.h | 6 +- src/nm-dbus-utils.c | 2 +- src/nm-dcb.c | 38 +- src/nm-dispatcher.c | 2 +- src/nm-hostname-manager.c | 2 +- src/nm-iface-helper.c | 8 +- src/nm-ip4-config.c | 19 +- src/nm-ip4-config.h | 2 +- src/nm-ip6-config.c | 2 +- src/nm-ip6-config.h | 2 +- src/nm-logging.c | 42 +- src/nm-logging.h | 2 +- src/nm-manager.c | 31 +- src/nm-netns.c | 30 +- src/nm-netns.h | 2 + src/nm-policy.c | 2 +- src/nm-rfkill-manager.c | 2 +- src/nm-test-utils-core.h | 4 +- src/nm-types.h | 20 +- src/platform/nm-fake-platform.c | 15 +- src/platform/nm-linux-platform.c | 1203 +++- src/platform/nm-netlink.h | 2 +- src/platform/nm-platform-utils.c | 2 +- src/platform/nm-platform-utils.h | 2 +- src/platform/nm-platform.c | 774 +- src/platform/nm-platform.h | 182 +- src/platform/nmp-object.c | 156 +- src/platform/nmp-object.h | 148 +- src/platform/nmp-rules-manager.c | 737 ++ src/platform/nmp-rules-manager.h | 67 + src/platform/tests/monitor.c | 2 - src/platform/tests/test-common.c | 2 +- src/platform/tests/test-common.h | 52 + src/platform/tests/test-link.c | 36 +- src/platform/tests/test-nmp-object.c | 4 +- src/platform/tests/test-route.c | 864 +++ src/ppp/meson.build | 2 +- src/settings/nm-agent-manager.c | 2 +- src/settings/nm-settings-connection.c | 2 +- src/settings/nm-settings.c | 12 +- src/settings/plugins/README | 33 - src/settings/plugins/ibft/nms-ibft-plugin.c | 23 +- src/settings/plugins/ibft/nms-ibft-reader.c | 66 +- src/settings/plugins/ibft/nms-ibft-reader.h | 8 + src/settings/plugins/ibft/tests/test-ibft.c | 17 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 401 +- src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 164 +- src/settings/plugins/ifcfg-rh/shvar.c | 79 +- src/settings/plugins/ifcfg-rh/shvar.h | 8 + .../ifcfg-Test_Write_Bridge_Component.cexpected | 1 + .../ifcfg-Test_Write_Routing_Rules.cexpected | 19 + .../tests/network-scripts/ifcfg-test-bridge-main | 2 +- .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 130 +- .../plugins/ifupdown/nms-ifupdown-parser.c | 32 +- .../plugins/ifupdown/nms-ifupdown-plugin.c | 12 +- src/settings/plugins/keyfile/nms-keyfile-writer.c | 2 +- src/supplicant/nm-supplicant-interface.c | 2 +- src/systemd/meson.build | 2 +- src/systemd/sd-adapt-core/stat-util.h | 3 - src/systemd/sd-adapt-core/udev-util.h | 3 + .../src/libsystemd-network/dhcp-identifier.c | 8 + src/systemd/src/libsystemd-network/dhcp-network.c | 8 +- src/systemd/src/libsystemd-network/dhcp-option.c | 6 +- src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +- src/systemd/src/libsystemd-network/lldp-neighbor.c | 2 +- .../src/libsystemd-network/network-internal.c | 41 +- .../src/libsystemd-network/network-internal.h | 6 - .../src/libsystemd-network/sd-dhcp-client.c | 2 +- src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 3 + src/systemd/src/libsystemd-network/sd-ipv4acd.c | 2 +- src/systemd/src/libsystemd-network/sd-ipv4ll.c | 32 +- src/systemd/src/libsystemd-network/sd-lldp.c | 2 + src/systemd/src/libsystemd/sd-event/sd-event.c | 4 +- src/systemd/src/libsystemd/sd-id128/id128-util.h | 3 - src/systemd/src/libsystemd/sd-id128/sd-id128.c | 45 +- src/systemd/src/systemd/sd-event.h | 2 +- src/systemd/src/systemd/sd-id128.h | 3 + src/tests/meson.build | 2 +- src/tests/test-systemd.c | 6 +- tools/test-networkmanager-service.py | 82 + 478 files changed, 50357 insertions(+), 33208 deletions(-) delete mode 100644 shared/nm-common-macros.h delete mode 100644 shared/nm-dbus-compat.h delete mode 100644 shared/nm-dispatcher-api.h delete mode 100644 shared/nm-ethtool-utils.c delete mode 100644 shared/nm-ethtool-utils.h create mode 100644 shared/nm-glib-aux/nm-c-list.h create mode 100644 shared/nm-glib-aux/nm-dedup-multi.c create mode 100644 shared/nm-glib-aux/nm-dedup-multi.h create mode 100644 shared/nm-glib-aux/nm-enum-utils.c create mode 100644 shared/nm-glib-aux/nm-enum-utils.h create mode 100644 shared/nm-glib-aux/nm-errno.c create mode 100644 shared/nm-glib-aux/nm-errno.h create mode 100644 shared/nm-glib-aux/nm-glib.h create mode 100644 shared/nm-glib-aux/nm-hash-utils.c create mode 100644 shared/nm-glib-aux/nm-hash-utils.h create mode 100644 shared/nm-glib-aux/nm-io-utils.c create mode 100644 shared/nm-glib-aux/nm-io-utils.h create mode 100644 shared/nm-glib-aux/nm-jansson.h create mode 100644 shared/nm-glib-aux/nm-logging-fwd.h create mode 100644 shared/nm-glib-aux/nm-macros-internal.h create mode 100644 shared/nm-glib-aux/nm-obj.h create mode 100644 shared/nm-glib-aux/nm-random-utils.c create mode 100644 shared/nm-glib-aux/nm-random-utils.h create mode 100644 shared/nm-glib-aux/nm-secret-utils.c create mode 100644 shared/nm-glib-aux/nm-secret-utils.h create mode 100644 shared/nm-glib-aux/nm-shared-utils.c create mode 100644 shared/nm-glib-aux/nm-shared-utils.h create mode 100644 shared/nm-glib-aux/nm-time-utils.c create mode 100644 shared/nm-glib-aux/nm-time-utils.h create mode 100644 shared/nm-libnm-core-aux/nm-dispatcher-api.h create mode 100644 shared/nm-libnm-core-intern/nm-common-macros.h create mode 100644 shared/nm-libnm-core-intern/nm-ethtool-utils.c create mode 100644 shared/nm-libnm-core-intern/nm-ethtool-utils.h create mode 100644 shared/nm-libnm-core-intern/nm-libnm-core-utils.c create mode 100644 shared/nm-libnm-core-intern/nm-libnm-core-utils.h create mode 100644 shared/nm-std-aux/c-list-util.c create mode 100644 shared/nm-std-aux/c-list-util.h create mode 100644 shared/nm-std-aux/nm-dbus-compat.h create mode 100644 shared/nm-std-aux/unaligned.h create mode 100644 shared/nm-udev-aux/nm-udev-utils.c create mode 100644 shared/nm-udev-aux/nm-udev-utils.h delete mode 100644 shared/nm-utils/c-list-util.c delete mode 100644 shared/nm-utils/c-list-util.h delete mode 100644 shared/nm-utils/nm-c-list.h delete mode 100644 shared/nm-utils/nm-dedup-multi.c delete mode 100644 shared/nm-utils/nm-dedup-multi.h delete mode 100644 shared/nm-utils/nm-enum-utils.c delete mode 100644 shared/nm-utils/nm-enum-utils.h delete mode 100644 shared/nm-utils/nm-errno.c delete mode 100644 shared/nm-utils/nm-errno.h delete mode 100644 shared/nm-utils/nm-glib.h delete mode 100644 shared/nm-utils/nm-hash-utils.c delete mode 100644 shared/nm-utils/nm-hash-utils.h delete mode 100644 shared/nm-utils/nm-io-utils.c delete mode 100644 shared/nm-utils/nm-io-utils.h delete mode 100644 shared/nm-utils/nm-jansson.h delete mode 100644 shared/nm-utils/nm-logging-fwd.h delete mode 100644 shared/nm-utils/nm-macros-internal.h delete mode 100644 shared/nm-utils/nm-obj.h delete mode 100644 shared/nm-utils/nm-random-utils.c delete mode 100644 shared/nm-utils/nm-random-utils.h delete mode 100644 shared/nm-utils/nm-secret-utils.c delete mode 100644 shared/nm-utils/nm-secret-utils.h delete mode 100644 shared/nm-utils/nm-shared-utils.c delete mode 100644 shared/nm-utils/nm-shared-utils.h delete mode 100644 shared/nm-utils/nm-time-utils.c delete mode 100644 shared/nm-utils/nm-time-utils.h delete mode 100644 shared/nm-utils/nm-udev-utils.c delete mode 100644 shared/nm-utils/nm-udev-utils.h delete mode 100644 shared/nm-utils/unaligned.h delete mode 100644 shared/systemd/sd-adapt-shared/missing_socket.h create mode 100644 shared/systemd/sd-adapt-shared/namespace-util.h create mode 100644 shared/systemd/sd-adapt-shared/nulstr-util.h create mode 100644 shared/systemd/sd-adapt-shared/strxcpyx.h create mode 100644 shared/systemd/src/basic/errno-util.h create mode 100644 shared/systemd/src/basic/memory-util.c create mode 100644 shared/systemd/src/basic/memory-util.h create mode 100644 shared/systemd/src/basic/missing_socket.h create mode 100644 shared/systemd/src/basic/missing_stat.h delete mode 100644 shared/systemd/src/basic/refcnt.h create mode 100644 shared/systemd/src/basic/sort-util.h create mode 100644 src/platform/nmp-rules-manager.c create mode 100644 src/platform/nmp-rules-manager.h delete mode 100644 src/settings/plugins/README create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected delete mode 100644 src/systemd/sd-adapt-core/stat-util.h create mode 100644 src/systemd/sd-adapt-core/udev-util.h diff --git a/Makefile.am b/Makefile.am index b180466a..d78bfded 100644 --- a/Makefile.am +++ b/Makefile.am @@ -213,6 +213,9 @@ shared_libcsiphash_la_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) +shared_libcsiphash_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + shared_libcsiphash_la_SOURCES = \ shared/c-siphash/src/c-siphash.c \ shared/c-siphash/src/c-siphash.h \ @@ -232,6 +235,9 @@ shared_libcrbtree_la_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) +shared_libcrbtree_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + shared_libcrbtree_la_SOURCES = \ shared/c-rbtree/src/c-rbtree.c \ shared/c-rbtree/src/c-rbtree.h \ @@ -259,6 +265,9 @@ shared_libnacd_la_CPPFLAGS = \ -I$(srcdir)/shared/c-rbtree/src \ $(NULL) +shared_libnacd_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + shared_libnacd_la_SOURCES = \ shared/n-acd/src/n-acd.c \ shared/n-acd/src/n-acd.h \ @@ -280,7 +289,37 @@ shared_libnacd_la_LIBADD = \ ############################################################################### -shared_nm_utils_libnm_utils_cppflags = \ +noinst_LTLIBRARIES += shared/nm-std-aux/libnm-std-aux.la + +shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION='0' \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_SOURCES = \ + shared/c-list/src/c-list.h \ + shared/nm-std-aux/c-list-util.c \ + shared/nm-std-aux/c-list-util.h \ + shared/nm-std-aux/nm-dbus-compat.h \ + shared/nm-std-aux/unaligned.h \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_LIBADD = \ + shared/libcsiphash.la \ + $(NULL) + +############################################################################### + +shared_nm_glib_aux_cppflags = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ $(CODE_COVERAGE_CFLAGS) \ @@ -290,78 +329,143 @@ shared_nm_utils_libnm_utils_cppflags = \ -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ $(NULL) -noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-base.la +noinst_LTLIBRARIES += shared/nm-glib-aux/libnm-glib-aux.la -shared_nm_utils_libnm_utils_base_la_CPPFLAGS = \ - $(shared_nm_utils_libnm_utils_cppflags) \ +shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \ + $(shared_nm_glib_aux_cppflags) \ $(NULL) -shared_nm_utils_libnm_utils_base_la_SOURCES = \ - shared/c-list/src/c-list.h \ - shared/nm-utils/c-list-util.c \ - shared/nm-utils/c-list-util.h \ - shared/nm-utils/nm-c-list.h \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-dedup-multi.h \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-enum-utils.h \ - shared/nm-utils/nm-errno.c \ - shared/nm-utils/nm-errno.h \ - shared/nm-utils/nm-glib.h \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-hash-utils.h \ - shared/nm-utils/nm-io-utils.c \ - shared/nm-utils/nm-io-utils.h \ - shared/nm-utils/nm-logging-fwd.h \ - shared/nm-utils/nm-macros-internal.h \ - shared/nm-utils/nm-obj.h \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-random-utils.h \ - shared/nm-utils/nm-secret-utils.c \ - shared/nm-utils/nm-secret-utils.h \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-shared-utils.h \ - shared/nm-utils/nm-time-utils.c \ - shared/nm-utils/nm-time-utils.h \ - shared/nm-utils/unaligned.h \ +shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ + shared/nm-glib-aux/nm-c-list.h \ + shared/nm-glib-aux/nm-dedup-multi.c \ + shared/nm-glib-aux/nm-dedup-multi.h \ + shared/nm-glib-aux/nm-enum-utils.c \ + shared/nm-glib-aux/nm-enum-utils.h \ + shared/nm-glib-aux/nm-errno.c \ + shared/nm-glib-aux/nm-errno.h \ + shared/nm-glib-aux/nm-glib.h \ + shared/nm-glib-aux/nm-hash-utils.c \ + shared/nm-glib-aux/nm-hash-utils.h \ + shared/nm-glib-aux/nm-io-utils.c \ + shared/nm-glib-aux/nm-io-utils.h \ + shared/nm-glib-aux/nm-jansson.h \ + shared/nm-glib-aux/nm-logging-fwd.h \ + shared/nm-glib-aux/nm-macros-internal.h \ + shared/nm-glib-aux/nm-obj.h \ + shared/nm-glib-aux/nm-random-utils.c \ + shared/nm-glib-aux/nm-random-utils.h \ + shared/nm-glib-aux/nm-secret-utils.c \ + shared/nm-glib-aux/nm-secret-utils.h \ + shared/nm-glib-aux/nm-shared-utils.c \ + shared/nm-glib-aux/nm-shared-utils.h \ + shared/nm-glib-aux/nm-time-utils.c \ + shared/nm-glib-aux/nm-time-utils.h \ $(NULL) -shared_nm_utils_libnm_utils_base_la_LDFLAGS = \ +shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_base_la_LIBADD = \ - shared/libcsiphash.la \ +shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \ + shared/nm-std-aux/libnm-std-aux.la \ $(GLIB_LIBS) \ $(NULL) ############################################################################### -noinst_LTLIBRARIES += shared/nm-utils/libnm-utils-udev.la +noinst_LTLIBRARIES += shared/nm-udev-aux/libnm-udev-aux.la -shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \ - $(shared_nm_utils_libnm_utils_cppflags) \ +shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \ + $(shared_nm_glib_aux_cppflags) \ $(LIBUDEV_CFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_SOURCES = \ - shared/nm-utils/nm-udev-utils.c \ - shared/nm-utils/nm-udev-utils.h \ +shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \ + shared/nm-udev-aux/nm-udev-utils.c \ + shared/nm-udev-aux/nm-udev-utils.h \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \ +shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_LIBADD = \ +shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(NULL) ############################################################################### +noinst_LTLIBRARIES += shared/nm-libnm-core-intern/libnm-libnm-core-intern.la + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \ + shared/nm-libnm-core-intern/nm-common-macros.h \ + shared/nm-libnm-core-intern/nm-ethtool-utils.c \ + shared/nm-libnm-core-intern/nm-ethtool-utils.h \ + shared/nm-libnm-core-intern/nm-libnm-core-utils.c \ + shared/nm-libnm-core-intern/nm-libnm-core-utils.h \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + +$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### + +noinst_LTLIBRARIES += shared/nm-libnm-core-aux/libnm-libnm-core-aux.la + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \ + shared/nm-libnm-core-aux/nm-dispatcher-api.h \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + +$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +############################################################################### + check_programs += shared/nm-utils/tests/test-shared-general shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ @@ -374,8 +478,13 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) +shared_nm_utils_tests_test_shared_general_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) + shared_nm_utils_tests_test_shared_general_LDADD = \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -684,7 +793,6 @@ libnm_core_lib_h_pub_real = \ libnm_core_lib_h_pub_mkenums = \ libnm-core/nm-core-enum-types.h libnm_core_lib_h_priv = \ - shared/nm-ethtool-utils.h \ shared/nm-meta-setting.h \ libnm-core/nm-crypto.h \ libnm-core/nm-crypto-impl.h \ @@ -746,7 +854,6 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-wpan.c libnm_core_lib_c_real = \ $(libnm_core_lib_c_settings_real) \ - shared/nm-ethtool-utils.c \ shared/nm-meta-setting.c \ libnm-core/nm-crypto.c \ libnm-core/nm-connection.c \ @@ -947,22 +1054,28 @@ libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags) libnm_core_tests_test_general_SOURCES = \ libnm-core/tests/test-general-enums.h \ - libnm-core/tests/test-general.c + libnm-core/tests/test-general.c \ + $(NULL) nodist_libnm_core_tests_test_general_SOURCES = \ libnm-core/tests/nm-core-tests-enum-types.c \ - libnm-core/tests/nm-core-tests-enum-types.h + libnm-core/tests/nm-core-tests-enum-types.h \ + $(NULL) libnm_core_tests_ldadd = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ + $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-base.la \ - $(libnm_crypto_lib) \ - $(GLIB_LIBS) + shared/nm-glib-aux/libnm-glib-aux.la \ + $(GLIB_LIBS) \ + $(NULL) libnm_core_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) @@ -1166,10 +1279,12 @@ libnm_libnm_utils_la_SOURCES = \ libnm/nm-libnm-utils.c libnm_libnm_utils_la_LIBADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ introspection/libnmdbus.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -1214,7 +1329,7 @@ libnm_libnm_la_LIBADD = \ libnm/libnm-utils.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-udev.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ $(DL_LIBS) \ $(GLIB_LIBS) \ $(UUID_LIBS) \ @@ -1385,7 +1500,7 @@ libnm_tests_ldadd = \ $(GLIB_LIBS) libnm_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) @@ -1414,6 +1529,7 @@ libnm_tests_test_secret_agent_SOURCES = \ libnm_tests_test_general_LDADD = \ libnm/libnm-utils.la \ $(libnm_tests_ldadd) + libnm_tests_test_nm_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_remote_settings_client_LDADD = $(libnm_tests_ldadd) libnm_tests_test_secret_agent_LDADD = $(libnm_tests_ldadd) @@ -1585,15 +1701,17 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/sd-adapt-shared/locale-util.h \ shared/systemd/sd-adapt-shared/memfd-util.h \ shared/systemd/sd-adapt-shared/missing.h \ - shared/systemd/sd-adapt-shared/missing_socket.h \ shared/systemd/sd-adapt-shared/missing_syscall.h \ shared/systemd/sd-adapt-shared/missing_timerfd.h \ shared/systemd/sd-adapt-shared/mkdir.h \ + shared/systemd/sd-adapt-shared/namespace-util.h \ shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \ shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \ + shared/systemd/sd-adapt-shared/nulstr-util.h \ shared/systemd/sd-adapt-shared/procfs-util.h \ shared/systemd/sd-adapt-shared/raw-clone.h \ shared/systemd/sd-adapt-shared/rlimit-util.h \ + shared/systemd/sd-adapt-shared/strxcpyx.h \ shared/systemd/sd-adapt-shared/terminal-util.h \ shared/systemd/sd-adapt-shared/unaligned.h \ shared/systemd/sd-adapt-shared/user-util.h \ @@ -1605,6 +1723,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/env-file.h \ shared/systemd/src/basic/env-util.c \ shared/systemd/src/basic/env-util.h \ + shared/systemd/src/basic/errno-util.h \ shared/systemd/src/basic/escape.c \ shared/systemd/src/basic/escape.h \ shared/systemd/src/basic/ether-addr-util.c \ @@ -1632,9 +1751,13 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/list.h \ shared/systemd/src/basic/log.h \ shared/systemd/src/basic/macro.h \ + shared/systemd/src/basic/memory-util.c \ + shared/systemd/src/basic/memory-util.h \ shared/systemd/src/basic/mempool.c \ shared/systemd/src/basic/mempool.h \ shared/systemd/src/basic/missing_fcntl.h \ + shared/systemd/src/basic/missing_socket.h \ + shared/systemd/src/basic/missing_stat.h \ shared/systemd/src/basic/missing_type.h \ shared/systemd/src/basic/parse-util.c \ shared/systemd/src/basic/parse-util.h \ @@ -1646,12 +1769,12 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/process-util.h \ shared/systemd/src/basic/random-util.c \ shared/systemd/src/basic/random-util.h \ - shared/systemd/src/basic/refcnt.h \ shared/systemd/src/basic/set.h \ shared/systemd/src/basic/signal-util.h \ shared/systemd/src/basic/siphash24.h \ shared/systemd/src/basic/socket-util.c \ shared/systemd/src/basic/socket-util.h \ + shared/systemd/src/basic/sort-util.h \ shared/systemd/src/basic/sparse-endian.h \ shared/systemd/src/basic/stat-util.c \ shared/systemd/src/basic/stat-util.h \ @@ -1709,7 +1832,7 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/sd-adapt-core/nm-sd-adapt-core.h \ src/systemd/sd-adapt-core/sd-daemon.h \ src/systemd/sd-adapt-core/sd-device.h \ - src/systemd/sd-adapt-core/stat-util.h \ + src/systemd/sd-adapt-core/udev-util.h \ src/systemd/src/libsystemd-network/arp-util.c \ src/systemd/src/libsystemd-network/arp-util.h \ src/systemd/src/libsystemd-network/dhcp-identifier.c \ @@ -1795,6 +1918,8 @@ src_libNetworkManagerBase_la_SOURCES = \ src/platform/nm-platform-private.h \ src/platform/nm-linux-platform.c \ src/platform/nm-linux-platform.h \ + src/platform/nmp-rules-manager.c \ + src/platform/nmp-rules-manager.h \ src/platform/wifi/nm-wifi-utils-nl80211.c \ src/platform/wifi/nm-wifi-utils-nl80211.h \ src/platform/wifi/nm-wifi-utils-private.h \ @@ -1839,10 +1964,12 @@ src_libNetworkManagerBase_la_SOURCES += \ endif src_libNetworkManagerBase_la_LIBADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ - shared/nm-utils/libnm-utils-udev.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -2145,11 +2272,10 @@ src_initrd_nm_initrd_generator_SOURCES = \ src/initrd/nm-initrd-generator.c src_initrd_nm_initrd_generator_LDADD = \ - libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerBase.la \ shared/systemd/libnm-systemd-shared.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -2169,10 +2295,9 @@ src_initrd_tests_test_ibft_reader_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) src_initrd_tests_test_ibft_reader_LDADD = \ - libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -2385,10 +2510,9 @@ src_initrd_tests_test_cmdline_reader_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) src_initrd_tests_test_cmdline_reader_LDADD = \ - libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -2771,6 +2895,7 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \ @@ -3698,6 +3823,10 @@ $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) src_tests_test_systemd_CPPFLAGS = \ $(src_libnm_systemd_core_la_cppflags) \ -DNETWORKMANAGER_COMPILATION_TEST + +src_tests_test_systemd_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + src_tests_test_systemd_LDADD = \ src/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ @@ -3755,9 +3884,9 @@ $(dispatcher_nm_dispatcher_OBJECTS): $(dispatcher_nmdbus_dispatcher_sources) CLEANFILES += $(dispatcher_nmdbus_dispatcher_sources) dispatcher_libnm_dispatcher_core_la_SOURCES = \ - shared/nm-dispatcher-api.h \ dispatcher/nm-dispatcher-utils.c \ - dispatcher/nm-dispatcher-utils.h + dispatcher/nm-dispatcher-utils.h \ + $(NULL) dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) @@ -3766,8 +3895,8 @@ dispatcher_libnm_dispatcher_core_la_LIBADD = \ $(GLIB_LIBS) dispatcher_nm_dispatcher_SOURCES = \ - shared/nm-dispatcher-api.h \ - dispatcher/nm-dispatcher.c + dispatcher/nm-dispatcher.c \ + $(NULL) nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) @@ -3837,8 +3966,9 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) dispatcher_tests_test_dispatcher_envp_LDADD = \ - libnm/libnm.la \ dispatcher/libnm-dispatcher-core.la \ + libnm/libnm.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -3921,7 +4051,7 @@ clients_common_libnmc_base_la_CPPFLAGS = \ clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -3956,9 +4086,6 @@ clients_common_libnmc_la_SOURCES = \ shared/nm-meta-setting.c \ shared/nm-meta-setting.h \ \ - shared/nm-ethtool-utils.c \ - shared/nm-ethtool-utils.h \ - \ clients/common/nm-meta-setting-desc.c \ clients/common/nm-meta-setting-desc.h \ clients/common/nm-meta-setting-access.c \ @@ -3971,8 +4098,10 @@ clients_common_libnmc_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_la_LIBADD = \ - libnm/libnm.la \ clients/common/libnmc-base.la \ + libnm/libnm.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ $(GLIB_LIBS) $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -4251,6 +4380,7 @@ clients_tui_nmtui_LDADD = \ libnm/libnm.la \ clients/tui/newt/libnmt-newt.a \ clients/common/libnmc-base.la \ + clients/common/libnmc.la \ $(GLIB_LIBS) \ $(NEWT_LIBS) \ $(NULL) @@ -4510,7 +4640,7 @@ nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_ut $(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) libnm_util_libnm_util_la_LIBADD = \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ $(UUID_LIBS) @@ -4832,7 +4962,7 @@ libnm_glib_libnm_glib_la_LDFLAGS = \ libnm_glib_libnm_glib_la_LIBADD = \ libnm-util/libnm-util.la \ libnm-glib/libdeprecated-nm-glib.la \ - shared/nm-utils/libnm-utils-udev.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ $(LIBUDEV_LIBS) \ @@ -5246,15 +5376,11 @@ EXTRA_DIST += \ \ po/meson.build \ \ - shared/nm-common-macros.h \ - shared/nm-dbus-compat.h \ shared/nm-default.h \ - shared/nm-dispatcher-api.h \ shared/nm-test-libnm-utils.h \ shared/nm-test-utils-impl.c \ shared/nm-utils/nm-compat.c \ shared/nm-utils/nm-compat.h \ - shared/nm-utils/nm-jansson.h \ shared/nm-utils/nm-test-utils.h \ shared/nm-utils/nm-vpn-editor-plugin-call.h \ shared/nm-utils/nm-vpn-plugin-macros.h \ @@ -5275,7 +5401,6 @@ EXTRA_DIST += \ tools/test-sudo-wrapper.sh \ tools/enums-to-docbook.pl \ \ - src/settings/plugins/README \ src/settings/plugins/meson.build \ \ $(NULL) diff --git a/Makefile.in b/Makefile.in index 71238e0b..09f7e0fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -667,7 +667,7 @@ clients_tui_newt_libnmt_newt_a_OBJECTS = \ $(am_clients_tui_newt_libnmt_newt_a_OBJECTS) am__DEPENDENCIES_1 = clients_common_libnmc_base_la_DEPENDENCIES = libnm/libnm.la \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) am_clients_common_libnmc_base_la_OBJECTS = \ clients/common/libnmc_base_la-nm-secret-agent-simple.lo \ clients/common/libnmc_base_la-nm-vpn-helpers.lo \ @@ -680,11 +680,13 @@ am__v_lt_0 = --silent am__v_lt_1 = @ENABLE_TESTS_FALSE@am_clients_common_libnmc_base_la_rpath = @ENABLE_TESTS_TRUE@am_clients_common_libnmc_base_la_rpath = -clients_common_libnmc_la_DEPENDENCIES = libnm/libnm.la \ - clients/common/libnmc-base.la $(am__DEPENDENCIES_1) +clients_common_libnmc_la_DEPENDENCIES = clients/common/libnmc-base.la \ + libnm/libnm.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + $(am__DEPENDENCIES_1) am_clients_common_libnmc_la_OBJECTS = \ shared/clients_common_libnmc_la-nm-meta-setting.lo \ - shared/clients_common_libnmc_la-nm-ethtool-utils.lo \ clients/common/libnmc_la-nm-meta-setting-desc.lo \ clients/common/libnmc_la-nm-meta-setting-access.lo clients_common_libnmc_la_OBJECTS = \ @@ -789,9 +791,9 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-utils.h libnm-core/nm-version.h \ libnm-core/nm-vpn-dbus-interface.h \ libnm-core/nm-vpn-editor-plugin.h \ - libnm-core/nm-vpn-plugin-info.h shared/nm-ethtool-utils.h \ - shared/nm-meta-setting.h libnm-core/nm-crypto.h \ - libnm-core/nm-crypto-impl.h libnm-core/nm-connection-private.h \ + libnm-core/nm-vpn-plugin-info.h shared/nm-meta-setting.h \ + libnm-core/nm-crypto.h libnm-core/nm-crypto-impl.h \ + libnm-core/nm-connection-private.h \ libnm-core/nm-core-internal.h \ libnm-core/nm-core-types-internal.h \ libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \ @@ -828,13 +830,12 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-wireguard.c \ libnm-core/nm-setting-wireless-security.c \ libnm-core/nm-setting-wireless.c libnm-core/nm-setting-wpan.c \ - shared/nm-ethtool-utils.c shared/nm-meta-setting.c \ - libnm-core/nm-crypto.c libnm-core/nm-connection.c \ - libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \ - libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-property-compare.c libnm-core/nm-setting.c \ - libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ - libnm-core/nm-vpn-editor-plugin.c \ + shared/nm-meta-setting.c libnm-core/nm-crypto.c \ + libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c libnm-core/nm-keyfile.c \ + libnm-core/nm-keyfile-utils.c libnm-core/nm-property-compare.c \ + libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \ + libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c libnm-core/nm-json.c am__objects_2 = am__objects_3 = $(am__objects_2) @@ -887,7 +888,6 @@ am__objects_4 = libnm-core/libnm_core_la-nm-setting-6lowpan.lo \ libnm-core/libnm_core_la-nm-setting-wpan.lo @WITH_JSON_VALIDATION_TRUE@am__objects_5 = libnm-core/libnm_core_la-nm-json.lo am__objects_6 = $(am__objects_4) \ - shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo \ shared/libnm_core_libnm_core_la-nm-meta-setting.lo \ libnm-core/libnm_core_la-nm-crypto.lo \ libnm-core/libnm_core_la-nm-connection.lo \ @@ -982,7 +982,7 @@ libnm_glib_libnm_glib_vpn_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libdeprecated-nm-glib.la \ -@WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-utils/libnm-utils-udev.la \ +@WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-udev-aux/libnm-udev-aux.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) @@ -1067,7 +1067,7 @@ libnm_glib_libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@ -rpath $(libdir) @WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) @WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES = shared/nm-utils/libnm-utils-base.la \ +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES = shared/nm-glib-aux/libnm-glib-aux.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @@ -1185,9 +1185,12 @@ libnm_util_libtest_crypto_la_OBJECTS = \ $(am_libnm_util_libtest_crypto_la_OBJECTS) @ENABLE_TESTS_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath = @ENABLE_TESTS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_rpath = -libnm_libnm_utils_la_DEPENDENCIES = libnm-core/libnm-core.la \ - $(libnm_crypto_lib) introspection/libnmdbus.la \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) +libnm_libnm_utils_la_DEPENDENCIES = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + libnm-core/libnm-core.la $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + introspection/libnmdbus.la \ + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) am_libnm_libnm_utils_la_OBJECTS = \ libnm/libnm_utils_la-nm-libnm-utils.lo @HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_OBJECTS = libnm/fake-typelib/libnm_utils_la-typelibs.lo @@ -1196,7 +1199,7 @@ libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) \ libnm_libnm_la_DEPENDENCIES = libnm/libnm-utils.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-udev.la $(am__DEPENDENCIES_1) \ + shared/nm-udev-aux/libnm-udev-aux.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__objects_18 = libnm/libnm_la-nm-access-point.lo \ libnm/libnm_la-nm-active-connection.lo \ @@ -1273,12 +1276,16 @@ am_shared_libcrbtree_la_OBJECTS = \ shared_libcrbtree_la_OBJECTS = $(am_shared_libcrbtree_la_OBJECTS) shared_libcrbtree_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(shared_libcrbtree_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(shared_libcrbtree_la_CFLAGS) $(CFLAGS) \ + $(shared_libcrbtree_la_LDFLAGS) $(LDFLAGS) -o $@ shared_libcsiphash_la_LIBADD = am_shared_libcsiphash_la_OBJECTS = \ shared/c-siphash/src/libcsiphash_la-c-siphash.lo shared_libcsiphash_la_OBJECTS = $(am_shared_libcsiphash_la_OBJECTS) +shared_libcsiphash_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(shared_libcsiphash_la_LDFLAGS) \ + $(LDFLAGS) -o $@ shared_libnacd_la_DEPENDENCIES = shared/libcrbtree.la am__shared_libnacd_la_SOURCES_DIST = shared/n-acd/src/n-acd.c \ shared/n-acd/src/n-acd.h shared/n-acd/src/n-acd-private.h \ @@ -1295,38 +1302,66 @@ am_shared_libnacd_la_OBJECTS = shared/n-acd/src/libnacd_la-n-acd.lo \ shared_libnacd_la_OBJECTS = $(am_shared_libnacd_la_OBJECTS) shared_libnacd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(shared_libnacd_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -shared_nm_utils_libnm_utils_base_la_DEPENDENCIES = \ - shared/libcsiphash.la $(am__DEPENDENCIES_1) -am_shared_nm_utils_libnm_utils_base_la_OBJECTS = \ - shared/nm-utils/libnm_utils_base_la-c-list-util.lo \ - shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo \ - shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo \ - shared/nm-utils/libnm_utils_base_la-nm-errno.lo \ - shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo \ - shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo \ - shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo \ - shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo \ - shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo \ - shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo -shared_nm_utils_libnm_utils_base_la_OBJECTS = \ - $(am_shared_nm_utils_libnm_utils_base_la_OBJECTS) -shared_nm_utils_libnm_utils_base_la_LINK = $(LIBTOOL) $(AM_V_lt) \ + $(shared_libnacd_la_CFLAGS) $(CFLAGS) \ + $(shared_libnacd_la_LDFLAGS) $(LDFLAGS) -o $@ +shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES = \ + shared/nm-std-aux/libnm-std-aux.la $(am__DEPENDENCIES_1) +am_shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS = \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo \ + shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo +shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS = \ + $(am_shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) +shared_nm_glib_aux_libnm_glib_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(shared_nm_utils_libnm_utils_base_la_LDFLAGS) $(LDFLAGS) -o \ + $(shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS) $(LDFLAGS) -o \ $@ -shared_nm_utils_libnm_utils_udev_la_DEPENDENCIES = \ +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) +am_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS = +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS = $(am_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS) +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LINK = $(LIBTOOL) \ + $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES = \ + $(am__DEPENDENCIES_1) +am_shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS = shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo \ + shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS = $(am_shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS) +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK = \ + $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +shared_nm_std_aux_libnm_std_aux_la_DEPENDENCIES = \ + shared/libcsiphash.la +am_shared_nm_std_aux_libnm_std_aux_la_OBJECTS = \ + shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo +shared_nm_std_aux_libnm_std_aux_la_OBJECTS = \ + $(am_shared_nm_std_aux_libnm_std_aux_la_OBJECTS) +shared_nm_std_aux_libnm_std_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(shared_nm_std_aux_libnm_std_aux_la_LDFLAGS) $(LDFLAGS) -o $@ +shared_nm_udev_aux_libnm_udev_aux_la_DEPENDENCIES = \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am_shared_nm_utils_libnm_utils_udev_la_OBJECTS = \ - shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo -shared_nm_utils_libnm_utils_udev_la_OBJECTS = \ - $(am_shared_nm_utils_libnm_utils_udev_la_OBJECTS) -shared_nm_utils_libnm_utils_udev_la_LINK = $(LIBTOOL) $(AM_V_lt) \ +am_shared_nm_udev_aux_libnm_udev_aux_la_OBJECTS = \ + shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo +shared_nm_udev_aux_libnm_udev_aux_la_OBJECTS = \ + $(am_shared_nm_udev_aux_libnm_udev_aux_la_OBJECTS) +shared_nm_udev_aux_libnm_udev_aux_la_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(shared_nm_utils_libnm_utils_udev_la_LDFLAGS) $(LDFLAGS) -o \ + $(shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS) $(LDFLAGS) -o \ $@ shared_systemd_libnm_systemd_logging_stub_la_DEPENDENCIES = \ $(am__DEPENDENCIES_2) @@ -1352,6 +1387,7 @@ am_shared_systemd_libnm_systemd_shared_la_OBJECTS = \ shared/systemd/src/basic/libnm_systemd_shared_la-hostname-util.lo \ shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo \ shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo \ + shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo \ shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo \ shared/systemd/src/basic/libnm_systemd_shared_la-parse-util.lo \ shared/systemd/src/basic/libnm_systemd_shared_la-path-util.lo \ @@ -1643,9 +1679,12 @@ am_src_libNetworkManager_la_OBJECTS = \ src/libNetworkManager_la-nm-sleep-monitor.lo src_libNetworkManager_la_OBJECTS = \ $(am_src_libNetworkManager_la_OBJECTS) -src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \ - $(libnm_crypto_lib) shared/nm-utils/libnm-utils-udev.la \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) \ +src_libNetworkManagerBase_la_DEPENDENCIES = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + libnm-core/libnm-core.la $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \ @@ -1658,6 +1697,8 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/platform/nm-platform.h src/platform/nm-platform-private.h \ src/platform/nm-linux-platform.c \ src/platform/nm-linux-platform.h \ + src/platform/nmp-rules-manager.c \ + src/platform/nmp-rules-manager.h \ src/platform/wifi/nm-wifi-utils-nl80211.c \ src/platform/wifi/nm-wifi-utils-nl80211.h \ src/platform/wifi/nm-wifi-utils-private.h \ @@ -1688,6 +1729,7 @@ am_src_libNetworkManagerBase_la_OBJECTS = \ src/platform/libNetworkManagerBase_la-nm-platform-utils.lo \ src/platform/libNetworkManagerBase_la-nm-platform.lo \ src/platform/libNetworkManagerBase_la-nm-linux-platform.lo \ + src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo \ src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo \ src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils.lo \ src/platform/wpan/libNetworkManagerBase_la-nm-wpan-utils.lo \ @@ -2011,6 +2053,7 @@ clients_tui_nmtui_OBJECTS = $(am_clients_tui_nmtui_OBJECTS) @BUILD_NMTUI_TRUE@clients_tui_nmtui_DEPENDENCIES = libnm/libnm.la \ @BUILD_NMTUI_TRUE@ clients/tui/newt/libnmt-newt.a \ @BUILD_NMTUI_TRUE@ clients/common/libnmc-base.la \ +@BUILD_NMTUI_TRUE@ clients/common/libnmc.la \ @BUILD_NMTUI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -2032,8 +2075,9 @@ dispatcher_nm_dispatcher_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ dispatcher_tests_test_dispatcher_envp_SOURCES = \ dispatcher/tests/test-dispatcher-envp.c dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/test_dispatcher_envp-test-dispatcher-envp.$(OBJEXT) -dispatcher_tests_test_dispatcher_envp_DEPENDENCIES = libnm/libnm.la \ - dispatcher/libnm-dispatcher-core.la $(am__DEPENDENCIES_1) +dispatcher_tests_test_dispatcher_envp_DEPENDENCIES = \ + dispatcher/libnm-dispatcher-core.la libnm/libnm.la \ + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) dispatcher_tests_test_dispatcher_envp_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2112,11 +2156,12 @@ libnm_core_tests_test_compare_SOURCES = \ libnm-core/tests/test-compare.c libnm_core_tests_test_compare_OBJECTS = \ libnm-core/tests/test_compare-test-compare.$(OBJEXT) -am__DEPENDENCIES_8 = libnm-core/libnm-core.la \ +am__DEPENDENCIES_8 = shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + libnm-core/libnm-core.la $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-base.la $(libnm_crypto_lib) \ - $(am__DEPENDENCIES_1) + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_8) libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -2328,7 +2373,12 @@ shared_nm_utils_tests_test_shared_general_SOURCES = \ shared/nm-utils/tests/test-shared-general.c shared_nm_utils_tests_test_shared_general_OBJECTS = shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT) shared_nm_utils_tests_test_shared_general_DEPENDENCIES = \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) +shared_nm_utils_tests_test_shared_general_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(shared_nm_utils_tests_test_shared_general_LDFLAGS) \ + $(LDFLAGS) -o $@ am_src_NetworkManager_OBJECTS = src/NetworkManager-main.$(OBJEXT) src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS) src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la @@ -2413,10 +2463,9 @@ am_src_initrd_nm_initrd_generator_OBJECTS = \ src_initrd_nm_initrd_generator_OBJECTS = \ $(am_src_initrd_nm_initrd_generator_OBJECTS) src_initrd_nm_initrd_generator_DEPENDENCIES = \ - libnm-core/libnm-core.la src/initrd/libnmi-core.la \ - src/libNetworkManagerBase.la \ + src/initrd/libnmi-core.la src/libNetworkManagerBase.la \ shared/systemd/libnm-systemd-shared.la \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) src_initrd_nm_initrd_generator_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) \ @@ -2425,9 +2474,8 @@ src_initrd_tests_test_cmdline_reader_SOURCES = \ src/initrd/tests/test-cmdline-reader.c src_initrd_tests_test_cmdline_reader_OBJECTS = src/initrd/tests/test_cmdline_reader-test-cmdline-reader.$(OBJEXT) src_initrd_tests_test_cmdline_reader_DEPENDENCIES = \ - libnm-core/libnm-core.la src/initrd/libnmi-core.la \ - src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) + src/initrd/libnmi-core.la src/libNetworkManagerTest.la \ + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) src_initrd_tests_test_cmdline_reader_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2438,9 +2486,8 @@ src_initrd_tests_test_ibft_reader_SOURCES = \ src_initrd_tests_test_ibft_reader_OBJECTS = \ src/initrd/tests/test_ibft_reader-test-ibft-reader.$(OBJEXT) src_initrd_tests_test_ibft_reader_DEPENDENCIES = \ - libnm-core/libnm-core.la src/initrd/libnmi-core.la \ - src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la $(am__DEPENDENCIES_1) + src/initrd/libnmi-core.la src/libNetworkManagerTest.la \ + shared/nm-glib-aux/libnm-glib-aux.la $(am__DEPENDENCIES_1) src_initrd_tests_test_ibft_reader_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2701,6 +2748,10 @@ src_tests_test_systemd_OBJECTS = \ src_tests_test_systemd_DEPENDENCIES = src/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la shared/libcsiphash.la \ $(am__DEPENDENCIES_6) +src_tests_test_systemd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(src_tests_test_systemd_LDFLAGS) \ + $(LDFLAGS) -o $@ src_tests_test_utils_SOURCES = src/tests/test-utils.c src_tests_test_utils_OBJECTS = \ src/tests/test_utils-test-utils.$(OBJEXT) @@ -3088,9 +3139,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \ libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po \ libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po \ libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po \ - shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo \ shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo \ - shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo \ shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo \ shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po \ shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po \ @@ -3104,19 +3153,21 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \ shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo \ shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo \ shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo \ + shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo \ + shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo \ + shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo \ + shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo \ + shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo \ shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo \ shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo \ - shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo \ shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po \ shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo \ shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo \ @@ -3135,6 +3186,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \ shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo \ shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo \ shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo \ + shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Plo \ shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo \ shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo \ shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo \ @@ -3283,6 +3335,7 @@ am__depfiles_remade = clients/$(DEPDIR)/nm_online-nm-online.Po \ src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo \ src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo \ src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo \ + src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo \ src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo \ src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo \ src/platform/tests/$(DEPDIR)/monitor-monitor.Po \ @@ -3434,8 +3487,11 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \ $(shared_libcrbtree_la_SOURCES) \ $(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \ - $(shared_nm_utils_libnm_utils_base_la_SOURCES) \ - $(shared_nm_utils_libnm_utils_udev_la_SOURCES) \ + $(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \ + $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \ + $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \ + $(shared_nm_std_aux_libnm_std_aux_la_SOURCES) \ + $(shared_nm_udev_aux_libnm_udev_aux_la_SOURCES) \ $(shared_systemd_libnm_systemd_logging_stub_la_SOURCES) \ $(shared_systemd_libnm_systemd_shared_la_SOURCES) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \ @@ -3548,8 +3604,11 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(shared_libcrbtree_la_SOURCES) \ $(shared_libcsiphash_la_SOURCES) \ $(am__shared_libnacd_la_SOURCES_DIST) \ - $(shared_nm_utils_libnm_utils_base_la_SOURCES) \ - $(shared_nm_utils_libnm_utils_udev_la_SOURCES) \ + $(shared_nm_glib_aux_libnm_glib_aux_la_SOURCES) \ + $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES) \ + $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES) \ + $(shared_nm_std_aux_libnm_std_aux_la_SOURCES) \ + $(shared_nm_udev_aux_libnm_udev_aux_la_SOURCES) \ $(shared_systemd_libnm_systemd_logging_stub_la_SOURCES) \ $(shared_systemd_libnm_systemd_shared_la_SOURCES) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \ @@ -4300,13 +4359,23 @@ AUTOMAKE_OPTIONS = subdir-objects ############################################################################### +############################################################################### + +############################################################################### + +############################################################################### + ############################################################################### noinst_LTLIBRARIES = shared/libcsiphash.la shared/libcrbtree.la \ - shared/libnacd.la shared/nm-utils/libnm-utils-base.la \ - shared/nm-utils/libnm-utils-udev.la introspection/libnmdbus.la \ - libnm-core/libnm-core.la $(libnm_crypto_lib) \ - libnm/libnm-utils.la src/libNetworkManagerBase.la \ - src/libNetworkManager.la src/libnm-systemd-core.la $(NULL) \ + shared/libnacd.la shared/nm-std-aux/libnm-std-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + introspection/libnmdbus.la libnm-core/libnm-core.la \ + $(libnm_crypto_lib) libnm/libnm-utils.la \ + src/libNetworkManagerBase.la src/libNetworkManager.la \ + src/libnm-systemd-core.la $(NULL) \ shared/systemd/libnm-systemd-logging-stub.la \ shared/systemd/libnm-systemd-shared.la \ src/initrd/libnmi-core.la $(am__append_25) $(am__append_29) \ @@ -4653,6 +4722,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bridge_Component.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Proxy_Basic.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Infiniband_Port.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Team_Port.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected \ @@ -4935,11 +5005,9 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ linker-script-settings.ver src/ppp/nm-ppp-plugin.ver \ Makefile.glib autogen.sh valgrind.suppressions meson.build \ meson_options.txt config.h.meson config-extra.h.meson \ - docs/meson.build po/meson.build shared/nm-common-macros.h \ - shared/nm-dbus-compat.h shared/nm-default.h \ - shared/nm-dispatcher-api.h shared/nm-test-libnm-utils.h \ - shared/nm-test-utils-impl.c shared/nm-utils/nm-compat.c \ - shared/nm-utils/nm-compat.h shared/nm-utils/nm-jansson.h \ + docs/meson.build po/meson.build shared/nm-default.h \ + shared/nm-test-libnm-utils.h shared/nm-test-utils-impl.c \ + shared/nm-utils/nm-compat.c shared/nm-utils/nm-compat.h \ shared/nm-utils/nm-test-utils.h \ shared/nm-utils/nm-vpn-editor-plugin-call.h \ shared/nm-utils/nm-vpn-plugin-macros.h \ @@ -4952,8 +5020,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ tools/meson-post-install.sh tools/run-nm-test.sh \ tools/test-networkmanager-service.py \ tools/test-sudo-wrapper.sh tools/enums-to-docbook.pl \ - src/settings/plugins/README src/settings/plugins/meson.build \ - $(NULL) examples/C/glib/meson.build \ + src/settings/plugins/meson.build $(NULL) \ + examples/C/glib/meson.build \ examples/C/qt/add-connection-wired.cpp \ examples/C/qt/list-connections.cpp \ examples/C/qt/change-ipv4-addresses.cpp \ @@ -5187,6 +5255,9 @@ shared_libcsiphash_la_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) +shared_libcsiphash_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + shared_libcsiphash_la_SOURCES = \ shared/c-siphash/src/c-siphash.c \ shared/c-siphash/src/c-siphash.h \ @@ -5202,6 +5273,9 @@ shared_libcrbtree_la_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) +shared_libcrbtree_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + shared_libcrbtree_la_SOURCES = \ shared/c-rbtree/src/c-rbtree.c \ shared/c-rbtree/src/c-rbtree.h \ @@ -5225,6 +5299,9 @@ shared_libnacd_la_CPPFLAGS = \ -I$(srcdir)/shared/c-rbtree/src \ $(NULL) +shared_libnacd_la_LDFLAGS = \ + $(SANITIZER_LIB_LDFLAGS) + shared_libnacd_la_SOURCES = shared/n-acd/src/n-acd.c \ shared/n-acd/src/n-acd.h shared/n-acd/src/n-acd-private.h \ shared/n-acd/src/n-acd-probe.c shared/n-acd/src/util/timer.c \ @@ -5234,9 +5311,35 @@ shared_libnacd_la_LIBADD = \ shared/libcrbtree.la \ $(NULL) +shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION='0' \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_SOURCES = \ + shared/c-list/src/c-list.h \ + shared/nm-std-aux/c-list-util.c \ + shared/nm-std-aux/c-list-util.h \ + shared/nm-std-aux/nm-dbus-compat.h \ + shared/nm-std-aux/unaligned.h \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_std_aux_libnm_std_aux_la_LIBADD = \ + shared/libcsiphash.la \ + $(NULL) + ############################################################################### -shared_nm_utils_libnm_utils_cppflags = \ +shared_nm_glib_aux_cppflags = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ $(CODE_COVERAGE_CFLAGS) \ @@ -5246,70 +5349,123 @@ shared_nm_utils_libnm_utils_cppflags = \ -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ $(NULL) -shared_nm_utils_libnm_utils_base_la_CPPFLAGS = \ - $(shared_nm_utils_libnm_utils_cppflags) \ +shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS = \ + $(shared_nm_glib_aux_cppflags) \ $(NULL) -shared_nm_utils_libnm_utils_base_la_SOURCES = \ - shared/c-list/src/c-list.h \ - shared/nm-utils/c-list-util.c \ - shared/nm-utils/c-list-util.h \ - shared/nm-utils/nm-c-list.h \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-dedup-multi.h \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-enum-utils.h \ - shared/nm-utils/nm-errno.c \ - shared/nm-utils/nm-errno.h \ - shared/nm-utils/nm-glib.h \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-hash-utils.h \ - shared/nm-utils/nm-io-utils.c \ - shared/nm-utils/nm-io-utils.h \ - shared/nm-utils/nm-logging-fwd.h \ - shared/nm-utils/nm-macros-internal.h \ - shared/nm-utils/nm-obj.h \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-random-utils.h \ - shared/nm-utils/nm-secret-utils.c \ - shared/nm-utils/nm-secret-utils.h \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-shared-utils.h \ - shared/nm-utils/nm-time-utils.c \ - shared/nm-utils/nm-time-utils.h \ - shared/nm-utils/unaligned.h \ +shared_nm_glib_aux_libnm_glib_aux_la_SOURCES = \ + shared/nm-glib-aux/nm-c-list.h \ + shared/nm-glib-aux/nm-dedup-multi.c \ + shared/nm-glib-aux/nm-dedup-multi.h \ + shared/nm-glib-aux/nm-enum-utils.c \ + shared/nm-glib-aux/nm-enum-utils.h \ + shared/nm-glib-aux/nm-errno.c \ + shared/nm-glib-aux/nm-errno.h \ + shared/nm-glib-aux/nm-glib.h \ + shared/nm-glib-aux/nm-hash-utils.c \ + shared/nm-glib-aux/nm-hash-utils.h \ + shared/nm-glib-aux/nm-io-utils.c \ + shared/nm-glib-aux/nm-io-utils.h \ + shared/nm-glib-aux/nm-jansson.h \ + shared/nm-glib-aux/nm-logging-fwd.h \ + shared/nm-glib-aux/nm-macros-internal.h \ + shared/nm-glib-aux/nm-obj.h \ + shared/nm-glib-aux/nm-random-utils.c \ + shared/nm-glib-aux/nm-random-utils.h \ + shared/nm-glib-aux/nm-secret-utils.c \ + shared/nm-glib-aux/nm-secret-utils.h \ + shared/nm-glib-aux/nm-shared-utils.c \ + shared/nm-glib-aux/nm-shared-utils.h \ + shared/nm-glib-aux/nm-time-utils.c \ + shared/nm-glib-aux/nm-time-utils.h \ $(NULL) -shared_nm_utils_libnm_utils_base_la_LDFLAGS = \ +shared_nm_glib_aux_libnm_glib_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_base_la_LIBADD = \ - shared/libcsiphash.la \ +shared_nm_glib_aux_libnm_glib_aux_la_LIBADD = \ + shared/nm-std-aux/libnm-std-aux.la \ $(GLIB_LIBS) \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_CPPFLAGS = \ - $(shared_nm_utils_libnm_utils_cppflags) \ +shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS = \ + $(shared_nm_glib_aux_cppflags) \ $(LIBUDEV_CFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_SOURCES = \ - shared/nm-utils/nm-udev-utils.c \ - shared/nm-utils/nm-udev-utils.h \ +shared_nm_udev_aux_libnm_udev_aux_la_SOURCES = \ + shared/nm-udev-aux/nm-udev-utils.c \ + shared/nm-udev-aux/nm-udev-utils.h \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_LDFLAGS = \ +shared_nm_udev_aux_libnm_udev_aux_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) \ $(SANITIZER_LIB_LDFLAGS) \ $(NULL) -shared_nm_utils_libnm_utils_udev_la_LIBADD = \ +shared_nm_udev_aux_libnm_udev_aux_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ $(NULL) +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_SOURCES = \ + shared/nm-libnm-core-intern/nm-common-macros.h \ + shared/nm-libnm-core-intern/nm-ethtool-utils.c \ + shared/nm-libnm-core-intern/nm-ethtool-utils.h \ + shared/nm-libnm-core-intern/nm-libnm-core-utils.c \ + shared/nm-libnm-core-intern/nm-libnm-core-utils.h \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \ + $(dflt_cppflags) \ + -I$(srcdir)/shared \ + -I$(builddir)/shared \ + -I$(srcdir)/libnm-core \ + -I$(builddir)/libnm-core \ + $(CODE_COVERAGE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""libnm"\" \ + -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \ + shared/nm-libnm-core-aux/nm-dispatcher-api.h \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ + $(NULL) + +shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD = \ + $(GLIB_LIBS) \ + $(NULL) + shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ $(dflt_cppflags) \ -I$(srcdir)/shared \ @@ -5320,8 +5476,13 @@ shared_nm_utils_tests_test_shared_general_CPPFLAGS = \ $(SANITIZER_LIB_CFLAGS) \ $(NULL) +shared_nm_utils_tests_test_shared_general_LDFLAGS = \ + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) + shared_nm_utils_tests_test_shared_general_LDADD = \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -5592,9 +5753,9 @@ libnm_core_lib_h_pub_real = \ libnm_core_lib_h_pub_mkenums = \ libnm-core/nm-core-enum-types.h -libnm_core_lib_h_priv = shared/nm-ethtool-utils.h \ - shared/nm-meta-setting.h libnm-core/nm-crypto.h \ - libnm-core/nm-crypto-impl.h libnm-core/nm-connection-private.h \ +libnm_core_lib_h_priv = shared/nm-meta-setting.h \ + libnm-core/nm-crypto.h libnm-core/nm-crypto-impl.h \ + libnm-core/nm-connection-private.h \ libnm-core/nm-core-internal.h \ libnm-core/nm-core-types-internal.h \ libnm-core/nm-keyfile-internal.h libnm-core/nm-keyfile-utils.h \ @@ -5651,13 +5812,12 @@ libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-wpan.c libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \ - shared/nm-ethtool-utils.c shared/nm-meta-setting.c \ - libnm-core/nm-crypto.c libnm-core/nm-connection.c \ - libnm-core/nm-dbus-utils.c libnm-core/nm-errors.c \ - libnm-core/nm-keyfile.c libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-property-compare.c libnm-core/nm-setting.c \ - libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ - libnm-core/nm-vpn-editor-plugin.c \ + shared/nm-meta-setting.c libnm-core/nm-crypto.c \ + libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ + libnm-core/nm-errors.c libnm-core/nm-keyfile.c \ + libnm-core/nm-keyfile-utils.c libnm-core/nm-property-compare.c \ + libnm-core/nm-setting.c libnm-core/nm-simple-connection.c \ + libnm-core/nm-utils.c libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c $(am__append_9) libnm_core_lib_c_mkenums = \ libnm-core/nm-core-enum-types.c @@ -5747,22 +5907,28 @@ libnm_core_tests_test_setting_CPPFLAGS = $(libnm_core_tests_cppflags) libnm_core_tests_test_settings_defaults_CPPFLAGS = $(libnm_core_tests_cppflags) libnm_core_tests_test_general_SOURCES = \ libnm-core/tests/test-general-enums.h \ - libnm-core/tests/test-general.c + libnm-core/tests/test-general.c \ + $(NULL) nodist_libnm_core_tests_test_general_SOURCES = \ libnm-core/tests/nm-core-tests-enum-types.c \ - libnm-core/tests/nm-core-tests-enum-types.h + libnm-core/tests/nm-core-tests-enum-types.h \ + $(NULL) libnm_core_tests_ldadd = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ + $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-base.la \ - $(libnm_crypto_lib) \ - $(GLIB_LIBS) + shared/nm-glib-aux/libnm-glib-aux.la \ + $(GLIB_LIBS) \ + $(NULL) libnm_core_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) \ + $(NULL) libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) @@ -5918,10 +6084,12 @@ libnm_libnm_utils_la_SOURCES = \ libnm/nm-libnm-utils.c libnm_libnm_utils_la_LIBADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ introspection/libnmdbus.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -5952,7 +6120,7 @@ libnm_libnm_la_LIBADD = \ libnm/libnm-utils.la \ shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-logging-stub.la \ - shared/nm-utils/libnm-utils-udev.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ $(DL_LIBS) \ $(GLIB_LIBS) \ $(UUID_LIBS) \ @@ -6018,7 +6186,7 @@ libnm_tests_ldadd = \ $(GLIB_LIBS) libnm_tests_ldflags = \ - $(SANITIZER_LIB_LDFLAGS) + $(SANITIZER_EXEC_LDFLAGS) libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) @@ -6167,15 +6335,17 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/sd-adapt-shared/locale-util.h \ shared/systemd/sd-adapt-shared/memfd-util.h \ shared/systemd/sd-adapt-shared/missing.h \ - shared/systemd/sd-adapt-shared/missing_socket.h \ shared/systemd/sd-adapt-shared/missing_syscall.h \ shared/systemd/sd-adapt-shared/missing_timerfd.h \ shared/systemd/sd-adapt-shared/mkdir.h \ + shared/systemd/sd-adapt-shared/namespace-util.h \ shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \ shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h \ + shared/systemd/sd-adapt-shared/nulstr-util.h \ shared/systemd/sd-adapt-shared/procfs-util.h \ shared/systemd/sd-adapt-shared/raw-clone.h \ shared/systemd/sd-adapt-shared/rlimit-util.h \ + shared/systemd/sd-adapt-shared/strxcpyx.h \ shared/systemd/sd-adapt-shared/terminal-util.h \ shared/systemd/sd-adapt-shared/unaligned.h \ shared/systemd/sd-adapt-shared/user-util.h \ @@ -6187,6 +6357,7 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/env-file.h \ shared/systemd/src/basic/env-util.c \ shared/systemd/src/basic/env-util.h \ + shared/systemd/src/basic/errno-util.h \ shared/systemd/src/basic/escape.c \ shared/systemd/src/basic/escape.h \ shared/systemd/src/basic/ether-addr-util.c \ @@ -6214,9 +6385,13 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/list.h \ shared/systemd/src/basic/log.h \ shared/systemd/src/basic/macro.h \ + shared/systemd/src/basic/memory-util.c \ + shared/systemd/src/basic/memory-util.h \ shared/systemd/src/basic/mempool.c \ shared/systemd/src/basic/mempool.h \ shared/systemd/src/basic/missing_fcntl.h \ + shared/systemd/src/basic/missing_socket.h \ + shared/systemd/src/basic/missing_stat.h \ shared/systemd/src/basic/missing_type.h \ shared/systemd/src/basic/parse-util.c \ shared/systemd/src/basic/parse-util.h \ @@ -6228,12 +6403,12 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \ shared/systemd/src/basic/process-util.h \ shared/systemd/src/basic/random-util.c \ shared/systemd/src/basic/random-util.h \ - shared/systemd/src/basic/refcnt.h \ shared/systemd/src/basic/set.h \ shared/systemd/src/basic/signal-util.h \ shared/systemd/src/basic/siphash24.h \ shared/systemd/src/basic/socket-util.c \ shared/systemd/src/basic/socket-util.h \ + shared/systemd/src/basic/sort-util.h \ shared/systemd/src/basic/sparse-endian.h \ shared/systemd/src/basic/stat-util.c \ shared/systemd/src/basic/stat-util.h \ @@ -6291,7 +6466,7 @@ src_libnm_systemd_core_la_SOURCES = \ src/systemd/sd-adapt-core/nm-sd-adapt-core.h \ src/systemd/sd-adapt-core/sd-daemon.h \ src/systemd/sd-adapt-core/sd-device.h \ - src/systemd/sd-adapt-core/stat-util.h \ + src/systemd/sd-adapt-core/udev-util.h \ src/systemd/src/libsystemd-network/arp-util.c \ src/systemd/src/libsystemd-network/arp-util.h \ src/systemd/src/libsystemd-network/dhcp-identifier.c \ @@ -6358,6 +6533,8 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/platform/nm-platform.h src/platform/nm-platform-private.h \ src/platform/nm-linux-platform.c \ src/platform/nm-linux-platform.h \ + src/platform/nmp-rules-manager.c \ + src/platform/nmp-rules-manager.h \ src/platform/wifi/nm-wifi-utils-nl80211.c \ src/platform/wifi/nm-wifi-utils-nl80211.h \ src/platform/wifi/nm-wifi-utils-private.h \ @@ -6376,10 +6553,12 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \ src/main-utils.c src/main-utils.h $(NULL) $(am__append_21) src_libNetworkManagerBase_la_LIBADD = \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ libnm-core/libnm-core.la \ $(libnm_crypto_lib) \ - shared/nm-utils/libnm-utils-udev.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ + shared/nm-udev-aux/libnm-udev-aux.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -6647,11 +6826,10 @@ src_initrd_nm_initrd_generator_SOURCES = \ src/initrd/nm-initrd-generator.c src_initrd_nm_initrd_generator_LDADD = \ - libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerBase.la \ shared/systemd/libnm-systemd-shared.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -6669,10 +6847,9 @@ src_initrd_tests_test_ibft_reader_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) src_initrd_tests_test_ibft_reader_LDADD = \ - libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -6686,10 +6863,9 @@ src_initrd_tests_test_cmdline_reader_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) src_initrd_tests_test_cmdline_reader_LDADD = \ - libnm-core/libnm-core.la \ src/initrd/libnmi-core.la \ src/libNetworkManagerTest.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -7227,6 +7403,9 @@ src_tests_test_systemd_CPPFLAGS = \ $(src_libnm_systemd_core_la_cppflags) \ -DNETWORKMANAGER_COMPILATION_TEST +src_tests_test_systemd_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + src_tests_test_systemd_LDADD = \ src/libnm-systemd-core.la \ shared/systemd/libnm-systemd-shared.la \ @@ -7254,9 +7433,9 @@ dispatcher_nmdbus_dispatcher_sources = \ dispatcher/nmdbus-dispatcher.c dispatcher_libnm_dispatcher_core_la_SOURCES = \ - shared/nm-dispatcher-api.h \ dispatcher/nm-dispatcher-utils.c \ - dispatcher/nm-dispatcher-utils.h + dispatcher/nm-dispatcher-utils.h \ + $(NULL) dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags) dispatcher_libnm_dispatcher_core_la_LIBADD = \ @@ -7264,8 +7443,8 @@ dispatcher_libnm_dispatcher_core_la_LIBADD = \ $(GLIB_LIBS) dispatcher_nm_dispatcher_SOURCES = \ - shared/nm-dispatcher-api.h \ - dispatcher/nm-dispatcher.c + dispatcher/nm-dispatcher.c \ + $(NULL) nodist_dispatcher_nm_dispatcher_SOURCES = $(dispatcher_nmdbus_dispatcher_sources) dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags) @@ -7297,8 +7476,9 @@ dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) dispatcher_tests_test_dispatcher_envp_LDADD = \ - libnm/libnm.la \ dispatcher/libnm-dispatcher-core.la \ + libnm/libnm.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) clients_nm_online_CPPFLAGS = \ @@ -7355,7 +7535,7 @@ clients_common_libnmc_base_la_CPPFLAGS = \ clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ - shared/nm-utils/libnm-utils-base.la \ + shared/nm-glib-aux/libnm-glib-aux.la \ $(GLIB_LIBS) \ $(NULL) @@ -7364,9 +7544,6 @@ clients_common_libnmc_la_SOURCES = \ shared/nm-meta-setting.c \ shared/nm-meta-setting.h \ \ - shared/nm-ethtool-utils.c \ - shared/nm-ethtool-utils.h \ - \ clients/common/nm-meta-setting-desc.c \ clients/common/nm-meta-setting-desc.h \ clients/common/nm-meta-setting-access.c \ @@ -7379,8 +7556,10 @@ clients_common_libnmc_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_la_LIBADD = \ - libnm/libnm.la \ clients/common/libnmc-base.la \ + libnm/libnm.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ $(GLIB_LIBS) clients_common_tests_test_general_CPPFLAGS = \ @@ -7575,6 +7754,7 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMTUI_TRUE@ libnm/libnm.la \ @BUILD_NMTUI_TRUE@ clients/tui/newt/libnmt-newt.a \ @BUILD_NMTUI_TRUE@ clients/common/libnmc-base.la \ +@BUILD_NMTUI_TRUE@ clients/common/libnmc.la \ @BUILD_NMTUI_TRUE@ $(GLIB_LIBS) \ @BUILD_NMTUI_TRUE@ $(NEWT_LIBS) \ @BUILD_NMTUI_TRUE@ $(NULL) @@ -7722,7 +7902,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_CPPFLAGS = $(libnm_util_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real)) -@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD = shared/nm-utils/libnm-utils-base.la \ +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LIBADD = shared/nm-glib-aux/libnm-glib-aux.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_73) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) @@ -7961,7 +8141,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_LIBADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libdeprecated-nm-glib.la \ -@WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-utils/libnm-utils-udev.la \ +@WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-udev-aux/libnm-udev-aux.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(LIBUDEV_LIBS) \ @@ -8638,8 +8818,6 @@ shared/$(DEPDIR)/$(am__dirstamp): @: > shared/$(DEPDIR)/$(am__dirstamp) shared/clients_common_libnmc_la-nm-meta-setting.lo: \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) -shared/clients_common_libnmc_la-nm-ethtool-utils.lo: \ - shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) clients/common/libnmc_la-nm-meta-setting-desc.lo: \ clients/common/$(am__dirstamp) \ clients/common/$(DEPDIR)/$(am__dirstamp) @@ -8958,8 +9136,6 @@ libnm-core/libnm_core_la-nm-setting-wireless.lo: \ libnm-core/libnm_core_la-nm-setting-wpan.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) -shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo: \ - shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) shared/libnm_core_libnm_core_la-nm-meta-setting.lo: \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_la-nm-crypto.lo: libnm-core/$(am__dirstamp) \ @@ -9410,7 +9586,7 @@ shared/c-siphash/src/libcsiphash_la-c-siphash.lo: \ shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp) shared/libcsiphash.la: $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_DEPENDENCIES) $(EXTRA_shared_libcsiphash_la_DEPENDENCIES) shared/$(am__dirstamp) - $(AM_V_CCLD)$(LINK) $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(shared_libcsiphash_la_LINK) $(shared_libcsiphash_la_OBJECTS) $(shared_libcsiphash_la_LIBADD) $(LIBS) shared/n-acd/src/$(am__dirstamp): @$(MKDIR_P) shared/n-acd/src @: > shared/n-acd/src/$(am__dirstamp) @@ -9441,45 +9617,87 @@ shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo: \ shared/libnacd.la: $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_DEPENDENCIES) $(EXTRA_shared_libnacd_la_DEPENDENCIES) shared/$(am__dirstamp) $(AM_V_CCLD)$(shared_libnacd_la_LINK) $(shared_libnacd_la_OBJECTS) $(shared_libnacd_la_LIBADD) $(LIBS) -shared/nm-utils/libnm_utils_base_la-c-list-util.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-errno.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) - -shared/nm-utils/libnm-utils-base.la: $(shared_nm_utils_libnm_utils_base_la_OBJECTS) $(shared_nm_utils_libnm_utils_base_la_DEPENDENCIES) $(EXTRA_shared_nm_utils_libnm_utils_base_la_DEPENDENCIES) shared/nm-utils/$(am__dirstamp) - $(AM_V_CCLD)$(shared_nm_utils_libnm_utils_base_la_LINK) $(shared_nm_utils_libnm_utils_base_la_OBJECTS) $(shared_nm_utils_libnm_utils_base_la_LIBADD) $(LIBS) -shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) - -shared/nm-utils/libnm-utils-udev.la: $(shared_nm_utils_libnm_utils_udev_la_OBJECTS) $(shared_nm_utils_libnm_utils_udev_la_DEPENDENCIES) $(EXTRA_shared_nm_utils_libnm_utils_udev_la_DEPENDENCIES) shared/nm-utils/$(am__dirstamp) - $(AM_V_CCLD)$(shared_nm_utils_libnm_utils_udev_la_LINK) $(shared_nm_utils_libnm_utils_udev_la_OBJECTS) $(shared_nm_utils_libnm_utils_udev_la_LIBADD) $(LIBS) +shared/nm-glib-aux/$(am__dirstamp): + @$(MKDIR_P) shared/nm-glib-aux + @: > shared/nm-glib-aux/$(am__dirstamp) +shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/nm-glib-aux/$(DEPDIR) + @: > shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo: \ + shared/nm-glib-aux/$(am__dirstamp) \ + shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) + +shared/nm-glib-aux/libnm-glib-aux.la: $(shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) $(shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_glib_aux_libnm_glib_aux_la_DEPENDENCIES) shared/nm-glib-aux/$(am__dirstamp) + $(AM_V_CCLD)$(shared_nm_glib_aux_libnm_glib_aux_la_LINK) $(shared_nm_glib_aux_libnm_glib_aux_la_OBJECTS) $(shared_nm_glib_aux_libnm_glib_aux_la_LIBADD) $(LIBS) +shared/nm-libnm-core-aux/$(am__dirstamp): + @$(MKDIR_P) shared/nm-libnm-core-aux + @: > shared/nm-libnm-core-aux/$(am__dirstamp) + +shared/nm-libnm-core-aux/libnm-libnm-core-aux.la: $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_DEPENDENCIES) shared/nm-libnm-core-aux/$(am__dirstamp) + $(AM_V_CCLD)$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LINK) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS) $(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LIBADD) $(LIBS) +shared/nm-libnm-core-intern/$(am__dirstamp): + @$(MKDIR_P) shared/nm-libnm-core-intern + @: > shared/nm-libnm-core-intern/$(am__dirstamp) +shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/nm-libnm-core-intern/$(DEPDIR) + @: > shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp) +shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo: \ + shared/nm-libnm-core-intern/$(am__dirstamp) \ + shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp) +shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo: \ + shared/nm-libnm-core-intern/$(am__dirstamp) \ + shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp) + +shared/nm-libnm-core-intern/libnm-libnm-core-intern.la: $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES) $(EXTRA_shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_DEPENDENCIES) shared/nm-libnm-core-intern/$(am__dirstamp) + $(AM_V_CCLD)$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LINK) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_LIBADD) $(LIBS) +shared/nm-std-aux/$(am__dirstamp): + @$(MKDIR_P) shared/nm-std-aux + @: > shared/nm-std-aux/$(am__dirstamp) +shared/nm-std-aux/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/nm-std-aux/$(DEPDIR) + @: > shared/nm-std-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo: \ + shared/nm-std-aux/$(am__dirstamp) \ + shared/nm-std-aux/$(DEPDIR)/$(am__dirstamp) + +shared/nm-std-aux/libnm-std-aux.la: $(shared_nm_std_aux_libnm_std_aux_la_OBJECTS) $(shared_nm_std_aux_libnm_std_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_std_aux_libnm_std_aux_la_DEPENDENCIES) shared/nm-std-aux/$(am__dirstamp) + $(AM_V_CCLD)$(shared_nm_std_aux_libnm_std_aux_la_LINK) $(shared_nm_std_aux_libnm_std_aux_la_OBJECTS) $(shared_nm_std_aux_libnm_std_aux_la_LIBADD) $(LIBS) +shared/nm-udev-aux/$(am__dirstamp): + @$(MKDIR_P) shared/nm-udev-aux + @: > shared/nm-udev-aux/$(am__dirstamp) +shared/nm-udev-aux/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/nm-udev-aux/$(DEPDIR) + @: > shared/nm-udev-aux/$(DEPDIR)/$(am__dirstamp) +shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo: \ + shared/nm-udev-aux/$(am__dirstamp) \ + shared/nm-udev-aux/$(DEPDIR)/$(am__dirstamp) + +shared/nm-udev-aux/libnm-udev-aux.la: $(shared_nm_udev_aux_libnm_udev_aux_la_OBJECTS) $(shared_nm_udev_aux_libnm_udev_aux_la_DEPENDENCIES) $(EXTRA_shared_nm_udev_aux_libnm_udev_aux_la_DEPENDENCIES) shared/nm-udev-aux/$(am__dirstamp) + $(AM_V_CCLD)$(shared_nm_udev_aux_libnm_udev_aux_la_LINK) $(shared_nm_udev_aux_libnm_udev_aux_la_OBJECTS) $(shared_nm_udev_aux_libnm_udev_aux_la_LIBADD) $(LIBS) shared/systemd/$(am__dirstamp): @$(MKDIR_P) shared/systemd @: > shared/systemd/$(am__dirstamp) @@ -9546,6 +9764,9 @@ shared/systemd/src/basic/libnm_systemd_shared_la-in-addr-util.lo: \ shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo: \ shared/systemd/src/basic/$(am__dirstamp) \ shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp) +shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo: \ + shared/systemd/src/basic/$(am__dirstamp) \ + shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp) shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo: \ shared/systemd/src/basic/$(am__dirstamp) \ shared/systemd/src/basic/$(DEPDIR)/$(am__dirstamp) @@ -10052,6 +10273,9 @@ src/platform/libNetworkManagerBase_la-nm-platform.lo: \ src/platform/libNetworkManagerBase_la-nm-linux-platform.lo: \ src/platform/$(am__dirstamp) \ src/platform/$(DEPDIR)/$(am__dirstamp) +src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo: \ + src/platform/$(am__dirstamp) \ + src/platform/$(DEPDIR)/$(am__dirstamp) src/platform/wifi/$(am__dirstamp): @$(MKDIR_P) src/platform/wifi @: > src/platform/wifi/$(am__dirstamp) @@ -10824,7 +11048,7 @@ shared/nm-utils/tests/test_shared_general-test-shared-general.$(OBJEXT): \ shared/nm-utils/tests/test-shared-general$(EXEEXT): $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_DEPENDENCIES) $(EXTRA_shared_nm_utils_tests_test_shared_general_DEPENDENCIES) shared/nm-utils/tests/$(am__dirstamp) @rm -f shared/nm-utils/tests/test-shared-general$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(shared_nm_utils_tests_test_shared_general_LINK) $(shared_nm_utils_tests_test_shared_general_OBJECTS) $(shared_nm_utils_tests_test_shared_general_LDADD) $(LIBS) src/NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -11161,7 +11385,7 @@ src/tests/test_systemd-test-systemd.$(OBJEXT): \ src/tests/test-systemd$(EXEEXT): $(src_tests_test_systemd_OBJECTS) $(src_tests_test_systemd_DEPENDENCIES) $(EXTRA_src_tests_test_systemd_DEPENDENCIES) src/tests/$(am__dirstamp) @rm -f src/tests/test-systemd$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_tests_test_systemd_OBJECTS) $(src_tests_test_systemd_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_tests_test_systemd_LINK) $(src_tests_test_systemd_OBJECTS) $(src_tests_test_systemd_LDADD) $(LIBS) src/tests/test_utils-test-utils.$(OBJEXT): src/tests/$(am__dirstamp) \ src/tests/$(DEPDIR)/$(am__dirstamp) @@ -11250,6 +11474,14 @@ mostlyclean-compile: -rm -f shared/n-acd/src/*.lo -rm -f shared/n-acd/src/util/*.$(OBJEXT) -rm -f shared/n-acd/src/util/*.lo + -rm -f shared/nm-glib-aux/*.$(OBJEXT) + -rm -f shared/nm-glib-aux/*.lo + -rm -f shared/nm-libnm-core-intern/*.$(OBJEXT) + -rm -f shared/nm-libnm-core-intern/*.lo + -rm -f shared/nm-std-aux/*.$(OBJEXT) + -rm -f shared/nm-std-aux/*.lo + -rm -f shared/nm-udev-aux/*.$(OBJEXT) + -rm -f shared/nm-udev-aux/*.lo -rm -f shared/nm-utils/*.$(OBJEXT) -rm -f shared/nm-utils/*.lo -rm -f shared/nm-utils/tests/*.$(OBJEXT) @@ -11689,9 +11921,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ # am--include-marker @@ -11705,19 +11935,21 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo@am__quote@ # am--include-marker @@ -11736,6 +11968,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo@am__quote@ # am--include-marker @@ -11884,6 +12117,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@src/platform/tests/$(DEPDIR)/monitor-monitor.Po@am__quote@ # am--include-marker @@ -12314,13 +12548,6 @@ shared/clients_common_libnmc_la-nm-meta-setting.lo: shared/nm-meta-setting.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/clients_common_libnmc_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c -shared/clients_common_libnmc_la-nm-ethtool-utils.lo: shared/nm-ethtool-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/clients_common_libnmc_la-nm-ethtool-utils.lo -MD -MP -MF shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Tpo -c -o shared/clients_common_libnmc_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Tpo shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-ethtool-utils.c' object='shared/clients_common_libnmc_la-nm-ethtool-utils.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/clients_common_libnmc_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c - clients/common/libnmc_la-nm-meta-setting-desc.lo: clients/common/nm-meta-setting-desc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(clients_common_libnmc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/libnmc_la-nm-meta-setting-desc.lo -MD -MP -MF clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Tpo -c -o clients/common/libnmc_la-nm-meta-setting-desc.lo `test -f 'clients/common/nm-meta-setting-desc.c' || echo '$(srcdir)/'`clients/common/nm-meta-setting-desc.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Tpo clients/common/$(DEPDIR)/libnmc_la-nm-meta-setting-desc.Plo @@ -13000,13 +13227,6 @@ libnm-core/libnm_core_la-nm-setting-wpan.lo: libnm-core/nm-setting-wpan.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-core/libnm_core_la-nm-setting-wpan.lo `test -f 'libnm-core/nm-setting-wpan.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wpan.c -shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo: shared/nm-ethtool-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Tpo -c -o shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-ethtool-utils.c' object='shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/libnm_core_libnm_core_la-nm-ethtool-utils.lo `test -f 'shared/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-ethtool-utils.c - shared/libnm_core_libnm_core_la-nm-meta-setting.lo: shared/nm-meta-setting.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/libnm_core_libnm_core_la-nm-meta-setting.lo -MD -MP -MF shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo -c -o shared/libnm_core_libnm_core_la-nm-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Tpo shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo @@ -14078,82 +14298,96 @@ shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo: shared/n-acd/src/n-acd-bpf-fa @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/libnacd_la-n-acd-bpf-fallback.lo `test -f 'shared/n-acd/src/n-acd-bpf-fallback.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd-bpf-fallback.c -shared/nm-utils/libnm_utils_base_la-c-list-util.lo: shared/nm-utils/c-list-util.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_utils_base_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/c-list-util.c' object='shared/nm-utils/libnm_utils_base_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo: shared/nm-glib-aux/nm-dedup-multi.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo `test -f 'shared/nm-glib-aux/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-dedup-multi.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-dedup-multi.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-dedup-multi.lo `test -f 'shared/nm-glib-aux/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-dedup-multi.c -shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo: shared/nm-utils/nm-dedup-multi.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-dedup-multi.c' object='shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo: shared/nm-glib-aux/nm-enum-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo `test -f 'shared/nm-glib-aux/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-enum-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-enum-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-enum-utils.lo `test -f 'shared/nm-glib-aux/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-enum-utils.c -shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo: shared/nm-utils/nm-enum-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-enum-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo: shared/nm-glib-aux/nm-errno.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo `test -f 'shared/nm-glib-aux/nm-errno.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-errno.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-errno.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-errno.lo `test -f 'shared/nm-glib-aux/nm-errno.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-errno.c -shared/nm-utils/libnm_utils_base_la-nm-errno.lo: shared/nm-utils/nm-errno.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-errno.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-errno.lo `test -f 'shared/nm-utils/nm-errno.c' || echo '$(srcdir)/'`shared/nm-utils/nm-errno.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-errno.c' object='shared/nm-utils/libnm_utils_base_la-nm-errno.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo: shared/nm-glib-aux/nm-hash-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo `test -f 'shared/nm-glib-aux/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-hash-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-hash-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-errno.lo `test -f 'shared/nm-utils/nm-errno.c' || echo '$(srcdir)/'`shared/nm-utils/nm-errno.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-hash-utils.lo `test -f 'shared/nm-glib-aux/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-hash-utils.c -shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo: shared/nm-utils/nm-hash-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-hash-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo: shared/nm-glib-aux/nm-io-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo `test -f 'shared/nm-glib-aux/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-io-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-io-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-io-utils.lo `test -f 'shared/nm-glib-aux/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-io-utils.c -shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo: shared/nm-utils/nm-io-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-io-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo: shared/nm-glib-aux/nm-random-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo `test -f 'shared/nm-glib-aux/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-random-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-random-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-io-utils.lo `test -f 'shared/nm-utils/nm-io-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-io-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-random-utils.lo `test -f 'shared/nm-glib-aux/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-random-utils.c -shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo: shared/nm-utils/nm-random-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-random-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo: shared/nm-glib-aux/nm-secret-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo `test -f 'shared/nm-glib-aux/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-secret-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-secret-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-secret-utils.lo `test -f 'shared/nm-glib-aux/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-secret-utils.c -shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo: shared/nm-utils/nm-secret-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-secret-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo: shared/nm-glib-aux/nm-shared-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo `test -f 'shared/nm-glib-aux/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-shared-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-shared-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-secret-utils.lo `test -f 'shared/nm-utils/nm-secret-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-secret-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-shared-utils.lo `test -f 'shared/nm-glib-aux/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-shared-utils.c -shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo: shared/nm-utils/nm-shared-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-shared-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo: shared/nm-glib-aux/nm-time-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo -MD -MP -MF shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Tpo -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo `test -f 'shared/nm-glib-aux/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-time-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Tpo shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-glib-aux/nm-time-utils.c' object='shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_glib_aux_libnm_glib_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-glib-aux/libnm_glib_aux_la-nm-time-utils.lo `test -f 'shared/nm-glib-aux/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-glib-aux/nm-time-utils.c -shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo: shared/nm-utils/nm-time-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Tpo -c -o shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo `test -f 'shared/nm-utils/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-time-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-time-utils.c' object='shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo: shared/nm-libnm-core-intern/nm-ethtool-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo -MD -MP -MF shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Tpo -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo `test -f 'shared/nm-libnm-core-intern/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-ethtool-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Tpo shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-libnm-core-intern/nm-ethtool-utils.c' object='shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_base_la-nm-time-utils.lo `test -f 'shared/nm-utils/nm-time-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-time-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-ethtool-utils.lo `test -f 'shared/nm-libnm-core-intern/nm-ethtool-utils.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-ethtool-utils.c -shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo: shared/nm-utils/nm-udev-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_udev_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-udev-utils.c' object='shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@ +shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo: shared/nm-libnm-core-intern/nm-libnm-core-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo -MD -MP -MF shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Tpo -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo `test -f 'shared/nm-libnm-core-intern/nm-libnm-core-utils.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-libnm-core-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Tpo shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-libnm-core-intern/nm-libnm-core-utils.c' object='shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_utils_libnm_utils_udev_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_utils_udev_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-libnm-core-intern/libnm_libnm_core_intern_la-nm-libnm-core-utils.lo `test -f 'shared/nm-libnm-core-intern/nm-libnm-core-utils.c' || echo '$(srcdir)/'`shared/nm-libnm-core-intern/nm-libnm-core-utils.c + +shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo: shared/nm-std-aux/c-list-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo -MD -MP -MF shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Tpo -c -o shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo `test -f 'shared/nm-std-aux/c-list-util.c' || echo '$(srcdir)/'`shared/nm-std-aux/c-list-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Tpo shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-std-aux/c-list-util.c' object='shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_std_aux_libnm_std_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-std-aux/libnm_std_aux_la-c-list-util.lo `test -f 'shared/nm-std-aux/c-list-util.c' || echo '$(srcdir)/'`shared/nm-std-aux/c-list-util.c + +shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo: shared/nm-udev-aux/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo -MD -MP -MF shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Tpo -c -o shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo `test -f 'shared/nm-udev-aux/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-udev-aux/nm-udev-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Tpo shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-udev-aux/nm-udev-utils.c' object='shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_nm_udev_aux_libnm_udev_aux_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-udev-aux/libnm_udev_aux_la-nm-udev-utils.lo `test -f 'shared/nm-udev-aux/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-udev-aux/nm-udev-utils.c shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo: shared/systemd/nm-logging-stub.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo -MD -MP -MF shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Tpo -c -o shared/systemd/libnm_systemd_logging_stub_la-nm-logging-stub.lo `test -f 'shared/systemd/nm-logging-stub.c' || echo '$(srcdir)/'`shared/systemd/nm-logging-stub.c @@ -14274,6 +14508,13 @@ shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo: shared/systemd/src/ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-io-util.lo `test -f 'shared/systemd/src/basic/io-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/io-util.c +shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo: shared/systemd/src/basic/memory-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo `test -f 'shared/systemd/src/basic/memory-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/memory-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/systemd/src/basic/memory-util.c' object='shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/systemd/src/basic/libnm_systemd_shared_la-memory-util.lo `test -f 'shared/systemd/src/basic/memory-util.c' || echo '$(srcdir)/'`shared/systemd/src/basic/memory-util.c + shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo: shared/systemd/src/basic/mempool.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_systemd_libnm_systemd_shared_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo -MD -MP -MF shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Tpo -c -o shared/systemd/src/basic/libnm_systemd_shared_la-mempool.lo `test -f 'shared/systemd/src/basic/mempool.c' || echo '$(srcdir)/'`shared/systemd/src/basic/mempool.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Tpo shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo @@ -15233,6 +15474,13 @@ src/platform/libNetworkManagerBase_la-nm-linux-platform.lo: src/platform/nm-linu @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nm-linux-platform.lo `test -f 'src/platform/nm-linux-platform.c' || echo '$(srcdir)/'`src/platform/nm-linux-platform.c +src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo: src/platform/nmp-rules-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo -MD -MP -MF src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Tpo -c -o src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo `test -f 'src/platform/nmp-rules-manager.c' || echo '$(srcdir)/'`src/platform/nmp-rules-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Tpo src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/platform/nmp-rules-manager.c' object='src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/platform/libNetworkManagerBase_la-nmp-rules-manager.lo `test -f 'src/platform/nmp-rules-manager.c' || echo '$(srcdir)/'`src/platform/nmp-rules-manager.c + src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo: src/platform/wifi/nm-wifi-utils-nl80211.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo -MD -MP -MF src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo -c -o src/platform/wifi/libNetworkManagerBase_la-nm-wifi-utils-nl80211.lo `test -f 'src/platform/wifi/nm-wifi-utils-nl80211.c' || echo '$(srcdir)/'`src/platform/wifi/nm-wifi-utils-nl80211.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Tpo src/platform/wifi/$(DEPDIR)/libNetworkManagerBase_la-nm-wifi-utils-nl80211.Plo @@ -17638,6 +17886,11 @@ clean-libtool: -rm -rf shared/c-siphash/src/.libs shared/c-siphash/src/_libs -rm -rf shared/n-acd/src/.libs shared/n-acd/src/_libs -rm -rf shared/n-acd/src/util/.libs shared/n-acd/src/util/_libs + -rm -rf shared/nm-glib-aux/.libs shared/nm-glib-aux/_libs + -rm -rf shared/nm-libnm-core-aux/.libs shared/nm-libnm-core-aux/_libs + -rm -rf shared/nm-libnm-core-intern/.libs shared/nm-libnm-core-intern/_libs + -rm -rf shared/nm-std-aux/.libs shared/nm-std-aux/_libs + -rm -rf shared/nm-udev-aux/.libs shared/nm-udev-aux/_libs -rm -rf shared/nm-utils/.libs shared/nm-utils/_libs -rm -rf shared/nm-utils/tests/.libs shared/nm-utils/tests/_libs -rm -rf shared/systemd/.libs shared/systemd/_libs @@ -19249,6 +19502,15 @@ distclean-generic: -rm -f shared/n-acd/src/$(am__dirstamp) -rm -f shared/n-acd/src/util/$(DEPDIR)/$(am__dirstamp) -rm -f shared/n-acd/src/util/$(am__dirstamp) + -rm -f shared/nm-glib-aux/$(DEPDIR)/$(am__dirstamp) + -rm -f shared/nm-glib-aux/$(am__dirstamp) + -rm -f shared/nm-libnm-core-aux/$(am__dirstamp) + -rm -f shared/nm-libnm-core-intern/$(DEPDIR)/$(am__dirstamp) + -rm -f shared/nm-libnm-core-intern/$(am__dirstamp) + -rm -f shared/nm-std-aux/$(DEPDIR)/$(am__dirstamp) + -rm -f shared/nm-std-aux/$(am__dirstamp) + -rm -f shared/nm-udev-aux/$(DEPDIR)/$(am__dirstamp) + -rm -f shared/nm-udev-aux/$(am__dirstamp) -rm -f shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -rm -f shared/nm-utils/$(am__dirstamp) -rm -f shared/nm-utils/tests/$(DEPDIR)/$(am__dirstamp) @@ -19714,9 +19976,7 @@ distclean: distclean-recursive -rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po -rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po -rm -f libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po - -rm -f shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo -rm -f shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo - -rm -f shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo -rm -f shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo -rm -f shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po -rm -f shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po @@ -19730,19 +19990,21 @@ distclean: distclean-recursive -rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo -rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo -rm -f shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo + -rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo + -rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo + -rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo + -rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo -rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo -rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo -rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po -rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo -rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo @@ -19761,6 +20023,7 @@ distclean: distclean-recursive -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo + -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo @@ -19909,6 +20172,7 @@ distclean: distclean-recursive -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo + -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo -rm -f src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo -rm -f src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo -rm -f src/platform/tests/$(DEPDIR)/monitor-monitor.Po @@ -20418,9 +20682,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po -rm -f libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po -rm -f libnm/tests/$(DEPDIR)/test_secret_agent-test-secret-agent.Po - -rm -f shared/$(DEPDIR)/clients_common_libnmc_la-nm-ethtool-utils.Plo -rm -f shared/$(DEPDIR)/clients_common_libnmc_la-nm-meta-setting.Plo - -rm -f shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-ethtool-utils.Plo -rm -f shared/$(DEPDIR)/libnm_core_libnm_core_la-nm-meta-setting.Plo -rm -f shared/$(DEPDIR)/libnm_glib_tests_test_nm_client-nm-test-utils-impl.Po -rm -f shared/$(DEPDIR)/libnm_glib_tests_test_remote_settings_client-nm-test-utils-impl.Po @@ -20434,19 +20696,21 @@ maintainer-clean: maintainer-clean-recursive -rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd-probe.Plo -rm -f shared/n-acd/src/$(DEPDIR)/libnacd_la-n-acd.Plo -rm -f shared/n-acd/src/util/$(DEPDIR)/libnacd_la-timer.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-dedup-multi.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-enum-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-errno.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-hash-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-io-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-random-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-secret-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-shared-utils.Plo + -rm -f shared/nm-glib-aux/$(DEPDIR)/libnm_glib_aux_la-nm-time-utils.Plo + -rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-ethtool-utils.Plo + -rm -f shared/nm-libnm-core-intern/$(DEPDIR)/libnm_libnm_core_intern_la-nm-libnm-core-utils.Plo + -rm -f shared/nm-std-aux/$(DEPDIR)/libnm_std_aux_la-c-list-util.Plo + -rm -f shared/nm-udev-aux/$(DEPDIR)/libnm_udev_aux_la-nm-udev-utils.Plo -rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.Plo -rm -f shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-c-list-util.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-dedup-multi.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-enum-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-errno.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-hash-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-io-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-random-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-secret-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-shared-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_base_la-nm-time-utils.Plo - -rm -f shared/nm-utils/$(DEPDIR)/libnm_utils_udev_la-nm-udev-utils.Plo -rm -f shared/nm-utils/tests/$(DEPDIR)/test_shared_general-test-shared-general.Po -rm -f shared/systemd/$(DEPDIR)/libnm_systemd_logging_stub_la-nm-logging-stub.Plo -rm -f shared/systemd/$(DEPDIR)/libnm_systemd_shared_la-nm-sd-utils-shared.Plo @@ -20465,6 +20729,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-hostname-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-in-addr-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-io-util.Plo + -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-memory-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-mempool.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-parse-util.Plo -rm -f shared/systemd/src/basic/$(DEPDIR)/libnm_systemd_shared_la-path-util.Plo @@ -20613,6 +20878,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nm-platform.Plo -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-netns.Plo -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-object.Plo + -rm -f src/platform/$(DEPDIR)/libNetworkManagerBase_la-nmp-rules-manager.Plo -rm -f src/platform/$(DEPDIR)/libNetworkManagerTest_la-nm-fake-platform.Plo -rm -f src/platform/tests/$(DEPDIR)/libNetworkManagerTest_la-test-common.Plo -rm -f src/platform/tests/$(DEPDIR)/monitor-monitor.Po @@ -20873,6 +21139,10 @@ dist: $(dist_configure_check) $(dist_dependencies) @INTLTOOL_POLICY_RULE@ +$(shared_nm_libnm_core_intern_libnm_libnm_core_intern_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +$(shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + introspection/%.c: introspection/%.xml @$(MKDIR_P) introspection/ $(AM_V_GEN) gdbus-codegen \ diff --git a/NEWS b/NEWS index 9a72dcb8..5ec3facf 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,16 @@ +============================================= +NetworkManager-1.18 +Overview of changes since NetworkManager-1.16 +============================================= + +This is a new stable release of NetworkManager. Notable changes include: + +* Add support for policy routing rules. +* Add support for VLAN filtering for Linux bridge. +* Support ieee-802-1 and ieee-802-3 LLDP TLVs. +* Allow large MTU sizes for infiniband/IPoIB connection profiles. +* Improve nmcli's handling of list options for connection properties. + ============================================= NetworkManager-1.16 Overview of changes since NetworkManager-1.14 diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 6db44f87..6ee3b49f 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1276,12 +1276,18 @@ static void update_secrets_in_connection (NMRemoteConnection *remote, NMConnection *local) { GetSecretsData data = { 0, }; + GType setting_type; int i; data.local = local; data.loop = g_main_loop_new (NULL, FALSE); for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { + setting_type = nm_meta_setting_infos[i].get_setting_gtype(); + if (!nm_connection_get_setting (NM_CONNECTION (remote), setting_type)) + continue; + if (!nm_meta_setting_info_editor_has_secrets (nm_meta_setting_info_editor_find_by_gtype (setting_type))) + continue; data.setting_name = nm_meta_setting_infos[i].setting_name; nm_remote_connection_get_secrets_async (remote, nm_meta_setting_infos[i].setting_name, @@ -1522,15 +1528,13 @@ split_required_fields_for_con_show (const char *input, char **active_flds, GError **error) { - char **fields, **iter; - char *dot; - GString *str1, *str2; - gboolean found; + gs_free const char **fields = NULL; + const char *const*iter; + nm_auto_free_gstring GString *str1 = NULL; + nm_auto_free_gstring GString *str2 = NULL; gboolean group_profile = FALSE; gboolean group_active = FALSE; - gboolean success = TRUE; - gboolean is_all, is_common; - int i; + gboolean do_free; if (!input) { *profile_flds = NULL; @@ -1541,25 +1545,30 @@ split_required_fields_for_con_show (const char *input, str1 = g_string_new (NULL); str2 = g_string_new (NULL); - /* Split supplied fields string */ - fields = g_strsplit_set (input, ",", -1); + fields = nm_utils_strsplit_set_with_empty (input, ","); for (iter = fields; iter && *iter; iter++) { - g_strstrip (*iter); - dot = strchr (*iter, '.'); + char *s_mutable = (char *) (*iter); + char *dot; + gboolean is_all; + gboolean is_common; + gboolean found; + int i; + + g_strstrip (s_mutable); + dot = strchr (s_mutable, '.'); if (dot) *dot = '\0'; - is_all = !dot && strcasecmp (*iter, "all") == 0; - is_common = !dot && strcasecmp (*iter, "common") == 0; + is_all = !dot && strcasecmp (s_mutable, "all") == 0; + is_common = !dot && strcasecmp (s_mutable, "common") == 0; found = FALSE; - for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { if ( is_all || is_common - || !strcasecmp (*iter, nm_meta_setting_infos[i].setting_name)) { + || !strcasecmp (s_mutable, nm_meta_setting_infos[i].setting_name)) { if (dot) *dot = '.'; - g_string_append (str1, *iter); + g_string_append (str1, s_mutable); g_string_append_c (str1, ','); found = TRUE; break; @@ -1567,12 +1576,13 @@ split_required_fields_for_con_show (const char *input, } if (found) continue; + for (i = 0; nmc_fields_con_active_details_groups[i]; i++) { if ( is_all || is_common - || !strcasecmp (*iter, nmc_fields_con_active_details_groups[i]->name)) { + || !strcasecmp (s_mutable, nmc_fields_con_active_details_groups[i]->name)) { if (dot) *dot = '.'; - g_string_append (str2, *iter); + g_string_append (str2, s_mutable); g_string_append_c (str2, ','); found = TRUE; break; @@ -1581,55 +1591,49 @@ split_required_fields_for_con_show (const char *input, if (!found) { if (dot) *dot = '.'; - if (!strcasecmp (*iter, CON_SHOW_DETAIL_GROUP_PROFILE)) + if (!strcasecmp (s_mutable, CON_SHOW_DETAIL_GROUP_PROFILE)) group_profile = TRUE; - else if (!strcasecmp (*iter, CON_SHOW_DETAIL_GROUP_ACTIVE)) + else if (!strcasecmp (s_mutable, CON_SHOW_DETAIL_GROUP_ACTIVE)) group_active = TRUE; else { - char *allowed1 = nm_meta_abstract_infos_get_names_str ((const NMMetaAbstractInfo *const*) nm_meta_setting_infos_editor_p (), NULL); - char *allowed2 = nm_meta_abstract_infos_get_names_str ((const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_groups, NULL); + gs_free char *allowed1 = nm_meta_abstract_infos_get_names_str ((const NMMetaAbstractInfo *const*) nm_meta_setting_infos_editor_p (), NULL); + gs_free char *allowed2 = nm_meta_abstract_infos_get_names_str ((const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_groups, NULL); + g_set_error (error, NMCLI_ERROR, 0, _("invalid field '%s'; allowed fields: %s and %s, or %s,%s"), - *iter, allowed1, allowed2, CON_SHOW_DETAIL_GROUP_PROFILE, CON_SHOW_DETAIL_GROUP_ACTIVE); - g_free (allowed1); - g_free (allowed2); - success = FALSE; - break; + s_mutable, allowed1, allowed2, CON_SHOW_DETAIL_GROUP_PROFILE, CON_SHOW_DETAIL_GROUP_ACTIVE); + return FALSE; } } } - if (fields) - g_strfreev (fields); /* Handle pseudo groups: profile, active */ - if (success && group_profile) { + if (group_profile) { if (str1->len > 0) { g_set_error (error, NMCLI_ERROR, 0, _("'%s' has to be alone"), CON_SHOW_DETAIL_GROUP_PROFILE); - success = FALSE; - } else - g_string_assign (str1, "all,"); + return FALSE; + } + g_string_assign (str1, "all,"); } - if (success && group_active) { + if (group_active) { if (str2->len > 0) { g_set_error (error, NMCLI_ERROR, 0, _("'%s' has to be alone"), CON_SHOW_DETAIL_GROUP_ACTIVE); - success = FALSE; - } else - g_string_assign (str2, "all,"); + return FALSE; + } + g_string_assign (str2, "all,"); } - if (success) { - if (str1->len > 0) - g_string_truncate (str1, str1->len - 1); - if (str2->len > 0) - g_string_truncate (str2, str2->len - 1); - *profile_flds = g_string_free (str1, str1->len == 0); - *active_flds = g_string_free (str2, str2->len == 0); - } else { - g_string_free (str1, TRUE); - g_string_free (str2, TRUE); - } - return success; + if (str1->len > 0) + g_string_truncate (str1, str1->len - 1); + if (str2->len > 0) + g_string_truncate (str2, str2->len - 1); + + do_free = (str1->len == 0); + *profile_flds = g_string_free (g_steal_pointer (&str1), do_free); + do_free = (str2->len == 0); + *active_flds = g_string_free (g_steal_pointer (&str2), do_free); + return TRUE; } typedef enum { @@ -1870,7 +1874,7 @@ parse_preferred_connection_order (const char *order, GError **error) gboolean inverse, unique; int i; - strv = nm_utils_strsplit_set (order, ":", FALSE); + strv = nm_utils_strsplit_set (order, ":"); if (!strv) { g_set_error (error, NMCLI_ERROR, 0, _("incorrect string '%s' of '--order' option"), order); @@ -2674,7 +2678,7 @@ parse_passwords (const char *passwd_file, GError **error) return NULL; } - strv = nm_utils_strsplit_set (contents, "\r\n", FALSE); + strv = nm_utils_strsplit_set (contents, "\r\n"); for (iter = strv; *iter; iter++) { gs_free char *iter_s = g_strdup (*iter); @@ -3959,11 +3963,12 @@ set_property (NMClient *client, char modifier, GError **error) { - gs_free char *property_name = NULL, *value_free = NULL; + gs_free char *property_name = NULL; + gs_free_error GError *local = NULL; NMSetting *setting; - GError *local = NULL; - g_assert (setting_name && setting_name[0]); + nm_assert (setting_name && setting_name[0]); + nm_assert (NM_IN_SET (modifier, '\0', '+', '-')); setting = nm_connection_get_setting_by_name (connection, setting_name); if (!setting) { @@ -3977,48 +3982,26 @@ set_property (NMClient *client, g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("Error: invalid property '%s': %s."), property, local->message); - g_clear_error (&local); return FALSE; } - if (modifier != '-') { - /* Set/add value */ - if (modifier != '+') { - /* We allow the existing property value to be passed as parameter, - * so make a copy if we are going to free it. - */ - value = value_free = g_strdup (value); - nmc_setting_reset_property (setting, property_name, NULL); - } - if (!nmc_setting_set_property (client, setting, property_name, value, &local)) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: failed to modify %s.%s: %s."), - setting_name, property, local->message); - g_clear_error (&local); - return FALSE; - } - } else { - /* Remove value - * - either empty: remove whole value - * - or specified by index <0-n>: remove item at the index - * - or option name: remove item with the option name - */ - if (value) { - unsigned long idx; - - if (nmc_string_to_uint (value, TRUE, 0, G_MAXUINT32, &idx)) - nmc_setting_remove_property_option (setting, property_name, NULL, idx, &local); - else - nmc_setting_remove_property_option (setting, property_name, value, 0, &local); - if (local) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("Error: failed to remove a value from %s.%s: %s."), - setting_name, property, local->message); - g_clear_error (&local); - return FALSE; - } - } else - nmc_setting_reset_property (setting, property_name, NULL); + if (!nmc_setting_set_property (client, + setting, + property_name, + ( (modifier == '-' && !value) + ? '\0' + : modifier), + value, + &local)) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("Error: failed to %s %s.%s: %s."), + ( modifier != '-' + ? "modify" + : "remove a value from"), + setting_name, + property, + local->message); + return FALSE; } /* Don't ask for this property in interactive mode. */ @@ -6904,7 +6887,6 @@ property_edit_submenu (NmCli *nmc, gs_free char *cmd_property_user = NULL; gs_free char *cmd_property_arg = NULL; gs_free char *prop_val_user = NULL; - nm_auto_unset_gvalue GValue prop_g_value = G_VALUE_INIT; gboolean removed; gboolean dirty; @@ -6954,24 +6936,17 @@ property_edit_submenu (NmCli *nmc, } else prop_val_user = g_strdup (cmd_property_arg); - /* nmc_setting_set_property() only adds new value, thus we have to - * remove the original value and save it for error cases. - */ - if (cmdsub == NMC_EDITOR_SUB_CMD_SET) { - nmc_property_get_gvalue (curr_setting, prop_name, &prop_g_value); - nmc_property_set_default_value (curr_setting, prop_name); - } - - set_result = nmc_setting_set_property (nmc->client, curr_setting, prop_name, prop_val_user, &tmp_err); + set_result = nmc_setting_set_property (nmc->client, + curr_setting, + prop_name, + (cmdsub == NMC_EDITOR_SUB_CMD_SET) + ? '\0' + : '+', + prop_val_user, + &tmp_err); if (!set_result) { g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); - if (cmdsub == NMC_EDITOR_SUB_CMD_SET) { - /* Block change signals and restore original value */ - g_signal_handlers_block_matched (curr_setting, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); - nmc_property_set_gvalue (curr_setting, prop_name, &prop_g_value); - g_signal_handlers_unblock_matched (curr_setting, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); - } } break; @@ -6982,41 +6957,23 @@ property_edit_submenu (NmCli *nmc, _("Edit '%s' value: "), prop_name); - nmc_property_get_gvalue (curr_setting, prop_name, &prop_g_value); - nmc_property_set_default_value (curr_setting, prop_name); - - if (!nmc_setting_set_property (nmc->client, curr_setting, prop_name, prop_val_user, &tmp_err)) { + if (!nmc_setting_set_property (nmc->client, curr_setting, prop_name, '\0', prop_val_user, &tmp_err)) { g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); - g_signal_handlers_block_matched (curr_setting, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); - nmc_property_set_gvalue (curr_setting, prop_name, &prop_g_value); - g_signal_handlers_unblock_matched (curr_setting, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); } break; case NMC_EDITOR_SUB_CMD_REMOVE: - if (cmd_property_arg) { - unsigned long val_int = G_MAXUINT32; - gs_free char *option = NULL; - - if (!nmc_string_to_uint (cmd_property_arg, TRUE, 0, G_MAXUINT32, &val_int)) { - option = g_strdup (cmd_property_arg); - g_strstrip (option); - } - - if (!nmc_setting_remove_property_option (curr_setting, prop_name, - option, - (guint32) val_int, - &tmp_err)) { - g_print (_("Error: %s\n"), tmp_err->message); - g_clear_error (&tmp_err); - } - } else { - if (!nmc_setting_reset_property (curr_setting, prop_name, &tmp_err)) { - g_print (_("Error: failed to remove value of '%s': %s\n"), prop_name, - tmp_err->message); - g_clear_error (&tmp_err); - } + if (!nmc_setting_set_property (nmc->client, + curr_setting, + prop_name, + ( cmd_property_arg + ? '-' + : '\0'), + cmd_property_arg, + &tmp_err)) { + g_print (_("Error: %s\n"), tmp_err->message); + g_clear_error (&tmp_err); } break; @@ -7367,8 +7324,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t _("Enter '%s' value: "), prop_name); - /* Set property value */ - if (!nmc_setting_set_property (nmc->client, menu_ctx.curr_setting, prop_name, prop_val_user, &tmp_err)) { + if (!nmc_setting_set_property (nmc->client, menu_ctx.curr_setting, prop_name, '+', prop_val_user, &tmp_err)) { g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); } @@ -7428,8 +7384,13 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t prop_name); } - /* Set property value */ - if (!nmc_setting_set_property (nmc->client, ss, prop_name, cmd_arg_v, &tmp_err)) { + /* setting a value in edit mode "appends". That seems unexpected behavior. */ + if (!nmc_setting_set_property (nmc->client, + ss, + prop_name, + cmd_arg_v ? '+' : '\0', + cmd_arg_v, + &tmp_err)) { g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); @@ -7526,8 +7487,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t if (!prop_name) break; - /* Delete property value */ - if (!nmc_setting_reset_property (menu_ctx.curr_setting, prop_name, &tmp_err)) { + if (!nmc_setting_set_property (nmc->client, menu_ctx.curr_setting, prop_name, '\0', NULL, &tmp_err)) { g_print (_("Error: failed to remove value of '%s': %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); @@ -7577,8 +7537,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t prop_name = is_property_valid (ss, cmd_arg_p, &tmp_err); if (prop_name) { - /* Delete property value */ - if (!nmc_setting_reset_property (ss, prop_name, &tmp_err)) { + if (!nmc_setting_set_property (nmc->client, ss, prop_name, '\0', NULL, &tmp_err)) { g_print (_("Error: failed to remove value of '%s': %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); @@ -8148,6 +8107,9 @@ editor_init_existing_connection (NMConnection *connection) NMSettingWireless *s_wireless; NMSettingConnection *s_con; + /* FIXME: this approach of connecting handlers to do something is fundamentally + * flawed. See the comment in nmc_setting_ip6_connect_handlers(). */ + s_ip4 = nm_connection_get_setting_ip4_config (connection); s_ip6 = nm_connection_get_setting_ip6_config (connection); s_proxy = nm_connection_get_setting_proxy (connection); @@ -8585,7 +8547,7 @@ delete_cb (GObject *con, GAsyncResult *result, gpointer user_data) if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) return; g_string_printf (info->nmc->return_text, _("Error: not all connections deleted.")); - g_printerr (_("Error: Connection deletion failed: %s"), + g_printerr (_("Error: Connection deletion failed: %s\n"), error->message); g_error_free (error); info->nmc->return_value = NMC_RESULT_ERROR_CON_DEL; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 04a8c988..ad3a44c4 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -3888,6 +3888,7 @@ do_device_wifi_hotspot (NmCli *nmc, int argc, char **argv) info->nmc = nmc; info->device = device; info->hotspot = TRUE; + info->create = TRUE; nm_client_add_and_activate_connection_async (nmc->client, connection, diff --git a/clients/cli/general.c b/clients/cli/general.c index 2c22bdc9..d713426b 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -23,7 +23,7 @@ #include -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-client-utils.h" @@ -1350,7 +1350,7 @@ do_overview (NmCli *nmc, int argc, char **argv) g_print (_("Use \"nmcli device show\" to get complete information about known devices and\n" "\"nmcli connection show\" to get an overview on active connection profiles.\n" "\n" - "Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details.\n")); + "Consult nmcli(1) and nmcli-examples(7) manual pages for complete usage details.\n")); return NMC_RESULT_SUCCESS; } diff --git a/clients/cli/meson.build b/clients/cli/meson.build index 11fe1cd1..396466a2 100644 --- a/clients/cli/meson.build +++ b/clients/cli/meson.build @@ -22,7 +22,7 @@ deps = [ libnm_dep, libnmc_base_dep, libnmc_dep, - nm_core_dep, + libnm_core_dep, readline_dep, ] diff --git a/clients/cli/settings.c b/clients/cli/settings.c index a04c8eb6..2446cb08 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -24,7 +24,7 @@ #include #include -#include "nm-common-macros.h" +#include "nm-libnm-core-intern/nm-common-macros.h" #include "nm-client-utils.h" #include "nm-vpn-helpers.h" @@ -89,7 +89,7 @@ ipv4_addresses_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_dat static void ipv4_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data) { - static GValue value = G_VALUE_INIT; + static GPtrArray *old_value = NULL; static gboolean answered = FALSE; static gboolean answer = FALSE; @@ -103,17 +103,17 @@ ipv4_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data) answer = get_answer ("ipv4.addresses", NULL); } if (answer) { - if (G_IS_VALUE (&value)) - g_value_unset (&value); - nmc_property_get_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value); + nm_clear_pointer (&old_value, g_ptr_array_unref); + g_object_get (object, NM_SETTING_IP_CONFIG_ADDRESSES, &old_value, NULL); g_object_set (object, NM_SETTING_IP_CONFIG_ADDRESSES, NULL, NULL); } } } else { answered = FALSE; - if (G_IS_VALUE (&value)) { - nmc_property_set_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value); - g_value_unset (&value); + if (old_value) { + gs_unref_ptrarray GPtrArray *v = g_steal_pointer (&old_value); + + g_object_set (object, NM_SETTING_IP_CONFIG_ADDRESSES, v, NULL); } } @@ -142,6 +142,25 @@ ipv6_addresses_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_dat } } else { answered = FALSE; + /* FIXME: editor_init_existing_connection() and registering handlers is not the + * right approach. + * + * This only happens to work because in nmcli's edit mode + * tends to append addresses -- instead of setting them. + * If we would change that (to behavior I'd expect), we'd get: + * + * nmcli> set ipv6.addresses fc01::1:5/68 + * Do you also want to set 'ipv6.method' to 'manual'? [yes]: y + * nmcli> set ipv6.addresses fc01::1:6/68 + * Do you also want to set 'ipv6.method' to 'manual'? [yes]: + * + * That's because nmc_setting_set_property() calls set_fcn(). With modifier '\0' + * (set), it would first clear all addresses before adding the address. Thereby + * emitting multiple property changed signals. + * + * That can be avoided by freezing/thawing the signals, but this solution + * here is ugly in general. + */ if (!g_strcmp0 (nm_setting_ip_config_get_method (NM_SETTING_IP_CONFIG (object)), NM_SETTING_IP6_CONFIG_METHOD_MANUAL)) g_object_set (object, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL); } @@ -152,7 +171,7 @@ ipv6_addresses_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_dat static void ipv6_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data) { - static GValue value = G_VALUE_INIT; + static GPtrArray *old_value = NULL; static gboolean answered = FALSE; static gboolean answer = FALSE; @@ -166,17 +185,17 @@ ipv6_method_changed_cb (GObject *object, GParamSpec *pspec, gpointer user_data) answer = get_answer ("ipv6.addresses", NULL); } if (answer) { - if (G_IS_VALUE (&value)) - g_value_unset (&value); - nmc_property_get_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value); + nm_clear_pointer (&old_value, g_ptr_array_unref); + g_object_get (object, NM_SETTING_IP_CONFIG_ADDRESSES, &old_value, NULL); g_object_set (object, NM_SETTING_IP_CONFIG_ADDRESSES, NULL, NULL); } } } else { answered = FALSE; - if (G_IS_VALUE (&value)) { - nmc_property_set_gvalue (NM_SETTING (object), NM_SETTING_IP_CONFIG_ADDRESSES, &value); - g_value_unset (&value); + if (old_value) { + gs_unref_ptrarray GPtrArray *v = g_steal_pointer (&old_value); + + g_object_set (object, NM_SETTING_IP_CONFIG_ADDRESSES, v, NULL); } } @@ -319,7 +338,7 @@ _set_fcn_precheck_connection_secondaries (NMClient *client, char **iter; gboolean modified = FALSE; - strv0 = nm_utils_strsplit_set (value, " \t,", FALSE); + strv0 = nm_utils_strsplit_set (value, " \t,"); if (!strv0) return TRUE; @@ -509,151 +528,72 @@ nmc_setting_get_property_parsable (NMSetting *setting, const char *prop, GError return get_property_val (setting, prop, NM_META_ACCESSOR_GET_TYPE_PARSABLE, TRUE, error); } -static gboolean -_set_fcn_call (const NMMetaPropertyInfo *property_info, - NMSetting *setting, - const char *value, - GError **error) -{ - return property_info->property_type->set_fcn (property_info, - nmc_meta_environment, - nmc_meta_environment_arg, - setting, - value, - error); -} - -/* - * Generic function for setting property value. - * - * Sets property=value in setting by calling specialized functions. - * If value is NULL then default property value is set. - * - * Returns: TRUE on success; FALSE on failure and sets error - */ gboolean -nmc_setting_set_property (NMClient *client, NMSetting *setting, const char *prop, const char *value, GError **error) +nmc_setting_set_property (NMClient *client, + NMSetting *setting, + const char *prop, + char modifier, + const char *value, + GError **error) { const NMMetaPropertyInfo *property_info; + gs_free char *value_to_free = NULL; + gboolean success; g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); + g_return_val_if_fail (NM_IN_SET (modifier, '\0', '-', '+'), FALSE); - if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) { - - if (!value) { - /* No value argument sets default value */ - nmc_property_set_default_value (setting, prop); - return TRUE; - } - - if (property_info->property_type->set_fcn) { - switch (property_info->setting_info->general->meta_type) { - case NM_META_SETTING_TYPE_CONNECTION: - if (nm_streq (property_info->property_name, NM_SETTING_CONNECTION_SECONDARIES)) { - gs_free char *value_coerced = NULL; - - if (!_set_fcn_precheck_connection_secondaries (client, value, &value_coerced, error)) - return FALSE; + if (!(property_info = nm_meta_property_info_find_by_setting (setting, prop))) + goto out_fail_read_only; + if (!property_info->property_type->set_fcn) + goto out_fail_read_only; - return _set_fcn_call (property_info, - setting, - value_coerced ?: value, - error); - } - break; - default: - break; - } - return _set_fcn_call (property_info, - setting, - value, - error); - } + if ( NM_IN_SET (modifier, '+', '-') + && !value) { + /* nothing to do. */ + return TRUE; } - g_set_error_literal (error, 1, 0, _("the property can't be changed")); - return FALSE; -} - -void -nmc_property_set_default_value (NMSetting *setting, const char *prop) -{ - GValue value = G_VALUE_INIT; - GParamSpec *param_spec; - - param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop); - if (param_spec) { - g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (param_spec)); - g_param_value_set_default (param_spec, &value); - g_object_set_property (G_OBJECT (setting), prop, &value); + if ( modifier == '-' + && !property_info->property_type->set_supports_remove) { + /* The property is a plain property. It does not support '-'. + * + * Maybe we should fail, but just return silently. */ + return TRUE; } -} - -/* - * Generic function for resetting (single value) properties. - * - * The function resets the property value to the default one. It respects - * nmcli restrictions for changing properties. So if 'set_func' is NULL, - * resetting the value is denied. - * - * Returns: TRUE on success; FALSE on failure and sets error - */ -gboolean -nmc_setting_reset_property (NMSetting *setting, const char *prop, GError **error) -{ - const NMMetaPropertyInfo *property_info; - - g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) { - if (property_info->property_type->set_fcn) { - nmc_property_set_default_value (setting, prop); - return TRUE; + if (value) { + switch (property_info->setting_info->general->meta_type) { + case NM_META_SETTING_TYPE_CONNECTION: + if (nm_streq (property_info->property_name, NM_SETTING_CONNECTION_SECONDARIES)) { + if (!_set_fcn_precheck_connection_secondaries (client, value, &value_to_free, error)) + return FALSE; + if (value_to_free) + value = value_to_free; + } + break; + default: + break; } } - g_set_error_literal (error, 1, 0, _("the property can't be changed")); + g_object_freeze_notify (G_OBJECT (setting)); + success = property_info->property_type->set_fcn (property_info, + nmc_meta_environment, + nmc_meta_environment_arg, + setting, + modifier, + value, + error); + g_object_thaw_notify (G_OBJECT (setting)); + return success; + +out_fail_read_only: + nm_utils_error_set (error, NM_UTILS_ERROR_UNKNOWN, _("the property can't be changed")); return FALSE; } -/* - * Generic function for removing items for collection-type properties. - * - * If 'option' is not NULL, it tries to remove it, otherwise 'idx' is used. - * For single-value properties (not having specialized remove function) this - * function does nothing and just returns TRUE. - * - * Returns: TRUE on success; FALSE on failure and sets error - */ -gboolean -nmc_setting_remove_property_option (NMSetting *setting, - const char *prop, - const char *option, - guint32 idx, - GError **error) -{ - const NMMetaPropertyInfo *property_info; - - g_return_val_if_fail (NM_IS_SETTING (setting), FALSE); - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - if ((property_info = nm_meta_property_info_find_by_setting (setting, prop))) { - if (property_info->property_type->remove_fcn) { - return property_info->property_type->remove_fcn (property_info, - nmc_meta_environment, - nmc_meta_environment_arg, - setting, - option, - idx, - error); - } - } - - return TRUE; -} - /* * Get valid property names for a setting. * @@ -749,41 +689,6 @@ nmc_setting_get_property_desc (NMSetting *setting, const char *prop) nmcli_desc ?: ""); } -/* - * Gets setting:prop property value and returns it in 'value'. - * Caller is responsible for freeing the GValue resources using g_value_unset() - */ -gboolean -nmc_property_get_gvalue (NMSetting *setting, const char *prop, GValue *value) -{ - GParamSpec *param_spec; - - param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop); - if (param_spec) { - memset (value, 0, sizeof (GValue)); - g_value_init (value, G_PARAM_SPEC_VALUE_TYPE (param_spec)); - g_object_get_property (G_OBJECT (setting), prop, value); - return TRUE; - } - return FALSE; -} - -/* - * Sets setting:prop property value from 'value'. - */ -gboolean -nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value) -{ - GParamSpec *param_spec; - - param_spec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), prop); - if (param_spec && G_VALUE_TYPE (value) == G_PARAM_SPEC_VALUE_TYPE (param_spec)) { - g_object_set_property (G_OBJECT (setting), prop, value); - return TRUE; - } - return FALSE; -} - /*****************************************************************************/ gboolean diff --git a/clients/cli/settings.h b/clients/cli/settings.h index 4e7e38df..1ff93685 100644 --- a/clients/cli/settings.h +++ b/clients/cli/settings.h @@ -45,20 +45,9 @@ char *nmc_setting_get_property_parsable (NMSetting *setting, gboolean nmc_setting_set_property (NMClient *client, NMSetting *setting, const char *prop, + char modifier, const char *val, GError **error); -gboolean nmc_setting_reset_property (NMSetting *setting, - const char *prop, - GError **error); -gboolean nmc_setting_remove_property_option (NMSetting *setting, - const char *prop, - const char *option, - guint32 idx, - GError **error); -void nmc_property_set_default_value (NMSetting *setting, const char *prop); - -gboolean nmc_property_get_gvalue (NMSetting *setting, const char *prop, GValue *value); -gboolean nmc_property_set_gvalue (NMSetting *setting, const char *prop, GValue *value); gboolean setting_details (const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop); diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 0e74ba88..a8b81279 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -508,7 +508,8 @@ nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, gs_free const char **arr0 = NULL; char **arr; - arr0 = nm_utils_strsplit_set (line ?: "", delim ?: " \t", FALSE); + arr0 = nm_utils_strsplit_set (line ?: "", + delim ?: " \t"); if (!arr0) arr = g_new0 (char *, 1); else diff --git a/clients/common/meson.build b/clients/common/meson.build index b4b6bcac..fed0f3bf 100644 --- a/clients/common/meson.build +++ b/clients/common/meson.build @@ -4,7 +4,7 @@ nm_polkit_listener = files('nm-polkit-listener.c') deps = [ libnm_dep, - nm_core_dep, + shared_nm_libnm_core_aux_dep, ] cflags = clients_cflags + [ @@ -55,7 +55,7 @@ libnmc = static_library( sources: files( 'nm-meta-setting-access.c', 'nm-meta-setting-desc.c', - ) + shared_nm_meta_setting_c + shared_nm_ethtool_utils_c + [settings_docs_source], + ) + shared_nm_meta_setting_c + [settings_docs_source], dependencies: deps, c_args: cflags, link_with: libnmc_base, diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index 1241131a..0a155dae 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -82,6 +82,10 @@ nmc_string_to_uint_base (const char *str, char *end; unsigned long int tmp; + if (!str || !str[0]) + return FALSE; + + /* FIXME: don't use this function, replace by _nm_utils_ascii_str_to_int64() */ errno = 0; tmp = strtoul (str, &end, base); if (errno || *end != '\0' || (range_check && (tmp < min || tmp > max))) { diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h index a5bc05fa..08a39f03 100644 --- a/clients/common/nm-client-utils.h +++ b/clients/common/nm-client-utils.h @@ -23,13 +23,7 @@ #include "nm-meta-setting.h" #include "nm-active-connection.h" #include "nm-device.h" - - -#define nm_auto_unref_ip_address nm_auto (_nm_ip_address_unref) -NM_AUTO_DEFINE_FCN0 (NMIPAddress *, _nm_ip_address_unref, nm_ip_address_unref) - -#define nm_auto_unref_wgpeer nm_auto (_nm_auto_unref_wgpeer) -NM_AUTO_DEFINE_FCN0 (NMWireGuardPeer *, _nm_auto_unref_wgpeer, nm_wireguard_peer_unref) +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len); diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index bd4064de..8399f29d 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -101,6 +101,22 @@ nm_meta_setting_info_editor_get_property_info (const NMMetaSettingInfoEditor *se return NULL; } +gboolean +nm_meta_setting_info_editor_has_secrets (const NMMetaSettingInfoEditor *setting_info) +{ + guint i; + + if (!setting_info) + return FALSE; + + for (i = 0; i < setting_info->properties_num; i++) { + if (setting_info->properties[i]->is_secret) + return TRUE; + } + + return FALSE; +} + const NMMetaPropertyInfo * nm_meta_property_info_find_by_name (const char *setting_name, const char *property_name) { diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h index 9898cc5a..ec1c2ba0 100644 --- a/clients/common/nm-meta-setting-access.h +++ b/clients/common/nm-meta-setting-access.h @@ -39,6 +39,8 @@ const NMMetaPropertyInfo *nm_meta_property_info_find_by_name (const char *settin const NMMetaPropertyInfo *nm_meta_property_info_find_by_setting (NMSetting *setting, const char *property_name); +gboolean nm_meta_setting_info_editor_has_secrets (const NMMetaSettingInfoEditor *setting_info); + /*****************************************************************************/ const NMMetaSettingInfoEditor *const*nm_meta_setting_infos_editor_p (void); diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 6e35228a..698ded86 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -24,8 +24,10 @@ #include #include -#include "nm-common-macros.h" -#include "nm-utils/nm-enum-utils.h" +#include "nm-libnm-core-intern/nm-common-macros.h" +#include "nm-glib-aux/nm-enum-utils.h" +#include "nm-glib-aux/nm-secret-utils.h" +#include "nm-libnm-core-intern/nm-libnm-core-utils.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" @@ -74,6 +76,196 @@ _gtype_property_get_gtype (GType gtype, const char *property_name) /*****************************************************************************/ +static int +_int64_cmp_desc (gconstpointer a, + gconstpointer b, + gpointer user_data) +{ + NM_CMP_DIRECT (*((const gint64 *) b), *((const gint64 *) a)); + return 0; +} + +static gint64 * +_value_str_as_index_list (const char *value, gsize *out_len) +{ + gs_free char *str_clone_free = NULL; + gboolean str_cloned = FALSE; + char *str; + gsize i, j; + gsize n_alloc; + gsize len; + gs_free gint64 *arr = NULL; + + *out_len = 0; + + if (!value) + return NULL; + + str = (char *) value; + n_alloc = 0; + len = 0; + while (TRUE) { + gint64 i64; + const char *s; + gsize good; + + good = strcspn (str, ","NM_ASCII_SPACES); + if (good == 0) { + if (str[0] == '\0') + break; + str++; + continue; + } + if (str[good] == '\0') { + s = str; + str += good; + } else { + if (!str_cloned) { + str_cloned = TRUE; + str = nm_strndup_a (200, str, strlen (str), &str_clone_free); + } + s = str; + str[good] = '\0'; + str += good + 1; + } + + i64 = _nm_utils_ascii_str_to_int64 (s, 10, 0, G_MAXINT64, -1); + if (i64 == -1) + return NULL; + + if (len >= n_alloc) { + if (n_alloc > 0) { + n_alloc = n_alloc * 2; + arr = g_realloc (arr, n_alloc * sizeof (gint64)); + } else { + n_alloc = 4; + arr = g_new (gint64, n_alloc); + } + } + arr[len++] = i64; + } + + if (len > 1) { + /* sort the list of indexes descendingly, and drop duplicates. */ + g_qsort_with_data (arr, + len, + sizeof (gint64), + _int64_cmp_desc, + NULL); + j = 1; + for (i = 1; i < len; i++) { + nm_assert (arr[i - 1] >= arr[i]); + if (arr[i - 1] > arr[i]) + arr[j++] = arr[i]; + } + len = j; + } + + *out_len = len; + return g_steal_pointer (&arr); +} + +#define ESCAPED_TOKENS_WITH_SPACES_DELIMTER ' ' +#define ESCAPED_TOKENS_WITH_SPACES_DELIMTERS NM_ASCII_SPACES"," + +#define ESCAPED_TOKENS_DELIMITER ',' +#define ESCAPED_TOKENS_DELIMITERS "," + +typedef enum { + VALUE_STRSPLIT_MODE_OBJLIST, + VALUE_STRSPLIT_MODE_MULTILIST, + VALUE_STRSPLIT_MODE_ESCAPED_TOKENS, + VALUE_STRSPLIT_MODE_ESCAPED_TOKENS_WITH_SPACES, +} ValueStrsplitMode; + +static const char ** +_value_strsplit (const char *value, + ValueStrsplitMode split_mode, + gsize *out_len) +{ + gs_free const char **strv = NULL; + gsize i; + gsize len; + + /* FIXME: some modes should support backslash escaping. + * In particular, to distingish from _value_str_as_index_list(), which + * does not accept '\\'. */ + + /* note that all modes remove empty tokens (",", "a,,b", ",,"). */ + switch (split_mode) { + case VALUE_STRSPLIT_MODE_OBJLIST: + strv = nm_utils_strsplit_set (value, ESCAPED_TOKENS_DELIMITERS); + break; + case VALUE_STRSPLIT_MODE_MULTILIST: + strv = nm_utils_strsplit_set (value, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS); + break; + case VALUE_STRSPLIT_MODE_ESCAPED_TOKENS: + strv = nm_utils_escaped_tokens_split (value, ESCAPED_TOKENS_DELIMITERS); + NM_SET_OUT (out_len, NM_PTRARRAY_LEN (strv)); + return g_steal_pointer (&strv); + case VALUE_STRSPLIT_MODE_ESCAPED_TOKENS_WITH_SPACES: + strv = nm_utils_escaped_tokens_split (value, ESCAPED_TOKENS_WITH_SPACES_DELIMTERS); + NM_SET_OUT (out_len, NM_PTRARRAY_LEN (strv)); + return g_steal_pointer (&strv); + default: + nm_assert_not_reached (); + break; + } + + NM_SET_OUT (out_len, 0); + + if (!strv) + return NULL; + + len = 0; + for (i = 0; strv[i]; i++) { + const char *s = strv[i]; + + s = nm_str_skip_leading_spaces (s); + if (s[0] == '\0') + continue; + + g_strchomp ((char *) s); + strv[len++] = s; + } + strv[len] = NULL; + + NM_SET_OUT (out_len, len); + return g_steal_pointer (&strv); +} + +static gboolean +_value_strsplit_assert_unsplitable (const char *str) +{ +#if NM_MORE_ASSERTS > 5 + gs_free const char **strv_test = NULL; + gsize j, l; + + /* Assert that we cannot split the token and that it + * has no unescaped delimiters. */ + + strv_test = _value_strsplit (str, + VALUE_STRSPLIT_MODE_ESCAPED_TOKENS, + NULL); + nm_assert (NM_PTRARRAY_LEN (strv_test) == 1); + + for (j = 0; str[j] != '\0'; ) { + if (str[j] == '\\') { + j++; + nm_assert (str[j] != '\0'); + } else + nm_assert (!NM_IN_SET (str[j], '\0', ',')); + j++; + } + l = j; + nm_assert ( !g_ascii_isspace (str[l - 1]) + || ( l >= 2 + && str[l - 2] == '\\')); +#endif + + return TRUE; +} + static NMIPAddress * _parse_ip_address (int family, const char *address, GError **error) { @@ -123,20 +315,20 @@ _parse_ip_route (int family, gint64 metric = -1; guint i; gs_free const char **routev = NULL; - gs_free char *str_clean = NULL; + gs_free char *str_clean_free = NULL; + const char *str_clean; gs_free char *dest_clone = NULL; const char *dest; const char *plen; gs_unref_hashtable GHashTable *attrs = NULL; - GHashTable *tmp_attrs; #define ROUTE_SYNTAX _("The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] ...]'") nm_assert (NM_IN_SET (family, AF_INET, AF_INET6)); nm_assert (str); nm_assert (!error || !*error); - str_clean = g_strstrip (g_strdup (str)); - routev = nm_utils_strsplit_set (str_clean, " \t", FALSE); + str_clean = nm_strstrip_avoid_copy_a (300, str, &str_clean_free); + routev = nm_utils_strsplit_set (str_clean, " \t"); if (!routev) { g_set_error (error, 1, 0, "'%s' is not valid. %s", @@ -182,6 +374,7 @@ _parse_ip_route (int family, GHashTableIter iter; char *iter_key; GVariant *iter_value; + gs_unref_hashtable GHashTable *tmp_attrs = NULL; tmp_attrs = nm_utils_parse_variant_attributes (routev[i], ' ', '=', FALSE, nm_ip_route_get_variant_attribute_spec(), @@ -207,13 +400,11 @@ _parse_ip_route (int family, if (!nm_ip_route_attribute_validate (iter_key, iter_value, family, NULL, error)) { g_prefix_error (error, "%s: ", iter_key); - g_hash_table_unref (tmp_attrs); return NULL; } g_hash_table_insert (attrs, iter_key, iter_value); g_hash_table_iter_steal (&iter); } - g_hash_table_unref (tmp_attrs); } else { g_set_error (error, 1, 0, "%s", ROUTE_SYNTAX); return NULL; @@ -298,7 +489,8 @@ _parse_team_link_watcher (const char *str, GError **error) { gs_free const char **watcherv = NULL; - gs_free char *str_clean = NULL; + gs_free char *str_clean_free = NULL; + const char *str_clean; guint i; gs_free const char *name = NULL; int val1 = 0, val2 = 0, val3 = 3, val4 = -1; @@ -309,8 +501,8 @@ _parse_team_link_watcher (const char *str, nm_assert (str); nm_assert (!error || !*error); - str_clean = g_strstrip (g_strdup (str)); - watcherv = nm_utils_strsplit_set (str_clean, " \t", FALSE); + str_clean = nm_strstrip_avoid_copy_a (300, str, &str_clean_free); + watcherv = nm_utils_strsplit_set (str_clean, " \t"); if (!watcherv) { g_set_error (error, 1, 0, "'%s' is not valid", str); return NULL; @@ -319,7 +511,7 @@ _parse_team_link_watcher (const char *str, for (i = 0; watcherv[i]; i++) { gs_free const char **pair = NULL; - pair = nm_utils_strsplit_set (watcherv[i], "=", FALSE); + pair = nm_utils_strsplit_set (watcherv[i], "="); if (!pair) { g_set_error (error, 1, 0, "'%s' is not valid: %s", watcherv[i], "properties should be specified as 'key=value'"); @@ -397,62 +589,6 @@ _parse_team_link_watcher (const char *str, #define MAX_SKB_PRIO G_MAXUINT32 #define MAX_8021P_PRIO 7 /* Max 802.1p priority */ -/* - * Parse VLAN priority mappings from the following format: 2:1,3:4,7:3 - * and verify if the priority numbers are valid - * - * Return: string array with split maps, or NULL on error - * Caller is responsible for freeing the array. - */ -static char ** -_parse_vlan_priority_maps (const char *priority_map, - NMVlanPriorityMap map_type, - GError **error) -{ - char **mapping = NULL, **iter; - unsigned long from, to, from_max, to_max; - - g_return_val_if_fail (priority_map != NULL, NULL); - g_return_val_if_fail (error == NULL || *error == NULL, NULL); - - if (map_type == NM_VLAN_INGRESS_MAP) { - from_max = MAX_8021P_PRIO; - to_max = MAX_SKB_PRIO; - } else { - from_max = MAX_SKB_PRIO; - to_max = MAX_8021P_PRIO; - } - - mapping = g_strsplit (priority_map, ",", 0); - for (iter = mapping; iter && *iter; iter++) { - char *left, *right; - - left = g_strstrip (*iter); - right = strchr (left, ':'); - if (!right) { - g_set_error (error, 1, 0, _("invalid priority map '%s'"), *iter); - g_strfreev (mapping); - return NULL; - } - *right++ = '\0'; - - if (!nmc_string_to_uint (left, TRUE, 0, from_max, &from)) { - g_set_error (error, 1, 0, _("priority '%s' is not valid (<0-%ld>)"), - left, from_max); - g_strfreev (mapping); - return NULL; - } - if (!nmc_string_to_uint (right, TRUE, 0, to_max, &to)) { - g_set_error (error, 1, 0, _("priority '%s' is not valid (<0-%ld>)"), - right, to_max); - g_strfreev (mapping); - return NULL; - } - *(right-1) = ':'; /* Put back ':' */ - } - return mapping; -} - /* * nmc_proxy_check_script: * @script: file name with PAC script, or raw PAC Script data @@ -646,10 +782,10 @@ _env_warn_fcn (const NMMetaEnvironment *environment, const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, gboolean *out_is_default, gpointer *out_to_free #define ARGS_SET_FCN \ - const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, GError **error + const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, char modifier, const char *value, GError **error #define ARGS_REMOVE_FCN \ - const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, guint32 idx, GError **error + const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, const char *value, GError **error #define ARGS_COMPLETE_FCN \ const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, const NMMetaOperationContext *operation_context, const char *text, char ***out_to_free @@ -660,6 +796,46 @@ _env_warn_fcn (const NMMetaEnvironment *environment, #define ARGS_SETTING_INIT_FCN \ const NMMetaSettingInfoEditor *setting_info, NMSetting *setting, NMMetaAccessorSettingInitType init_type +static gboolean +_SET_FCN_DO_RESET_DEFAULT (const NMMetaPropertyInfo *property_info, char modifier, const char *value) +{ + nm_assert (property_info); + nm_assert (!property_info->property_type->set_supports_remove); + nm_assert (NM_IN_SET (modifier, '\0', '+')); + nm_assert (value || modifier == '\0'); + + return value == NULL; +} + +static gboolean +_SET_FCN_DO_RESET_DEFAULT_WITH_SUPPORTS_REMOVE (const NMMetaPropertyInfo *property_info, char modifier, const char *value) +{ + nm_assert (property_info); + nm_assert (property_info->property_type->set_supports_remove); + nm_assert (NM_IN_SET (modifier, '\0', '+', '-')); + nm_assert (value || modifier == '\0'); + + return value == NULL; +} + +static gboolean +_SET_FCN_DO_SET_ALL (char modifier, const char *value) +{ + nm_assert (NM_IN_SET (modifier, '\0', '+', '-')); + nm_assert (value); + + return modifier == '\0'; +} + +static gboolean +_SET_FCN_DO_REMOVE (char modifier, const char *value) +{ + nm_assert (NM_IN_SET (modifier, '\0', '+', '-')); + nm_assert (value); + + return modifier == '-'; +} + #define RETURN_UNSUPPORTED_GET_TYPE() \ G_STMT_START { \ if (!NM_IN_SET (get_type, \ @@ -677,7 +853,7 @@ _env_warn_fcn (const NMMetaEnvironment *environment, } G_STMT_END static gboolean -property_is_default (NMSetting *setting, const char *prop_name) +_gobject_property_is_default (NMSetting *setting, const char *prop_name) { nm_auto_unset_gvalue GValue v = G_VALUE_INIT; GParamSpec *pspec; @@ -703,32 +879,30 @@ property_is_default (NMSetting *setting, const char *prop_name) return g_param_value_defaults (pspec, &v); } -static gconstpointer -_get_fcn_nmc_with_default (ARGS_GET_FCN) +static gboolean +_gobject_property_reset (NMSetting *setting, + const char *prop_name, + gboolean reset_default) { - const char *s; - char *s_full; - GValue val = G_VALUE_INIT; - - RETURN_UNSUPPORTED_GET_TYPE (); - NM_SET_OUT (out_is_default, property_is_default (setting, property_info->property_name)); + nm_auto_unset_gvalue GValue v = G_VALUE_INIT; + GParamSpec *pspec; - if (property_info->property_typ_data->subtype.get_with_default.fcn (setting)) { - if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) - return _("(default)"); - return ""; - } + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), + prop_name); + if (!G_IS_PARAM_SPEC (pspec)) + g_return_val_if_reached (FALSE); - g_value_init (&val, G_TYPE_STRING); - g_object_get_property (G_OBJECT (setting), property_info->property_name, &val); - s = g_value_get_string (&val); - if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) - s_full = s ? g_strdup_printf ("\"%s\"", s) : g_strdup (""); - else - s_full = g_strdup (s && *s ? s : " "); - g_value_unset (&val); + g_value_init (&v, pspec->value_type); + if (reset_default) + g_param_value_defaults (pspec, &v); + g_object_set_property (G_OBJECT (setting), prop_name, &v); + return TRUE; +} - RETURN_STR_TO_FREE (s_full); +static gboolean +_gobject_property_reset_default (NMSetting *setting, const char *prop_name) +{ + return _gobject_property_reset (setting, prop_name, TRUE); } static gconstpointer @@ -738,13 +912,20 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, gboolean *out_is_default, gpointer *out_to_free) { - char *s; - const char *s_c; + const char *cstr; GType gtype_prop; nm_auto_unset_gvalue GValue val = G_VALUE_INIT; RETURN_UNSUPPORTED_GET_TYPE (); - NM_SET_OUT (out_is_default, property_is_default (setting, property_info->property_name)); + NM_SET_OUT (out_is_default, _gobject_property_is_default (setting, property_info->property_name)); + + if ( property_info->property_typ_data + && property_info->property_typ_data->is_default_fcn + && property_info->property_typ_data->is_default_fcn (setting)) { + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return _("(default)"); + return ""; + } gtype_prop = _gobject_property_get_gtype (G_OBJECT (setting), property_info->property_name); @@ -755,15 +936,35 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, g_object_get_property (G_OBJECT (setting), property_info->property_name, &val); b = g_value_get_boolean (&val); if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) - s_c = b ? _("yes") : _("no"); + cstr = b ? _("yes") : _("no"); else - s_c = b ? "yes" : "no"; - return s_c; + cstr = b ? "yes" : "no"; + return cstr; } else { + char *str; + + /* Note that we register certain transform functions in nmc_value_transforms_register(). + * This makes G_TYPE_STRV working. + * + * FIXME: that is particularly ugly because it's non-obvious which code relies + * on nmc_value_transforms_register(). Also, nmc_value_transforms_register() is + * in clients/cli, while we are here in clients/common. */ g_value_init (&val, G_TYPE_STRING); g_object_get_property (G_OBJECT (setting), property_info->property_name, &val); - s = g_value_dup_string (&val); - RETURN_STR_TO_FREE (s); + cstr = g_value_get_string (&val); + + if ( property_info->property_typ_data + && property_info->property_typ_data->is_default_fcn) { + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) { + str = cstr + ? g_strdup_printf ("\"%s\"", cstr) + : g_strdup (""); + } else + str = g_strdup (cstr && cstr[0] ? cstr : " "); + } else + str = cstr ? g_strdup (cstr) : NULL; + + RETURN_STR_TO_FREE (str); } } @@ -842,10 +1043,9 @@ _get_fcn_gobject_int (ARGS_GET_FCN) for (; value_infos->nick; value_infos++) { if ( ( is_uint64 && value_infos->value.u64 == v.u64) || (!is_uint64 && value_infos->value.i64 == v.i64)) { - char *old_str = return_str; + gs_free char *old_str = return_str; return_str = g_strdup_printf ("%s (%s)", old_str, value_infos->nick); - g_free (old_str); break; } } @@ -1033,6 +1233,9 @@ _set_fcn_gobject_string (ARGS_SET_FCN) { gs_free char *to_free = NULL; + if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) + return _gobject_property_reset_default (setting, property_info->property_name); + if (property_info->property_typ_data) { if (property_info->property_typ_data->subtype.gobject_string.validate_fcn) { value = property_info->property_typ_data->subtype.gobject_string.validate_fcn (value, &to_free, error); @@ -1055,6 +1258,9 @@ _set_fcn_gobject_bool (ARGS_SET_FCN) { gboolean val_bool; + if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) + return _gobject_property_reset_default (setting, property_info->property_name); + if (!nmc_string_to_bool (value, &val_bool, error)) return FALSE; @@ -1076,6 +1282,9 @@ _set_fcn_gobject_int (ARGS_SET_FCN) guint base = 10; const NMMetaUtilsIntValueInfo *value_infos; + if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) + return _gobject_property_reset_default (setting, property_info->property_name); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), property_info->property_name); if (!G_IS_PARAM_SPEC (pspec)) g_return_val_if_reached (FALSE); @@ -1085,14 +1294,10 @@ _set_fcn_gobject_int (ARGS_SET_FCN) if (property_info->property_typ_data) { if ( value && (value_infos = property_info->property_typ_data->subtype.gobject_int.value_infos)) { - gs_free char *vv_stripped = NULL; - const char *vv = nm_str_skip_leading_spaces (value); - - if (vv[0] && g_ascii_isspace (vv[strlen (vv) - 1])) { - vv_stripped = g_strstrip (g_strdup (vv)); - vv = vv_stripped; - } + gs_free char *vv_free = NULL; + const char *vv; + vv = nm_strstrip_avoid_copy_a (300, value, &vv_free); for (; value_infos->nick; value_infos++) { if (nm_streq (value_infos->nick, vv)) { v = value_infos->value; @@ -1216,7 +1421,10 @@ _set_fcn_gobject_mtu (ARGS_SET_FCN) const GParamSpec *pspec; gint64 v; - if (nm_streq0 (value, "auto")) + if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) + return _gobject_property_reset_default (setting, property_info->property_name); + + if (nm_streq (value, "auto")) value = "0"; pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (G_OBJECT (setting)), @@ -1254,6 +1462,9 @@ _set_fcn_gobject_mac (ARGS_SET_FCN) NMMetaPropertyTypeMacMode mode; gboolean valid; + if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) + return _gobject_property_reset_default (setting, property_info->property_name); + if (property_info->property_typ_data) mode = property_info->property_typ_data->subtype.mac.mode; else @@ -1289,6 +1500,9 @@ _set_fcn_gobject_enum (ARGS_SET_FCN) gboolean is_flags; int v; + if (_SET_FCN_DO_RESET_DEFAULT (property_info, modifier, value)) + return _gobject_property_reset_default (setting, property_info->property_name); + if (property_info->property_typ_data) { if (property_info->property_typ_data->subtype.gobject_enum.get_gtype) { gtype = property_info->property_typ_data->subtype.gobject_enum.get_gtype (); @@ -1558,25 +1772,6 @@ vlan_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type) return g_string_free (flag_str, FALSE); } -static char * -vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map) -{ - GString *priorities; - int i; - - priorities = g_string_new (NULL); - for (i = 0; i < nm_setting_vlan_get_num_priorities (s_vlan, map); i++) { - guint32 from, to; - - if (nm_setting_vlan_get_priority (s_vlan, map, i, &from, &to)) - g_string_append_printf (priorities, "%d:%d,", from, to); - } - if (priorities->len) - g_string_truncate (priorities, priorities->len-1); /* chop off trailing ',' */ - - return g_string_free (priorities, FALSE); -} - static char * secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type) { @@ -1619,166 +1814,204 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) g_string_append_printf (ret_str, "%s = %s", key, value); } -#define DEFINE_SETTER_STR_LIST_MULTI(def_func, s_macro, set_func) \ - static gboolean \ - def_func (NMSetting *setting, \ - const char *prop, \ - const char *value, \ - const char **valid_strv, \ - GError **error) \ - { \ - gs_free const char **strv = NULL; \ - gsize i; \ - const char *item; \ - nm_assert (!error || !*error); \ - strv = nm_utils_strsplit_set (value, " \t,", FALSE); \ - if (strv) { \ - for (i = 0; strv[i]; i++) { \ - if (!(item = nmc_string_is_valid (strv[i], valid_strv, error))) { \ - return FALSE; \ - } \ - set_func (s_macro (setting), item); \ - } \ - } \ - return TRUE; \ +static const char * +_multilist_do_validate (const NMMetaPropertyInfo *property_info, + NMSetting *setting, + const char *item, + GError **error) +{ + if (property_info->property_typ_data->values_static) { + nm_assert (!property_info->property_typ_data->subtype.multilist.validate_fcn); + return nmc_string_is_valid (item, + (const char **) property_info->property_typ_data->values_static, + error); + } + if (property_info->property_typ_data->subtype.multilist.validate_fcn) { + return property_info->property_typ_data->subtype.multilist.validate_fcn (item, + error); + } + if (property_info->property_typ_data->subtype.multilist.validate2_fcn) { + return property_info->property_typ_data->subtype.multilist.validate2_fcn (setting, + item, + error); } -#define DEFINE_SETTER_OPTIONS(def_func, s_macro, s_type, add_func, valid_func1, valid_func2) \ - static gboolean \ - def_func (ARGS_SET_FCN) \ - { \ - gs_free const char **strv = NULL; \ - const char **iter; \ - const char **(*valid_func1_p) (s_type *) = valid_func1; \ - const char * (*valid_func2_p) (const char *, const char *, GError **) = valid_func2; \ - const char *opt_name, *opt_val; \ - \ - nm_assert (!error || !*error); \ - \ - strv = nm_utils_strsplit_set (value, ",", FALSE); \ - for (iter = strv; iter && *iter; iter++) { \ - gs_free char *left_clone = g_strstrip (g_strdup (*iter)); \ - char *left = left_clone; \ - char *right = strchr (left, '='); \ - if (!right) { \ - g_set_error (error, 1, 0, _("'%s' is not valid; use