From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- Makefile.am | 954 ++- Makefile.examples | 13 +- Makefile.in | 3467 +++++---- NEWS | 108 +- README | 2 +- TODO | 6 +- autogen.sh | 2 +- build-aux/compile | 2 +- build-aux/config.guess | 2 +- build-aux/config.sub | 2 +- build-aux/depcomp | 2 +- build-aux/ltmain.sh | 4 +- build-aux/missing | 2 +- build-aux/tap-driver.sh | 2 +- build-aux/test-driver | 2 +- clients/cli/agent.c | 3 +- clients/cli/common.c | 419 +- clients/cli/common.h | 14 +- clients/cli/connections.c | 2738 ++++---- clients/cli/connections.h | 8 +- clients/cli/devices.c | 528 +- clients/cli/devices.h | 4 +- clients/cli/general.c | 118 +- clients/cli/meson.build | 49 + clients/cli/nmcli.c | 434 +- clients/cli/nmcli.h | 42 +- clients/cli/polkit-agent.c | 73 +- clients/cli/settings.c | 13 +- clients/cli/utils.c | 268 +- clients/cli/utils.h | 116 +- clients/common/meson.build | 76 + clients/common/nm-client-utils.c | 170 +- clients/common/nm-client-utils.h | 10 +- clients/common/nm-meta-setting-access.c | 3 + clients/common/nm-meta-setting-access.h | 1 + clients/common/nm-meta-setting-desc.c | 746 +- clients/common/nm-meta-setting-desc.h | 100 +- clients/common/nm-polkit-listener.c | 214 +- clients/common/nm-polkit-listener.h | 87 +- clients/common/nm-secret-agent-simple.c | 252 +- clients/common/nm-secret-agent-simple.h | 21 +- clients/common/nm-vpn-helpers.c | 2 +- clients/common/nm-vpn-helpers.h | 2 - clients/common/settings-docs.c | 387 - clients/common/settings-docs.c.in | 387 - clients/common/settings-docs.h | 393 ++ clients/common/settings-docs.h.in | 393 ++ clients/common/tests/meson.build | 23 + clients/common/tests/test-general.c | 10 +- clients/meson.build | 35 + clients/nm-online.c | 4 - .../tests/test-client.check-on-disk/Makefile.am | 359 + .../test_001-001.expected | 19 + .../test_001-002.expected | 21 + .../test_001-003.expected | 13 + .../test_001-004.expected | 13 + .../test_001-005.expected | 13 + .../test_001-006.expected | 13 + .../test_001-007.expected | 13 + .../test_001-008.expected | 13 + .../test_001-009.expected | 29 + .../test_001-010.expected | 29 + .../test_001-011.expected | 33 + .../test_001-012.expected | 33 + .../test_001-013.expected | 28 + .../test_001-014.expected | 28 + .../test_001-015.expected | 29 + .../test_001-016.expected | 29 + .../test_001-017.expected | 33 + .../test_001-018.expected | 33 + .../test_001-019.expected | 28 + .../test_001-020.expected | 28 + .../test_001-021.expected | 44 + .../test_001-022.expected | 44 + .../test_001-023.expected | 63 + .../test_001-024.expected | 63 + .../test_001-025.expected | 44 + .../test_001-026.expected | 44 + .../test_002-001.expected | 18 + .../test_002-002.expected | 18 + .../test_002-003.expected | 18 + .../test_002-004.expected | 18 + .../test_002-005.expected | 39 + .../test_002-006.expected | 41 + .../test_002-007.expected | 36 + .../test_002-008.expected | 36 + .../test_002-009.expected | 42 + .../test_002-010.expected | 42 + .../test_002-011.expected | 36 + .../test_002-012.expected | 36 + .../test_002-013.expected | 16 + .../test_002-014.expected | 16 + .../test_002-015.expected | 20 + .../test_002-016.expected | 20 + .../test_002-017.expected | 15 + .../test_002-018.expected | 15 + .../test_002-019.expected | 21 + .../test_002-020.expected | 21 + .../test_002-021.expected | 14 + .../test_002-022.expected | 14 + .../test_002-023.expected | 33 + .../test_002-024.expected | 33 + .../test_003-001.expected | 13 + .../test_003-002.expected | 15 + .../test_003-003.expected | 15 + .../test_003-004.expected | 13 + .../test_003-005.expected | 16 + .../test_003-006.expected | 16 + .../test_003-007.expected | 16 + .../test_003-008.expected | 16 + .../test_003-009.expected | 23 + .../test_003-010.expected | 23 + .../test_003-011.expected | 13 + .../test_003-012.expected | 16 + .../test_003-013.expected | 16 + .../test_003-014.expected | 16 + .../test_003-015.expected | 16 + .../test_003-016.expected | 14 + .../test_003-017.expected | 14 + .../test_003-018.expected | 14 + .../test_003-019.expected | 14 + .../test_003-020.expected | 14 + .../test_003-021.expected | 14 + .../test_003-022.expected | 91 + .../test_003-023.expected | 91 + .../test_003-024.expected | 13 + .../test_003-025.expected | 13 + .../test_003-026.expected | 103 + .../test_003-027.expected | 103 + .../test_003-028.expected | 19 + .../test_003-029.expected | 19 + .../test_003-030.expected | 67 + .../test_003-031.expected | 67 + .../test_003-032.expected | 67 + .../test_003-033.expected | 67 + .../test_003-034.expected | 13 + .../test_003-035.expected | 17 + .../test_003-036.expected | 17 + .../test_003-037.expected | 17 + .../test_003-038.expected | 17 + .../test_003-039.expected | 15 + .../test_003-040.expected | 15 + .../test_003-041.expected | 15 + .../test_003-042.expected | 15 + .../test_003-043.expected | 14 + .../test_003-044.expected | 14 + .../test_003-045.expected | 91 + .../test_003-046.expected | 91 + .../test_003-047.expected | 15 + .../test_003-048.expected | 15 + .../test_003-049.expected | 116 + .../test_003-050.expected | 116 + .../test_003-051.expected | 19 + .../test_003-052.expected | 19 + .../test_003-053.expected | 67 + .../test_003-054.expected | 67 + .../test_003-055.expected | 67 + .../test_003-056.expected | 67 + .../test_003-057.expected | 17 + .../test_003-058.expected | 17 + .../test_003-059.expected | 16 + .../test_003-060.expected | 16 + .../test_003-061.expected | 18 + .../test_003-062.expected | 18 + .../test_003-063.expected | 18 + .../test_003-064.expected | 18 + .../test_003-065.expected | 24 + .../test_003-066.expected | 24 + .../test_003-067.expected | 16 + .../test_003-068.expected | 16 + .../test_003-069.expected | 15 + .../test_003-070.expected | 15 + .../test_003-071.expected | 20 + .../test_003-072.expected | 20 + .../test_003-073.expected | 116 + .../test_003-074.expected | 116 + .../test_003-075.expected | 103 + .../test_003-076.expected | 103 + .../test_003-077.expected | 67 + .../test_003-078.expected | 67 + .../test_003-079.expected | 17 + .../test_003-080.expected | 17 + .../test_003-081.expected | 15 + .../test_003-082.expected | 15 + .../test_003-083.expected | 16 + .../test_003-084.expected | 16 + .../test_003-085.expected | 16 + .../test_003-086.expected | 16 + .../test_003-087.expected | 21 + .../test_003-088.expected | 21 + .../test_003-089.expected | 15 + .../test_003-090.expected | 15 + .../test_003-091.expected | 14 + .../test_003-092.expected | 14 + .../test_003-093.expected | 19 + .../test_003-094.expected | 19 + .../test_003-095.expected | 13 + .../test_003-096.expected | 13 + .../test_003-097.expected | 24 + .../test_003-098.expected | 24 + .../test_003-099.expected | 67 + .../test_003-100.expected | 67 + .../test_004-001.expected | 13 + .../test_004-002.expected | 13 + .../test_004-003.expected | 13 + .../test_004-004.expected | 13 + .../test_004-005.expected | 13 + .../test_004-006.expected | 12 + .../test_004-007.expected | 12 + .../test_004-008.expected | 94 + .../test_004-009.expected | 94 + .../test_004-010.expected | 13 + .../test_004-011.expected | 16 + .../test_004-012.expected | 16 + .../test_004-013.expected | 83 + .../test_004-014.expected | 83 + .../test_004-015.expected | 13 + .../test_004-016.expected | 16 + .../test_004-017.expected | 16 + .../test_004-018.expected | 13 + .../test_004-019.expected | 16 + .../test_004-020.expected | 16 + .../test_004-021.expected | 103 + .../test_004-022.expected | 103 + .../test_004-023.expected | 103 + .../test_004-024.expected | 103 + .../test_004-025.expected | 103 + .../test_004-026.expected | 103 + .../test_004-027.expected | 83 + .../test_004-028.expected | 83 + .../test_004-029.expected | 18 + .../test_004-030.expected | 18 + .../test_004-031.expected | 24 + .../test_004-032.expected | 24 + .../test_004-033.expected | 36 + .../test_004-034.expected | 36 + .../test_004-035.expected | 101 + .../test_004-036.expected | 101 + .../test_004-037.expected | 46 + .../test_004-038.expected | 46 + .../test_004-039.expected | 46 + .../test_004-040.expected | 46 + .../test_004-041.expected | 18 + .../test_004-042.expected | 18 + .../test_004-043.expected | 21 + .../test_004-044.expected | 21 + .../test_004-045.expected | 21 + .../test_004-046.expected | 21 + .../test_004-047.expected | 21 + .../test_004-048.expected | 21 + .../test_004-049.expected | 14 + .../test_004-050.expected | 14 + .../test_004-051.expected | 14 + .../test_004-052.expected | 14 + .../test_004-053.expected | 14 + .../test_004-054.expected | 14 + .../test_004-055.expected | 101 + .../test_004-056.expected | 101 + .../test_004-057.expected | 36 + .../test_004-058.expected | 36 + .../test_004-059.expected | 101 + .../test_004-060.expected | 101 + .../test_004-061.expected | 33 + .../test_004-062.expected | 33 + .../test_004-063.expected | 33 + .../test_004-064.expected | 33 + .../test_004-065.expected | 33 + .../test_004-066.expected | 33 + .../test_004-067.expected | 18 + .../test_004-068.expected | 18 + .../test_004-069.expected | 18 + .../test_004-070.expected | 18 + .../test_004-071.expected | 18 + .../test_004-072.expected | 18 + .../test_004-073.expected | 115 + .../test_004-074.expected | 115 + .../test_004-075.expected | 48 + .../test_004-076.expected | 48 + .../test_004-077.expected | 115 + .../test_004-078.expected | 115 + .../test_004-079.expected | 18 + .../test_004-080.expected | 18 + .../test_004-081.expected | 18 + .../test_004-082.expected | 18 + .../test_004-083.expected | 18 + .../test_004-084.expected | 18 + .../test_004-085.expected | 13 + .../test_004-086.expected | 13 + .../test_004-087.expected | 13 + .../test_004-088.expected | 13 + .../test_004-089.expected | 13 + .../test_004-090.expected | 13 + .../test_004-091.expected | 101 + .../test_004-092.expected | 101 + .../test_004-093.expected | 36 + .../test_004-094.expected | 36 + .../test_004-095.expected | 101 + .../test_004-096.expected | 101 + .../test_004-097.expected | 21 + .../test_004-098.expected | 21 + .../test_004-099.expected | 21 + .../test_004-100.expected | 21 + .../test_004-101.expected | 21 + .../test_004-102.expected | 21 + .../test_004-103.expected | 14 + .../test_004-104.expected | 14 + .../test_004-105.expected | 14 + .../test_004-106.expected | 14 + .../test_004-107.expected | 14 + .../test_004-108.expected | 14 + .../test_004-109.expected | 40 + .../test_004-110.expected | 40 + .../test_004-111.expected | 38 + .../test_004-112.expected | 38 + .../test_004-113.expected | 40 + .../test_004-114.expected | 40 + .../test_004-115.expected | 33 + .../test_004-116.expected | 33 + .../test_004-117.expected | 33 + .../test_004-118.expected | 33 + .../test_004-119.expected | 33 + .../test_004-120.expected | 33 + .../test_004-121.expected | 18 + .../test_004-122.expected | 18 + .../test_004-123.expected | 18 + .../test_004-124.expected | 18 + .../test_004-125.expected | 18 + .../test_004-126.expected | 18 + .../test_004-127.expected | 52 + .../test_004-128.expected | 52 + .../test_004-129.expected | 50 + .../test_004-130.expected | 50 + .../test_004-131.expected | 52 + .../test_004-132.expected | 52 + .../test_004-133.expected | 18 + .../test_004-134.expected | 18 + .../test_004-135.expected | 18 + .../test_004-136.expected | 18 + .../test_004-137.expected | 18 + .../test_004-138.expected | 18 + .../test_004-139.expected | 13 + .../test_004-140.expected | 13 + .../test_004-141.expected | 13 + .../test_004-142.expected | 13 + .../test_004-143.expected | 13 + .../test_004-144.expected | 13 + .../test_004-145.expected | 23 + .../test_004-146.expected | 23 + .../test_004-147.expected | 21 + .../test_004-148.expected | 21 + .../test_004-149.expected | 23 + .../test_004-150.expected | 23 + .../test_004-151.expected | 82 + .../test_004-152.expected | 82 + .../test_004-153.expected | 46 + .../test_004-154.expected | 46 + .../test_004-155.expected | 82 + .../test_004-156.expected | 82 + .../test_004-157.expected | 29 + .../test_004-158.expected | 29 + .../test_004-159.expected | 20 + .../test_004-160.expected | 20 + .../test_004-161.expected | 29 + .../test_004-162.expected | 29 + .../test_004-163.expected | 101 + .../test_004-164.expected | 101 + .../test_004-165.expected | 36 + .../test_004-166.expected | 36 + .../test_004-167.expected | 101 + .../test_004-168.expected | 101 + .../test_004-169.expected | 95 + .../test_004-170.expected | 95 + .../test_004-171.expected | 59 + .../test_004-172.expected | 59 + .../test_004-173.expected | 95 + .../test_004-174.expected | 95 + .../test_004-175.expected | 33 + .../test_004-176.expected | 33 + .../test_004-177.expected | 24 + .../test_004-178.expected | 24 + .../test_004-179.expected | 33 + .../test_004-180.expected | 33 + .../test_004-181.expected | 115 + .../test_004-182.expected | 115 + .../test_004-183.expected | 48 + .../test_004-184.expected | 48 + .../test_004-185.expected | 115 + .../test_004-186.expected | 115 + .../test_004-187.expected | 82 + .../test_004-188.expected | 82 + .../test_004-189.expected | 46 + .../test_004-190.expected | 46 + .../test_004-191.expected | 82 + .../test_004-192.expected | 82 + .../test_004-193.expected | 29 + .../test_004-194.expected | 29 + .../test_004-195.expected | 20 + .../test_004-196.expected | 20 + .../test_004-197.expected | 29 + .../test_004-198.expected | 29 + .../test_004-199.expected | 101 + .../test_004-200.expected | 101 + .../test_004-201.expected | 36 + .../test_004-202.expected | 36 + .../test_004-203.expected | 101 + .../test_004-204.expected | 101 + clients/tests/test-client.py | 1064 +++ clients/tui/meson.build | 72 + clients/tui/newt/meson.build | 35 + clients/tui/newt/nmt-newt-button-box.h | 1 - clients/tui/newt/nmt-newt-section.c | 2 +- clients/tui/newt/nmt-newt-utils.c | 18 +- clients/tui/newt/nmt-newt-widget.c | 4 +- clients/tui/nm-editor-bindings.h | 2 - clients/tui/nm-editor-utils.c | 2 - clients/tui/nm-editor-utils.h | 2 - clients/tui/nmt-connect-connection-list.c | 15 +- clients/tui/nmt-device-entry.c | 2 - clients/tui/nmt-device-entry.h | 2 - clients/tui/nmt-edit-connection-list.c | 3 +- clients/tui/nmt-edit-connection-list.h | 2 - clients/tui/nmt-editor-grid.c | 3 +- clients/tui/nmt-editor-page.h | 2 - clients/tui/nmt-editor.c | 1 - clients/tui/nmt-editor.h | 2 - clients/tui/nmt-mac-entry.c | 2 - clients/tui/nmt-page-bond.c | 30 +- clients/tui/nmt-page-team-port.c | 2 +- clients/tui/nmt-page-team.c | 2 +- clients/tui/nmt-page-wifi.c | 1 - clients/tui/nmt-password-dialog.c | 4 +- clients/tui/nmt-route-editor.h | 2 - clients/tui/nmt-route-entry.c | 4 +- clients/tui/nmt-route-table.c | 4 - clients/tui/nmt-slave-list.c | 2 - clients/tui/nmt-utils.c | 2 +- clients/tui/nmtui-connect.c | 43 +- clients/tui/nmtui-edit.c | 2 - clients/tui/nmtui-hostname.c | 2 +- clients/tui/nmtui.c | 4 +- clients/tui/nmtui.h | 2 - config.h.in | 34 +- config.h.meson | 261 + configure | 1459 ++-- configure.ac | 321 +- data/90-nm-thunderbolt.rules | 13 + data/NetworkManager.service.in | 5 + data/meson.build | 80 + dispatcher/meson.build | 71 + dispatcher/nm-dispatcher-utils.c | 677 +- dispatcher/nm-dispatcher.c | 14 +- dispatcher/tests/dispatcher-connectivity-full | 10 +- dispatcher/tests/dispatcher-connectivity-unknown | 10 +- dispatcher/tests/dispatcher-down | 1 + dispatcher/tests/dispatcher-external | 1 + dispatcher/tests/dispatcher-up | 1 + dispatcher/tests/dispatcher-vpn-down | 1 + dispatcher/tests/dispatcher-vpn-up | 1 + dispatcher/tests/meson.build | 25 + dispatcher/tests/test-dispatcher-envp.c | 60 +- docs/api/Makefile.am | 3 +- docs/api/Makefile.in | 14 +- ...-org.freedesktop.NetworkManager.Device.Bond.xml | 2 +- ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 2 +- ....freedesktop.NetworkManager.Device.IPTunnel.xml | 10 + ...-org.freedesktop.NetworkManager.Device.Team.xml | 2 +- ...org.freedesktop.NetworkManager.Device.WiMax.xml | 192 - ....freedesktop.NetworkManager.Device.Wireless.xml | 12 + .../dbus-org.freedesktop.NetworkManager.PPP.xml | 15 + ...edesktop.NetworkManager.Settings.Connection.xml | 27 +- docs/api/dbus-org.freedesktop.NetworkManager.xml | 105 +- docs/api/html/NetworkManager.conf.html | 92 +- docs/api/html/NetworkManager.devhelp2 | 515 +- docs/api/html/NetworkManager.html | 17 +- docs/api/html/ch01.html | 6 +- docs/api/html/dbus-secret-agent.html | 4 +- docs/api/html/dbus-types.html | 8 +- docs/api/html/dbus-vpn-plugin.html | 32 + docs/api/html/dbus-vpn-types.html | 4 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 8 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 4 +- ...-org.freedesktop.NetworkManager.Checkpoint.html | 110 + ...eedesktop.NetworkManager.Connection.Active.html | 4 +- ...org.freedesktop.NetworkManager.DHCP4Config.html | 4 +- ...org.freedesktop.NetworkManager.DHCP6Config.html | 4 +- ...org.freedesktop.NetworkManager.Device.Adsl.html | 4 +- ...reedesktop.NetworkManager.Device.Bluetooth.html | 4 +- ...org.freedesktop.NetworkManager.Device.Bond.html | 6 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 6 +- ...rg.freedesktop.NetworkManager.Device.Dummy.html | 4 +- ....freedesktop.NetworkManager.Device.Generic.html | 4 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 14 +- ...eedesktop.NetworkManager.Device.Infiniband.html | 4 +- ...g.freedesktop.NetworkManager.Device.Macsec.html | 4 +- ....freedesktop.NetworkManager.Device.Macvlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Modem.html | 4 +- ...freedesktop.NetworkManager.Device.OlpcMesh.html | 8 +- ...reedesktop.NetworkManager.Device.OvsBridge.html | 91 + ...desktop.NetworkManager.Device.OvsInterface.html | 70 + ....freedesktop.NetworkManager.Device.OvsPort.html | 91 + ...-org.freedesktop.NetworkManager.Device.Ppp.html | 70 + ...eedesktop.NetworkManager.Device.Statistics.html | 4 +- ...org.freedesktop.NetworkManager.Device.Team.html | 14 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 8 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 8 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 8 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 8 +- ...rg.freedesktop.NetworkManager.Device.WiMax.html | 236 - ...rg.freedesktop.NetworkManager.Device.Wired.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 25 +- ...dbus-org.freedesktop.NetworkManager.Device.html | 4 +- ...-org.freedesktop.NetworkManager.DnsManager.html | 4 +- ...s-org.freedesktop.NetworkManager.IP4Config.html | 4 +- ...s-org.freedesktop.NetworkManager.IP6Config.html | 4 +- .../gdbus-org.freedesktop.NetworkManager.PPP.html | 27 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 4 +- ...desktop.NetworkManager.Settings.Connection.html | 34 +- ...us-org.freedesktop.NetworkManager.Settings.html | 4 +- ....freedesktop.NetworkManager.VPN.Connection.html | 4 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 12 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 117 +- docs/api/html/index.html | 29 +- docs/api/html/ix01.html | 1368 ++-- docs/api/html/license.html | 4 +- docs/api/html/manpages.html | 4 +- docs/api/html/nm-dbus-types.html | 159 +- docs/api/html/nm-online.html | 4 +- docs/api/html/nm-openvswitch.html | 4 +- docs/api/html/nm-settings-ifcfg-rh.html | 45 +- docs/api/html/nm-settings-keyfile.html | 4 +- docs/api/html/nm-settings.html | 94 +- docs/api/html/nm-vpn-dbus-types.html | 4 +- docs/api/html/nmcli-examples.html | 4 +- docs/api/html/nmcli.html | 188 +- docs/api/html/nmtui.html | 4 +- docs/api/html/ref-dbus-access-points.html | 4 +- docs/api/html/ref-dbus-active-connections.html | 4 +- docs/api/html/ref-dbus-agent-manager.html | 4 +- docs/api/html/ref-dbus-checkpoint.html | 32 + docs/api/html/ref-dbus-devices.html | 19 +- docs/api/html/ref-dbus-dhcp4-configs.html | 4 +- docs/api/html/ref-dbus-dhcp6-configs.html | 4 +- docs/api/html/ref-dbus-dns-manager.html | 4 +- docs/api/html/ref-dbus-ip4-configs.html | 4 +- docs/api/html/ref-dbus-ip6-configs.html | 4 +- docs/api/html/ref-dbus-manager.html | 4 +- docs/api/html/ref-dbus-settings-manager.html | 4 +- docs/api/html/ref-dbus-settings.html | 4 +- docs/api/html/ref-settings.html | 6 +- docs/api/html/secret-agents.html | 4 +- docs/api/html/secrets-flags.html | 4 +- docs/api/html/settings-802-11-olpc-mesh.html | 4 +- .../html/settings-802-11-wireless-security.html | 10 +- docs/api/html/settings-802-11-wireless.html | 12 +- docs/api/html/settings-802-1x.html | 4 +- docs/api/html/settings-802-3-ethernet.html | 10 +- docs/api/html/settings-adsl.html | 4 +- docs/api/html/settings-bluetooth.html | 4 +- docs/api/html/settings-bond.html | 4 +- docs/api/html/settings-bridge-port.html | 4 +- docs/api/html/settings-bridge.html | 6 +- docs/api/html/settings-cdma.html | 4 +- docs/api/html/settings-connection.html | 16 +- docs/api/html/settings-dcb.html | 16 +- docs/api/html/settings-dummy.html | 4 +- docs/api/html/settings-generic.html | 4 +- docs/api/html/settings-gsm.html | 4 +- docs/api/html/settings-infiniband.html | 4 +- docs/api/html/settings-ip-tunnel.html | 10 +- docs/api/html/settings-ipv4.html | 12 +- docs/api/html/settings-ipv6.html | 16 +- docs/api/html/settings-macsec.html | 10 +- docs/api/html/settings-macvlan.html | 4 +- docs/api/html/settings-ovs-bridge.html | 4 +- docs/api/html/settings-ovs-interface.html | 6 +- docs/api/html/settings-ovs-patch.html | 6 +- docs/api/html/settings-ovs-port.html | 4 +- docs/api/html/settings-ppp.html | 4 +- docs/api/html/settings-pppoe.html | 4 +- docs/api/html/settings-proxy.html | 4 +- docs/api/html/settings-serial.html | 4 +- docs/api/html/settings-tc.html | 4 +- docs/api/html/settings-team-port.html | 4 +- docs/api/html/settings-team.html | 6 +- docs/api/html/settings-tun.html | 4 +- docs/api/html/settings-user.html | 4 +- docs/api/html/settings-vlan.html | 4 +- docs/api/html/settings-vpn.html | 4 +- docs/api/html/settings-vxlan.html | 4 +- docs/api/html/settings-wimax.html | 4 +- docs/api/html/spec.html | 23 +- docs/api/html/style.css | 4 + docs/api/html/vpn-plugins.html | 10 +- docs/api/meson.build | 31 + docs/api/network-manager-docs.xml | 22 +- docs/api/settings-spec.xml | 54 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.am | 22 +- docs/libnm-glib/Makefile.in | 29 +- docs/libnm-glib/html/NMAccessPoint.html | 124 +- docs/libnm-glib/html/NMActiveConnection.html | 116 +- docs/libnm-glib/html/NMClient.html | 314 +- docs/libnm-glib/html/NMDHCP4Config.html | 26 +- docs/libnm-glib/html/NMDHCP6Config.html | 26 +- docs/libnm-glib/html/NMDevice.html | 250 +- docs/libnm-glib/html/NMDeviceAdsl.html | 28 +- docs/libnm-glib/html/NMDeviceBond.html | 44 +- docs/libnm-glib/html/NMDeviceBridge.html | 44 +- docs/libnm-glib/html/NMDeviceBt.html | 38 +- docs/libnm-glib/html/NMDeviceEthernet.html | 48 +- docs/libnm-glib/html/NMDeviceGeneric.html | 28 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 32 +- docs/libnm-glib/html/NMDeviceModem.html | 26 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 32 +- docs/libnm-glib/html/NMDeviceTeam.html | 40 +- docs/libnm-glib/html/NMDeviceVlan.html | 40 +- docs/libnm-glib/html/NMDeviceWifi.html | 84 +- docs/libnm-glib/html/NMDeviceWimax.html | 88 +- docs/libnm-glib/html/NMIP4Config.html | 76 +- docs/libnm-glib/html/NMIP6Config.html | 70 +- docs/libnm-glib/html/NMObject.html | 32 +- docs/libnm-glib/html/NMRemoteConnection.html | 96 +- docs/libnm-glib/html/NMRemoteSettings.html | 198 +- docs/libnm-glib/html/NMSecretAgent.html | 249 +- docs/libnm-glib/html/NMVPNConnection.html | 36 +- docs/libnm-glib/html/NMWimaxNsp.html | 54 +- docs/libnm-glib/html/annotation-glossary.html | 4 +- docs/libnm-glib/html/api-index-full.html | 4 +- docs/libnm-glib/html/ch02.html | 4 +- docs/libnm-glib/html/index.html | 6 +- docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html | 32 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 62 +- docs/libnm-glib/html/libnm-glib-nm-types.html | 4 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 28 +- docs/libnm-glib/html/object-tree.html | 8 +- docs/libnm-glib/html/ref-overview.html | 4 +- docs/libnm-glib/html/style.css | 4 + docs/libnm-glib/meson.build | 39 + docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.am | 15 +- docs/libnm-util/Makefile.in | 22 +- docs/libnm-util/html/NMConnection.html | 266 +- docs/libnm-util/html/NMSetting.html | 134 +- docs/libnm-util/html/NMSetting8021x.html | 280 +- docs/libnm-util/html/NMSettingAdsl.html | 46 +- docs/libnm-util/html/NMSettingBluetooth.html | 18 +- docs/libnm-util/html/NMSettingBond.html | 58 +- docs/libnm-util/html/NMSettingBridge.html | 66 +- docs/libnm-util/html/NMSettingBridgePort.html | 34 +- docs/libnm-util/html/NMSettingCdma.html | 26 +- docs/libnm-util/html/NMSettingConnection.html | 152 +- docs/libnm-util/html/NMSettingDcb.html | 132 +- docs/libnm-util/html/NMSettingGeneric.html | 10 +- docs/libnm-util/html/NMSettingGsm.html | 64 +- docs/libnm-util/html/NMSettingIP4Config.html | 242 +- docs/libnm-util/html/NMSettingIP6Config.html | 190 +- docs/libnm-util/html/NMSettingInfiniband.html | 36 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 26 +- docs/libnm-util/html/NMSettingPPP.html | 188 +- docs/libnm-util/html/NMSettingPPPOE.html | 26 +- docs/libnm-util/html/NMSettingSerial.html | 46 +- docs/libnm-util/html/NMSettingTeam.html | 18 +- docs/libnm-util/html/NMSettingTeamPort.html | 14 +- docs/libnm-util/html/NMSettingVPN.html | 58 +- docs/libnm-util/html/NMSettingVlan.html | 88 +- docs/libnm-util/html/NMSettingWimax.html | 18 +- docs/libnm-util/html/NMSettingWired.html | 122 +- docs/libnm-util/html/NMSettingWireless.html | 140 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 136 +- docs/libnm-util/html/annotation-glossary.html | 4 +- docs/libnm-util/html/api-index-full.html | 24 +- docs/libnm-util/html/ch01.html | 4 +- docs/libnm-util/html/index.html | 6 +- .../libnm-util/html/libnm-util-NetworkManager.html | 6 +- .../html/libnm-util-NetworkManagerVPN.html | 4 +- docs/libnm-util/html/libnm-util-nm-utils.html | 418 +- docs/libnm-util/html/object-tree.html | 6 +- docs/libnm-util/html/style.css | 4 + docs/libnm-util/meson.build | 32 + docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.am | 24 +- docs/libnm/Makefile.in | 31 +- docs/libnm/html/NMAccessPoint.html | 92 +- docs/libnm/html/NMActiveConnection.html | 88 +- docs/libnm/html/NMCheckpoint.html | 204 + docs/libnm/html/NMClient.html | 1143 ++- docs/libnm/html/NMConnection.html | 272 +- docs/libnm/html/NMDevice.html | 427 +- docs/libnm/html/NMDeviceAdsl.html | 18 +- docs/libnm/html/NMDeviceBond.html | 38 +- docs/libnm/html/NMDeviceBridge.html | 38 +- docs/libnm/html/NMDeviceBt.html | 16 +- docs/libnm/html/NMDeviceDummy.html | 12 +- docs/libnm/html/NMDeviceEthernet.html | 42 +- docs/libnm/html/NMDeviceGeneric.html | 18 +- docs/libnm/html/NMDeviceIPTunnel.html | 126 +- docs/libnm/html/NMDeviceInfiniband.html | 22 +- docs/libnm/html/NMDeviceMacsec.html | 104 +- docs/libnm/html/NMDeviceMacvlan.html | 34 +- docs/libnm/html/NMDeviceModem.html | 8 +- docs/libnm/html/NMDeviceOlpcMesh.html | 26 +- docs/libnm/html/NMDeviceOvsBridge.html | 112 + docs/libnm/html/NMDeviceOvsInterface.html | 48 + docs/libnm/html/NMDeviceOvsPort.html | 112 + docs/libnm/html/NMDevicePpp.html | 48 + docs/libnm/html/NMDeviceTeam.html | 42 +- docs/libnm/html/NMDeviceTun.html | 60 +- docs/libnm/html/NMDeviceVlan.html | 30 +- docs/libnm/html/NMDeviceVxlan.html | 134 +- docs/libnm/html/NMDeviceWifi.html | 187 +- docs/libnm/html/NMDeviceWimax.html | 82 +- docs/libnm/html/NMDhcpConfig.html | 28 +- docs/libnm/html/NMIPConfig.html | 65 +- docs/libnm/html/NMObject.html | 31 +- docs/libnm/html/NMRemoteConnection.html | 362 +- docs/libnm/html/NMSecretAgentOld.html | 273 +- docs/libnm/html/NMSetting.html | 130 +- docs/libnm/html/NMSetting8021x.html | 338 +- docs/libnm/html/NMSettingAdsl.html | 38 +- docs/libnm/html/NMSettingBluetooth.html | 14 +- docs/libnm/html/NMSettingBond.html | 64 +- docs/libnm/html/NMSettingBridge.html | 86 +- docs/libnm/html/NMSettingBridgePort.html | 38 +- docs/libnm/html/NMSettingCdma.html | 30 +- docs/libnm/html/NMSettingConnection.html | 353 +- docs/libnm/html/NMSettingDcb.html | 144 +- docs/libnm/html/NMSettingDummy.html | 6 +- docs/libnm/html/NMSettingGeneric.html | 8 +- docs/libnm/html/NMSettingGsm.html | 60 +- docs/libnm/html/NMSettingIP4Config.html | 24 +- docs/libnm/html/NMSettingIP6Config.html | 98 +- docs/libnm/html/NMSettingIPConfig.html | 456 +- docs/libnm/html/NMSettingIPTunnel.html | 177 +- docs/libnm/html/NMSettingInfiniband.html | 36 +- docs/libnm/html/NMSettingMacsec.html | 97 +- docs/libnm/html/NMSettingMacvlan.html | 30 +- docs/libnm/html/NMSettingOlpcMesh.html | 30 +- docs/libnm/html/NMSettingOvsBridge.html | 276 + docs/libnm/html/NMSettingOvsInterface.html | 144 + docs/libnm/html/NMSettingOvsPatch.html | 143 + docs/libnm/html/NMSettingOvsPort.html | 362 + docs/libnm/html/NMSettingPpp.html | 192 +- docs/libnm/html/NMSettingPppoe.html | 30 +- docs/libnm/html/NMSettingProxy.html | 411 ++ docs/libnm/html/NMSettingSerial.html | 46 +- docs/libnm/html/NMSettingTCConfig.html | 1698 +++++ docs/libnm/html/NMSettingTeam.html | 300 +- docs/libnm/html/NMSettingTeamPort.html | 118 +- docs/libnm/html/NMSettingTun.html | 60 +- docs/libnm/html/NMSettingUser.html | 347 + docs/libnm/html/NMSettingVlan.html | 92 +- docs/libnm/html/NMSettingVpn.html | 168 +- docs/libnm/html/NMSettingVxlan.html | 122 +- docs/libnm/html/NMSettingWimax.html | 14 +- docs/libnm/html/NMSettingWired.html | 182 +- docs/libnm/html/NMSettingWireless.html | 357 +- docs/libnm/html/NMSettingWirelessSecurity.html | 254 +- docs/libnm/html/NMSimpleConnection.html | 26 +- docs/libnm/html/NMVpnConnection.html | 34 +- docs/libnm/html/NMVpnEditor.html | 180 + docs/libnm/html/NMVpnEditorPlugin.html | 116 +- docs/libnm/html/NMWimaxNsp.html | 40 +- docs/libnm/html/annotation-glossary.html | 9 +- docs/libnm/html/api-index-full.html | 1190 ++-- docs/libnm/html/ch02.html | 4 +- docs/libnm/html/ch03.html | 44 +- docs/libnm/html/ch04.html | 26 +- docs/libnm/html/ch05.html | 8 +- docs/libnm/html/ch06.html | 19 +- docs/libnm/html/index.html | 75 +- docs/libnm/html/libnm-nm-dbus-interface.html | 106 +- docs/libnm/html/libnm-nm-errors.html | 40 +- docs/libnm/html/libnm-nm-utils.html | 669 +- docs/libnm/html/libnm-nm-version.html | 46 +- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 1009 --- docs/libnm/html/libnm-nm-vpn-plugin-info.html | 131 + docs/libnm/html/libnm-nm-vpn-plugin-old.html | 78 + docs/libnm/html/libnm-nm-vpn-service-plugin.html | 88 + docs/libnm/html/libnm.devhelp2 | 754 +- docs/libnm/html/object-tree.html | 57 +- docs/libnm/html/ref-overview.html | 4 +- docs/libnm/html/style.css | 4 + docs/libnm/html/usage.html | 10 +- docs/libnm/libnm-docs.xml | 34 +- docs/libnm/libnm-sections.txt | 102 +- docs/libnm/libnm.types | 7 + docs/libnm/meson.build | 52 + docs/libnm/version.xml | 2 +- docs/meson.build | 18 + examples/C/glib/add-connection-gdbus.c | 5 - examples/C/glib/add-connection-libnm.c | 6 - examples/C/glib/get-active-connections-gdbus.c | 6 - examples/C/glib/get-ap-info-libnm.c | 11 +- examples/C/glib/list-connections-gdbus.c | 5 - examples/C/glib/list-connections-libnm.c | 5 - examples/C/glib/meson.build | 19 + examples/C/glib/monitor-nm-running-gdbus.c | 6 - examples/C/glib/monitor-nm-state-gdbus.c | 6 - examples/C/qt/meson.build | 46 + examples/js/get_ips.js | 184 + examples/nm-conf.d/30-anon.conf | 37 +- examples/python/dbus/add-connection-compat.py | 4 +- examples/python/dbus/add-connection.py | 4 +- examples/python/dbus/add-wifi-eap-connection.py | 4 +- examples/python/dbus/add-wifi-psk-connection.py | 2 +- examples/python/dbus/create-bond.py | 16 +- .../python/dbus/get-active-connection-uuids.py | 4 +- examples/python/dbus/is-wwan-default.py | 12 +- examples/python/dbus/list-connections.py | 18 +- examples/python/dbus/list-devices.py | 12 +- examples/python/dbus/nm-state.py | 6 +- examples/python/dbus/show-bssids.py | 8 +- examples/python/dbus/update-ip4-method.py | 4 +- examples/python/dbus/update-secrets.py | 14 +- examples/python/dbus/vpn.py | 16 +- examples/python/dbus/wifi-active-ap.py | 6 +- examples/python/dbus/wifi-hotspot.py | 10 +- examples/python/gi/add_connection.py | 4 +- examples/python/gi/deactivate-all.py | 2 +- examples/python/gi/device-state-ip4config.py | 14 +- examples/python/gi/get-active-connections.py | 4 +- examples/python/gi/get_ips.py | 12 +- examples/python/gi/list-connections.py | 6 +- examples/python/gi/show-wifi-networks.py | 24 +- examples/python/gi/update-ip4-method.py | 6 +- examples/python/nmex.py | 72 + examples/shell/nm-logging.sh | 2 +- introspection/meson.build | 90 + .../org.freedesktop.NetworkManager.Device.Bond.xml | 2 +- ...rg.freedesktop.NetworkManager.Device.Bridge.xml | 2 +- ....freedesktop.NetworkManager.Device.IPTunnel.xml | 7 + ...freedesktop.NetworkManager.Device.OvsBridge.xml | 10 + ...g.freedesktop.NetworkManager.Device.OvsPort.xml | 10 + .../org.freedesktop.NetworkManager.Device.Team.xml | 2 +- ....freedesktop.NetworkManager.Device.Wireless.xml | 10 + .../org.freedesktop.NetworkManager.PPP.xml | 5 + ...edesktop.NetworkManager.Settings.Connection.xml | 22 +- introspection/org.freedesktop.NetworkManager.xml | 30 +- libnm-core/crypto.h | 4 + libnm-core/meson.build | 202 + libnm-core/nm-connection-private.h | 4 + libnm-core/nm-connection.c | 21 +- libnm-core/nm-connection.h | 2 +- libnm-core/nm-core-enum-types.c.template | 86 + libnm-core/nm-core-enum-types.h.template | 21 + libnm-core/nm-core-internal.h | 24 +- libnm-core/nm-core-types-internal.h | 13 + libnm-core/nm-dbus-interface.h | 58 +- libnm-core/nm-dbus-types.xml | 57 +- libnm-core/nm-dbus-utils.c | 11 +- libnm-core/nm-json.c | 11 +- libnm-core/nm-json.h | 3 +- libnm-core/nm-keyfile-internal.h | 7 +- libnm-core/nm-keyfile-reader.c | 1969 ------ libnm-core/nm-keyfile-utils.c | 8 +- libnm-core/nm-keyfile-utils.h | 4 +- libnm-core/nm-keyfile-writer.c | 882 --- libnm-core/nm-keyfile.c | 2923 ++++++++ libnm-core/nm-property-compare.h | 4 + libnm-core/nm-setting-8021x.c | 91 +- libnm-core/nm-setting-8021x.h | 1 - libnm-core/nm-setting-adsl.c | 2 +- libnm-core/nm-setting-bond.c | 31 +- libnm-core/nm-setting-bridge.c | 2 + libnm-core/nm-setting-connection.c | 132 +- libnm-core/nm-setting-connection.h | 21 + libnm-core/nm-setting-dcb.c | 24 +- libnm-core/nm-setting-dcb.h | 1 - libnm-core/nm-setting-ip-config.c | 131 +- libnm-core/nm-setting-ip-config.h | 3 +- libnm-core/nm-setting-ip-tunnel.c | 60 + libnm-core/nm-setting-ip-tunnel.h | 30 + libnm-core/nm-setting-ip4-config.c | 31 +- libnm-core/nm-setting-ip6-config.c | 108 +- libnm-core/nm-setting-ip6-config.h | 4 + libnm-core/nm-setting-macsec.c | 40 +- libnm-core/nm-setting-macsec.h | 3 + libnm-core/nm-setting-macvlan.c | 8 +- libnm-core/nm-setting-ovs-bridge.c | 4 +- libnm-core/nm-setting-ovs-interface.c | 7 +- libnm-core/nm-setting-ovs-patch.c | 14 +- libnm-core/nm-setting-ovs-port.c | 5 +- libnm-core/nm-setting-private.h | 7 +- libnm-core/nm-setting-serial.c | 1 - libnm-core/nm-setting-tc-config.c | 208 +- libnm-core/nm-setting-tc-config.h | 93 +- libnm-core/nm-setting-team-port.c | 38 +- libnm-core/nm-setting-team-port.h | 22 +- libnm-core/nm-setting-team.c | 118 +- libnm-core/nm-setting-team.h | 83 +- libnm-core/nm-setting-tun.c | 4 +- libnm-core/nm-setting-user.c | 25 +- libnm-core/nm-setting-user.h | 1 - libnm-core/nm-setting-vlan.h | 4 +- libnm-core/nm-setting-vpn.c | 130 +- libnm-core/nm-setting-vpn.h | 7 + libnm-core/nm-setting-wired.c | 77 +- libnm-core/nm-setting-wireless-security.c | 57 + libnm-core/nm-setting-wireless-security.h | 26 + libnm-core/nm-setting-wireless.c | 75 + libnm-core/nm-setting-wireless.h | 46 + libnm-core/nm-setting.c | 35 +- libnm-core/nm-setting.h | 5 - libnm-core/nm-simple-connection.c | 19 +- libnm-core/nm-utils-private.h | 4 +- libnm-core/nm-utils.c | 295 +- libnm-core/nm-utils.h | 17 +- libnm-core/nm-version.h | 28 +- libnm-core/nm-vpn-dbus-interface.h | 4 - libnm-core/nm-vpn-editor-plugin.c | 2 +- libnm-core/nm-vpn-editor-plugin.h | 11 +- libnm-core/nm-vpn-plugin-info.c | 1 - libnm-core/nm-vpn-plugin-info.h | 4 +- libnm-core/tests/meson.build | 49 + .../tests/nm-core-tests-enum-types.c.template | 35 + .../tests/nm-core-tests-enum-types.h.template | 21 + libnm-core/tests/test-crypto.c | 2 + libnm-core/tests/test-general.c | 639 +- libnm-core/tests/test-keyfile.c | 40 +- libnm-core/tests/test-secrets.c | 7 +- libnm-core/tests/test-setting.c | 89 +- libnm-glib/libnm-glib-test.c | 6 +- libnm-glib/libnm_glib.c | 118 +- libnm-glib/libnm_glib.h | 2 - libnm-glib/meson.build | 295 + libnm-glib/nm-access-point.c | 11 +- libnm-glib/nm-access-point.h | 1 - libnm-glib/nm-active-connection.c | 1 - libnm-glib/nm-client.c | 13 +- libnm-glib/nm-device-bond.c | 4 +- libnm-glib/nm-device-bridge.c | 4 +- libnm-glib/nm-device-ethernet.c | 4 +- libnm-glib/nm-device.c | 5 +- libnm-glib/nm-dhcp4-config.c | 4 +- libnm-glib/nm-dhcp6-config.c | 4 +- libnm-glib/nm-glib-enum-types.c.template | 62 + libnm-glib/nm-glib-enum-types.h.template | 21 + libnm-glib/nm-ip4-config.c | 4 +- libnm-glib/nm-ip6-config.c | 2 +- libnm-glib/nm-object.c | 5 +- libnm-glib/nm-remote-connection.c | 3 - libnm-glib/nm-remote-connection.h | 1 - libnm-glib/nm-remote-settings.c | 4 +- libnm-glib/nm-remote-settings.h | 3 - libnm-glib/nm-secret-agent.c | 13 +- libnm-glib/nm-vpn-connection.c | 1 - libnm-glib/nm-vpn-enum-types.c.template | 37 + libnm-glib/nm-vpn-enum-types.h.template | 21 + libnm-glib/nm-vpn-plugin-ui-interface.c | 23 +- libnm-glib/nm-vpn-plugin-ui-interface.h | 6 +- libnm-glib/nm-vpn-plugin.c | 2 - libnm-glib/nm-wimax-nsp.c | 1 - libnm-glib/tests/meson.build | 31 + libnm-glib/tests/test-nm-client.c | 22 +- libnm-glib/tests/test-remote-settings-client.c | 21 +- libnm-util/NetworkManager.h | 6 - libnm-util/NetworkManagerVPN.h | 5 - libnm-util/crypto.c | 1 - libnm-util/crypto_gnutls.c | 9 +- libnm-util/meson.build | 195 + libnm-util/nm-connection.c | 5 +- libnm-util/nm-param-spec-specialized.c | 2 - libnm-util/nm-setting-8021x.c | 3 - libnm-util/nm-setting-8021x.h | 3 - libnm-util/nm-setting-adsl.c | 2 +- libnm-util/nm-setting-bluetooth.c | 1 - libnm-util/nm-setting-bond.c | 1 - libnm-util/nm-setting-bridge.c | 1 - libnm-util/nm-setting-cdma.c | 1 - libnm-util/nm-setting-connection.c | 3 - libnm-util/nm-setting-dcb.c | 1 - libnm-util/nm-setting-dcb.h | 2 - libnm-util/nm-setting-gsm.c | 1 - libnm-util/nm-setting-ip4-config.c | 4 - libnm-util/nm-setting-ip4-config.h | 1 - libnm-util/nm-setting-ip6-config.c | 3 - libnm-util/nm-setting-ip6-config.h | 2 - libnm-util/nm-setting-ppp.c | 1 - libnm-util/nm-setting-pppoe.c | 1 - libnm-util/nm-setting-private.h | 3 +- libnm-util/nm-setting-serial.c | 2 - libnm-util/nm-setting-team.c | 1 - libnm-util/nm-setting-vpn.c | 1 - libnm-util/nm-setting-wimax.c | 1 - libnm-util/nm-setting-wired.c | 3 +- libnm-util/nm-setting-wireless-security.c | 1 - libnm-util/nm-setting-wireless.c | 1 - libnm-util/nm-setting.c | 2 - libnm-util/nm-setting.h | 5 - libnm-util/nm-utils-enum-types.c.template | 65 + libnm-util/nm-utils-enum-types.h.template | 21 + libnm-util/nm-utils.c | 79 +- libnm-util/nm-value-transforms.c | 2 +- libnm-util/nm-version.h | 8 +- libnm-util/tests/meson.build | 45 + libnm-util/tests/test-crypto.c | 2 + libnm-util/tests/test-general.c | 106 +- libnm-util/tests/test-secrets.c | 3 +- libnm-util/tests/test-setting-8021x.c | 2 + libnm-util/tests/test-setting-dcb.c | 10 +- libnm/NetworkManager.h | 4 + libnm/fake-typelib/NMClient.gir | 9 + libnm/fake-typelib/NetworkManager.gir | 10 + libnm/fake-typelib/meson.build | 30 + libnm/fake-typelib/typelibs.gresource.xml | 7 + libnm/generate-plugin-docs.pl | 20 +- libnm/generate-setting-docs.py | 5 + libnm/libnm.ver | 48 + libnm/meson.build | 277 + libnm/nm-access-point.c | 11 +- libnm/nm-active-connection.c | 5 +- libnm/nm-autoptr.h | 85 + libnm/nm-checkpoint.c | 220 + libnm/nm-checkpoint.h | 53 + libnm/nm-client.c | 436 +- libnm/nm-client.h | 51 + libnm/nm-dbus-helpers.h | 4 + libnm/nm-device-adsl.c | 1 - libnm/nm-device-bond.c | 8 +- libnm/nm-device-bridge.c | 8 +- libnm/nm-device-ethernet.c | 4 +- libnm/nm-device-ip-tunnel.c | 36 + libnm/nm-device-ip-tunnel.h | 4 + libnm/nm-device-macvlan.c | 1 - libnm/nm-device-ovs-bridge.c | 82 +- libnm/nm-device-ovs-bridge.h | 7 +- libnm/nm-device-ovs-port.c | 82 +- libnm/nm-device-ovs-port.h | 7 +- libnm/nm-device-team.c | 4 +- libnm/nm-device-wifi.c | 49 +- libnm/nm-device-wifi.h | 4 + libnm/nm-device-wimax.c | 4 +- libnm/nm-device.c | 312 +- libnm/nm-dhcp-config.c | 6 +- libnm/nm-dhcp4-config.h | 11 +- libnm/nm-dhcp6-config.h | 11 +- libnm/nm-dns-manager.h | 11 +- libnm/nm-enum-types.c.template | 76 + libnm/nm-enum-types.h.template | 22 + libnm/nm-ip-config.c | 4 +- libnm/nm-ip4-config.h | 11 +- libnm/nm-ip6-config.h | 11 +- libnm/nm-libnm-utils.c | 591 +- libnm/nm-libnm-utils.h | 9 +- libnm/nm-manager.c | 433 +- libnm/nm-manager.h | 52 +- libnm/nm-object-private.h | 4 + libnm/nm-object.c | 15 +- libnm/nm-property-docs.xml | 54 +- libnm/nm-remote-connection-private.h | 4 + libnm/nm-remote-connection.c | 85 +- libnm/nm-remote-connection.h | 13 +- libnm/nm-remote-settings.c | 5 +- libnm/nm-remote-settings.h | 12 +- libnm/nm-secret-agent-old.c | 16 +- libnm/nm-settings-docs.xml | 54 +- libnm/nm-settings-ifcfg-rh-docs.xml | 13 +- libnm/nm-types.h | 1 + libnm/nm-vpn-connection.c | 10 +- libnm/nm-vpn-editor.h | 2 +- libnm/nm-vpn-plugin-old.c | 124 +- libnm/nm-vpn-service-plugin.c | 197 +- libnm/nm-vpn-service-plugin.h | 3 + libnm/tests/meson.build | 42 + libnm/tests/test-general.c | 2142 +++++- libnm/tests/test-nm-client.c | 38 +- libnm/tests/test-remote-settings-client.c | 21 + libnm/tests/test-secret-agent.c | 28 +- m4/compiler_options.m4 | 46 +- m4/introspection.m4 | 4 +- man/NetworkManager.8 | 20 +- man/NetworkManager.conf.5 | 75 +- man/NetworkManager.conf.xml | 96 +- man/NetworkManager.xml | 13 +- man/meson.build | 98 + man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-ifcfg-rh.5 | 56 +- man/nm-settings-ifcfg-rh.xml | 22 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 114 +- man/nm-settings.xml | 56 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 213 +- man/nmcli.xml | 282 +- man/nmtui.1 | 6 +- meson.build | 984 +++ meson_options.txt | 77 + meson_post_install.py | 46 + po/ChangeLog | 2149 +----- po/POTFILES.in | 6 +- po/POTFILES.skip | 3 + po/ar.po | 3998 +++++------ po/as.po | 4042 +++++------ po/be@latin.po | 4020 +++++------ po/bg.po | 7329 ++++++++++--------- po/bn_IN.po | 4039 +++++------ po/bs.po | 4004 +++++------ po/ca.po | 4044 +++++------ po/cs.po | 7277 +++++++++---------- po/da.po | 7257 +++++++++---------- po/de.po | 1631 ++--- po/dz.po | 4912 ++++++------- po/el.po | 4043 +++++------ po/en_CA.po | 6838 +++++++++--------- po/en_GB.po | 7363 ++++++++++---------- po/eo.po | 6731 +++++++++--------- po/es.po | 1631 ++--- po/et.po | 4016 +++++------ po/eu.po | 7198 +++++++++---------- po/fi.po | 7039 +++++++++---------- po/fr.po | 1631 ++--- po/gd.po | 4032 +++++------ po/gl.po | 4034 +++++------ po/gu.po | 4037 +++++------ po/he.po | 4019 +++++------ po/hi.po | 4042 +++++------ po/hr.po | 7277 +++++++++---------- po/hu.po | 7264 +++++++++---------- po/id.po | 3319 ++++----- po/it.po | 1631 ++--- po/ja.po | 1638 ++--- po/ka.po | 6761 +++++++++--------- po/kn.po | 4042 +++++------ po/ko.po | 1631 ++--- po/ku.po | 6370 ++++++++--------- po/lt.po | 7265 +++++++++---------- po/lv.po | 6769 +++++++++--------- po/meson.build | 1 + po/mk.po | 4020 +++++------ po/ml.po | 4680 ++++++------- po/mr.po | 4036 +++++------ po/nb.po | 4019 +++++------ po/ne.po | 6420 ++++++++--------- po/nl.po | 6091 ++++++++-------- po/oc.po | 4002 +++++------ po/or.po | 4037 +++++------ po/pa.po | 4673 ++++++------- po/pl.po | 3312 ++++----- po/pt.po | 3996 +++++------ po/pt_BR.po | 1631 ++--- po/rw.po | 6315 ++++++++--------- po/sk.po | 4016 +++++------ po/sl.po | 4966 ++++++------- po/sq.po | 4007 +++++------ po/sr.po | 5235 +++++++------- po/sr@latin.po | 5235 +++++++------- po/sv.po | 1839 ++--- po/ta.po | 4042 +++++------ po/te.po | 4039 +++++------ po/th.po | 6761 +++++++++--------- po/tr.po | 4041 +++++------ po/uk.po | 4078 ++++++----- po/vi.po | 4015 +++++------ po/wa.po | 4001 +++++------ po/zh_CN.po | 1631 ++--- po/zh_HK.po | 6799 +++++++++--------- po/zh_TW.po | 1631 ++--- shared/c-list/src/c-list.h | 422 ++ shared/c-siphash/src/c-siphash.c | 246 + shared/c-siphash/src/c-siphash.h | 60 + shared/meson.build | 78 + shared/n-acd/src/n-acd.c | 1262 ++++ shared/n-acd/src/n-acd.h | 96 + shared/nm-default.h | 163 +- shared/nm-test-libnm-utils.h | 44 +- shared/nm-test-utils-impl.c | 176 +- shared/nm-utils/c-list-util.c | 88 +- shared/nm-utils/c-list-util.h | 2 +- shared/nm-utils/c-list.h | 397 -- shared/nm-utils/nm-c-list.h | 81 + shared/nm-utils/nm-compat.c | 95 + shared/nm-utils/nm-compat.h | 53 + shared/nm-utils/nm-dedup-multi.c | 6 +- shared/nm-utils/nm-dedup-multi.h | 2 +- shared/nm-utils/nm-enum-utils.c | 190 +- shared/nm-utils/nm-enum-utils.h | 5 +- shared/nm-utils/nm-glib.h | 384 +- shared/nm-utils/nm-hash-utils.c | 134 +- shared/nm-utils/nm-hash-utils.h | 23 +- shared/nm-utils/nm-jansson.h | 46 + shared/nm-utils/nm-macros-internal.h | 278 +- shared/nm-utils/nm-obj.h | 2 +- shared/nm-utils/nm-random-utils.c | 2 +- shared/nm-utils/nm-shared-utils.c | 384 + shared/nm-utils/nm-shared-utils.h | 211 +- shared/nm-utils/nm-test-utils.h | 127 +- shared/nm-utils/siphash24.c | 203 - shared/nm-utils/siphash24.h | 23 - shared/nm-utils/unaligned.h | 78 +- shared/nm-version-macros.h | 29 +- shared/nm-version-macros.h.in | 25 +- src/NetworkManagerUtils.c | 257 +- src/NetworkManagerUtils.h | 44 +- src/devices/adsl/meson.build | 34 + src/devices/adsl/nm-atm-manager.c | 2 +- src/devices/adsl/nm-device-adsl.c | 50 +- src/devices/bluetooth/meson.build | 45 + src/devices/bluetooth/nm-bluez-device.c | 6 +- src/devices/bluetooth/nm-bluez-manager.c | 4 - src/devices/bluetooth/nm-bluez4-adapter.c | 1 - src/devices/bluetooth/nm-bluez5-manager.c | 2 +- src/devices/bluetooth/nm-device-bt.c | 84 +- src/devices/meson.build | 22 + src/devices/nm-acd-manager.c | 493 ++ src/devices/nm-acd-manager.h | 43 + src/devices/nm-arping-manager.c | 474 -- src/devices/nm-arping-manager.h | 43 - src/devices/nm-device-bond.c | 42 +- src/devices/nm-device-bridge.c | 26 +- src/devices/nm-device-dummy.c | 25 +- src/devices/nm-device-ethernet.c | 133 +- src/devices/nm-device-ethernet.h | 18 +- src/devices/nm-device-factory.c | 87 +- src/devices/nm-device-generic.c | 23 +- src/devices/nm-device-infiniband.c | 53 +- src/devices/nm-device-ip-tunnel.c | 106 +- src/devices/nm-device-ip-tunnel.h | 4 +- src/devices/nm-device-macsec.c | 61 +- src/devices/nm-device-macsec.h | 3 - src/devices/nm-device-macvlan.c | 43 +- src/devices/nm-device-macvlan.h | 3 - src/devices/nm-device-ppp.c | 95 +- src/devices/nm-device-private.h | 16 +- src/devices/nm-device-tun.c | 356 +- src/devices/nm-device-veth.c | 41 +- src/devices/nm-device-vlan.c | 48 +- src/devices/nm-device-vlan.h | 4 - src/devices/nm-device-vxlan.c | 110 +- src/devices/nm-device-vxlan.h | 3 - src/devices/nm-device.c | 4468 +++++++----- src/devices/nm-device.h | 58 +- src/devices/nm-lldp-listener.c | 45 +- src/devices/ovs/meson.build | 38 + src/devices/ovs/nm-device-ovs-bridge.c | 24 +- src/devices/ovs/nm-device-ovs-interface.c | 21 +- src/devices/ovs/nm-device-ovs-port.c | 25 +- src/devices/ovs/nm-ovs-factory.c | 6 +- src/devices/ovs/nm-ovsdb.c | 52 +- src/devices/team/meson.build | 35 + src/devices/team/nm-device-team.c | 29 +- src/devices/tests/meson.build | 18 + src/devices/tests/test-acd.c | 185 + src/devices/tests/test-arping.c | 164 - src/devices/tests/test-lldp.c | 53 +- src/devices/wifi/meson.build | 51 + src/devices/wifi/nm-device-iwd.c | 2040 ++++++ src/devices/wifi/nm-device-iwd.h | 63 + src/devices/wifi/nm-device-olpc-mesh.c | 39 +- src/devices/wifi/nm-device-wifi.c | 503 +- src/devices/wifi/nm-device-wifi.h | 13 +- src/devices/wifi/nm-iwd-manager.c | 693 ++ src/devices/wifi/nm-iwd-manager.h | 65 + src/devices/wifi/nm-wifi-ap.c | 205 +- src/devices/wifi/nm-wifi-ap.h | 21 +- src/devices/wifi/nm-wifi-common.c | 207 + src/devices/wifi/nm-wifi-common.h | 37 + src/devices/wifi/nm-wifi-factory.c | 29 +- src/devices/wifi/nm-wifi-utils.c | 32 + src/devices/wifi/nm-wifi-utils.h | 2 + src/devices/wifi/tests/meson.build | 13 + src/devices/wwan/libnm-wwan.ver | 2 +- src/devices/wwan/meson.build | 75 + src/devices/wwan/nm-device-modem.c | 98 +- src/devices/wwan/nm-modem-broadband.c | 69 +- src/devices/wwan/nm-modem-ofono.c | 27 +- src/devices/wwan/nm-modem.c | 379 +- src/devices/wwan/nm-modem.h | 23 +- src/devices/wwan/nm-wwan-factory.c | 9 +- src/dhcp/meson.build | 22 + src/dhcp/nm-dhcp-client.c | 247 +- src/dhcp/nm-dhcp-client.h | 55 +- src/dhcp/nm-dhcp-dhclient-utils.c | 372 +- src/dhcp/nm-dhcp-dhclient-utils.h | 15 +- src/dhcp/nm-dhcp-dhclient.c | 192 +- src/dhcp/nm-dhcp-dhcpcanon.c | 16 +- src/dhcp/nm-dhcp-dhcpcd.c | 17 +- src/dhcp/nm-dhcp-helper.c | 2 - src/dhcp/nm-dhcp-listener.c | 86 +- src/dhcp/nm-dhcp-manager.c | 129 +- src/dhcp/nm-dhcp-manager.h | 17 +- src/dhcp/nm-dhcp-systemd.c | 120 +- src/dhcp/nm-dhcp-utils.c | 8 +- src/dhcp/nm-dhcp-utils.h | 2 +- src/dhcp/tests/leases/basic.leases | 31 - src/dhcp/tests/leases/malformed1.leases | 15 - src/dhcp/tests/leases/malformed2.leases | 15 - src/dhcp/tests/leases/malformed3.leases | 15 - src/dhcp/tests/meson.build | 19 + src/dhcp/tests/test-dhcp-dhclient.c | 369 +- src/dhcp/tests/test-dhcp-utils.c | 21 +- src/dns/nm-dns-dnsmasq.c | 317 +- src/dns/nm-dns-manager.c | 1036 ++- src/dns/nm-dns-manager.h | 37 +- src/dns/nm-dns-plugin.c | 4 +- src/dns/nm-dns-plugin.h | 4 +- src/dns/nm-dns-systemd-resolved.c | 295 +- src/dns/nm-dns-unbound.c | 2 +- src/dnsmasq/nm-dnsmasq-manager.c | 2 +- src/dnsmasq/tests/meson.build | 13 + src/main.c | 81 +- src/meson.build | 319 + src/ndisc/nm-lndp-ndisc.c | 52 +- src/ndisc/nm-ndisc.c | 71 +- src/ndisc/nm-ndisc.h | 38 +- src/ndisc/tests/meson.build | 23 + src/nm-act-request.c | 8 +- src/nm-active-connection.c | 417 +- src/nm-active-connection.h | 15 +- src/nm-audit-manager.c | 3 +- src/nm-audit-manager.h | 1 + src/nm-auth-manager.c | 623 +- src/nm-auth-manager.h | 62 +- src/nm-auth-subject.c | 39 +- src/nm-auth-subject.h | 9 - src/nm-auth-utils.c | 489 +- src/nm-auth-utils.h | 25 +- src/nm-bus-manager.c | 1024 --- src/nm-bus-manager.h | 93 - src/nm-checkpoint-manager.c | 326 +- src/nm-checkpoint-manager.h | 24 +- src/nm-checkpoint.c | 288 +- src/nm-checkpoint.h | 29 +- src/nm-config-data.c | 308 +- src/nm-config-data.h | 26 +- src/nm-config.c | 24 +- src/nm-config.h | 3 +- src/nm-connectivity.c | 652 +- src/nm-connectivity.h | 29 +- src/nm-core-utils.c | 478 +- src/nm-core-utils.h | 47 +- src/nm-dbus-manager.c | 1673 +++++ src/nm-dbus-manager.h | 113 + src/nm-dbus-object.c | 309 + src/nm-dbus-object.h | 198 + src/nm-dbus-utils.c | 312 + src/nm-dbus-utils.h | 213 + src/nm-dhcp4-config.c | 51 +- src/nm-dhcp6-config.c | 51 +- src/nm-dispatcher.c | 19 +- src/nm-dispatcher.h | 1 - src/nm-exported-object.c | 1055 --- src/nm-exported-object.h | 85 - src/nm-firewall-manager.c | 4 +- src/nm-iface-helper.c | 122 +- src/nm-ip4-config.c | 278 +- src/nm-ip4-config.h | 222 +- src/nm-ip6-config.c | 258 +- src/nm-ip6-config.h | 12 +- src/nm-logging.c | 65 +- src/nm-logging.h | 18 +- src/nm-manager.c | 2928 ++++---- src/nm-manager.h | 37 +- src/nm-netns.c | 4 - src/nm-pacrunner-manager.c | 16 +- src/nm-policy.c | 191 +- src/nm-rfkill-manager.c | 2 +- src/nm-session-monitor.c | 4 +- src/nm-sleep-monitor.c | 1 - src/nm-test-utils-core.h | 34 +- src/nm-types.h | 28 +- src/org.freedesktop.NetworkManager.conf | 2 +- src/platform/nm-fake-platform.c | 3 +- src/platform/nm-linux-platform.c | 793 +-- src/platform/nm-netlink.c | 1491 ++++ src/platform/nm-netlink.h | 514 ++ src/platform/nm-platform-utils.c | 65 +- src/platform/nm-platform-utils.h | 3 - src/platform/nm-platform.c | 706 +- src/platform/nm-platform.h | 124 +- src/platform/nmp-netns.c | 4 +- src/platform/nmp-object.c | 95 +- src/platform/nmp-object.h | 31 +- src/platform/tests/meson.build | 37 + src/platform/tests/monitor.c | 3 +- src/platform/tests/test-address.c | 5 +- src/platform/tests/test-cleanup.c | 19 +- src/platform/tests/test-common.c | 122 +- src/platform/tests/test-common.h | 30 +- src/platform/tests/test-general.c | 1 - src/platform/tests/test-link.c | 147 +- src/platform/tests/test-nmp-object.c | 27 +- src/platform/tests/test-route.c | 3 +- src/platform/wifi/wifi-utils-nl80211.c | 420 +- src/platform/wifi/wifi-utils-private.h | 17 +- src/platform/wifi/wifi-utils-wext.c | 42 +- src/platform/wifi/wifi-utils.c | 70 +- src/platform/wifi/wifi-utils.h | 4 +- src/ppp/meson.build | 41 + src/ppp/nm-ppp-manager-call.c | 36 +- src/ppp/nm-ppp-manager-call.h | 14 +- src/ppp/nm-ppp-manager.c | 570 +- src/ppp/nm-ppp-manager.h | 8 + src/ppp/nm-ppp-plugin-api.h | 14 +- src/ppp/nm-pppd-plugin.c | 32 +- src/settings/nm-agent-manager.c | 160 +- src/settings/nm-agent-manager.h | 2 +- src/settings/nm-secret-agent.c | 140 +- src/settings/nm-settings-connection.c | 696 +- src/settings/nm-settings-connection.h | 66 +- src/settings/nm-settings-plugin.c | 24 - src/settings/nm-settings-plugin.h | 23 - src/settings/nm-settings.c | 1020 +-- src/settings/nm-settings.h | 11 +- src/settings/plugins/ibft/meson.build | 48 + src/settings/plugins/ibft/nms-ibft-plugin.c | 35 - src/settings/plugins/ibft/nms-ibft-reader.c | 8 +- src/settings/plugins/ibft/tests/meson.build | 17 + src/settings/plugins/ibft/tests/test-ibft.c | 22 +- src/settings/plugins/ifcfg-rh/meson.build | 77 + src/settings/plugins/ifcfg-rh/nm-ifdown | 3 + src/settings/plugins/ifcfg-rh/nm-ifup | 3 + src/settings/plugins/ifcfg-rh/nm-inotify-helper.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-common.h | 3 - .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 172 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 327 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 93 +- src/settings/plugins/ifcfg-rh/shvar.c | 4 +- src/settings/plugins/ifcfg-rh/tests/meson.build | 17 + .../ifcfg-Test_Write_WiFi_Hidden.cexpected | 1 - .../ifcfg-Test_Write_Wired_Static_Routes.cexpected | 2 + .../ifcfg-rh/tests/network-scripts/ifcfg-test-tc | 16 + .../network-scripts/ifcfg-test-tc-write.cexpected | 16 + .../network-scripts/ifcfg-test-wired-ipv4-manual-1 | 2 + .../network-scripts/ifcfg-test-wired-ipv4-manual-2 | 2 + .../network-scripts/ifcfg-test-wired-ipv4-manual-3 | 2 + .../network-scripts/ifcfg-test-wired-ipv4-manual-4 | 2 + .../plugins/ifcfg-rh/tests/test-ifcfg-rh.c | 683 +- .../plugins/ifnet/nms-ifnet-connection-parser.c | 2912 -------- .../plugins/ifnet/nms-ifnet-connection-parser.h | 55 - src/settings/plugins/ifnet/nms-ifnet-connection.c | 233 - src/settings/plugins/ifnet/nms-ifnet-connection.h | 46 - src/settings/plugins/ifnet/nms-ifnet-net-parser.c | 734 -- src/settings/plugins/ifnet/nms-ifnet-net-parser.h | 42 - src/settings/plugins/ifnet/nms-ifnet-net-utils.c | 830 --- src/settings/plugins/ifnet/nms-ifnet-net-utils.h | 71 - src/settings/plugins/ifnet/nms-ifnet-plugin.c | 524 -- src/settings/plugins/ifnet/nms-ifnet-plugin.h | 38 - src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c | 584 -- src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h | 41 - src/settings/plugins/ifnet/tests/net | 158 - src/settings/plugins/ifnet/tests/net.all | 864 --- .../plugins/ifnet/tests/nm-system-settings.conf | 5 - src/settings/plugins/ifnet/tests/test-ifnet.c | 396 -- src/settings/plugins/ifnet/tests/test_ca_cert.pem | 27 - .../plugins/ifnet/tests/wpa_supplicant.conf | 70 - src/settings/plugins/ifupdown/meson.build | 53 + .../ifupdown/nms-ifupdown-interface-parser.c | 7 +- .../ifupdown/nms-ifupdown-interface-parser.h | 1 - .../plugins/ifupdown/nms-ifupdown-parser.c | 7 +- .../plugins/ifupdown/nms-ifupdown-plugin.c | 38 - src/settings/plugins/ifupdown/tests/meson.build | 15 + .../plugins/ifupdown/tests/test-ifupdown.c | 46 +- src/settings/plugins/keyfile/nms-keyfile-plugin.c | 37 +- src/settings/plugins/keyfile/nms-keyfile-utils.h | 3 - .../keyfile/tests/keyfiles/Test_Wired_Connection | 10 +- src/settings/plugins/keyfile/tests/meson.build | 16 + src/settings/plugins/keyfile/tests/test-keyfile.c | 96 +- src/settings/plugins/meson.build | 15 + src/supplicant/nm-supplicant-config.c | 82 +- src/supplicant/nm-supplicant-config.h | 3 +- src/supplicant/nm-supplicant-interface.c | 58 +- src/supplicant/nm-supplicant-interface.h | 10 +- src/supplicant/nm-supplicant-manager.c | 15 +- src/supplicant/nm-supplicant-settings-verify.c | 16 +- src/supplicant/nm-supplicant-settings-verify.h | 1 - src/supplicant/nm-supplicant-types.h | 6 +- src/supplicant/tests/meson.build | 14 + src/supplicant/tests/test-supplicant-config.c | 202 +- src/systemd/meson.build | 71 + src/systemd/nm-sd.c | 1 - src/systemd/sd-adapt/copy.h | 3 + src/systemd/sd-adapt/device-nodes.h | 3 + src/systemd/sd-adapt/errno-list.h | 3 + src/systemd/sd-adapt/locale-util.h | 3 + src/systemd/sd-adapt/memfd-util.h | 3 + src/systemd/sd-adapt/nm-sd-adapt.h | 26 +- src/systemd/sd-adapt/procfs-util.h | 3 + src/systemd/sd-adapt/terminal-util.h | 3 + src/systemd/sd-adapt/unaligned.h | 3 + src/systemd/src/basic/alloc-util.c | 21 +- src/systemd/src/basic/alloc-util.h | 47 +- src/systemd/src/basic/async.h | 22 +- src/systemd/src/basic/escape.c | 29 +- src/systemd/src/basic/escape.h | 22 +- src/systemd/src/basic/ether-addr-util.c | 63 +- src/systemd/src/basic/ether-addr-util.h | 29 +- src/systemd/src/basic/extract-word.c | 22 +- src/systemd/src/basic/extract-word.h | 20 +- src/systemd/src/basic/fd-util.c | 668 +- src/systemd/src/basic/fd-util.h | 70 +- src/systemd/src/basic/fileio.c | 299 +- src/systemd/src/basic/fileio.h | 41 +- src/systemd/src/basic/fs-util.c | 609 +- src/systemd/src/basic/fs-util.h | 55 +- src/systemd/src/basic/hash-funcs.c | 74 +- src/systemd/src/basic/hash-funcs.h | 42 +- src/systemd/src/basic/hashmap.c | 181 +- src/systemd/src/basic/hashmap.h | 59 +- src/systemd/src/basic/hexdecoct.c | 303 +- src/systemd/src/basic/hexdecoct.h | 20 +- src/systemd/src/basic/hostname-util.c | 121 +- src/systemd/src/basic/hostname-util.h | 26 +- src/systemd/src/basic/in-addr-util.c | 21 +- src/systemd/src/basic/in-addr-util.h | 20 +- src/systemd/src/basic/io-util.c | 31 +- src/systemd/src/basic/io-util.h | 29 +- src/systemd/src/basic/list.h | 23 +- src/systemd/src/basic/log.h | 106 +- src/systemd/src/basic/macro.h | 80 +- src/systemd/src/basic/mempool.c | 30 +- src/systemd/src/basic/mempool.h | 22 +- src/systemd/src/basic/parse-util.c | 226 +- src/systemd/src/basic/parse-util.h | 46 +- src/systemd/src/basic/path-util.c | 331 +- src/systemd/src/basic/path-util.h | 72 +- src/systemd/src/basic/prioq.c | 21 +- src/systemd/src/basic/prioq.h | 20 +- src/systemd/src/basic/process-util.c | 575 +- src/systemd/src/basic/process-util.h | 107 +- src/systemd/src/basic/random-util.c | 31 +- src/systemd/src/basic/random-util.h | 20 +- src/systemd/src/basic/refcnt.h | 20 +- src/systemd/src/basic/set.h | 34 +- src/systemd/src/basic/signal-util.h | 39 +- src/systemd/src/basic/siphash24.h | 53 + src/systemd/src/basic/socket-util.c | 182 +- src/systemd/src/basic/socket-util.h | 38 +- src/systemd/src/basic/sparse-endian.h | 4 +- src/systemd/src/basic/stat-util.c | 261 + src/systemd/src/basic/stat-util.h | 60 + src/systemd/src/basic/stdio-util.h | 26 +- src/systemd/src/basic/string-table.c | 19 +- src/systemd/src/basic/string-table.h | 45 +- src/systemd/src/basic/string-util.c | 447 +- src/systemd/src/basic/string-util.h | 75 +- src/systemd/src/basic/strv.c | 112 +- src/systemd/src/basic/strv.h | 41 +- src/systemd/src/basic/time-util.c | 147 +- src/systemd/src/basic/time-util.h | 32 +- src/systemd/src/basic/umask-util.h | 20 +- src/systemd/src/basic/utf8.c | 79 +- src/systemd/src/basic/utf8.h | 24 +- src/systemd/src/basic/util.c | 454 +- src/systemd/src/basic/util.h | 60 +- src/systemd/src/libsystemd-network/arp-util.c | 30 +- src/systemd/src/libsystemd-network/arp-util.h | 18 +- .../src/libsystemd-network/dhcp-identifier.c | 22 +- .../src/libsystemd-network/dhcp-identifier.h | 18 +- src/systemd/src/libsystemd-network/dhcp-internal.h | 20 +- .../src/libsystemd-network/dhcp-lease-internal.h | 22 +- src/systemd/src/libsystemd-network/dhcp-network.c | 33 +- src/systemd/src/libsystemd-network/dhcp-option.c | 57 +- src/systemd/src/libsystemd-network/dhcp-packet.c | 20 +- src/systemd/src/libsystemd-network/dhcp-protocol.h | 18 +- .../src/libsystemd-network/dhcp6-internal.h | 84 +- .../src/libsystemd-network/dhcp6-lease-internal.h | 22 +- src/systemd/src/libsystemd-network/dhcp6-network.c | 22 +- src/systemd/src/libsystemd-network/dhcp6-option.c | 364 +- .../src/libsystemd-network/dhcp6-protocol.h | 25 +- src/systemd/src/libsystemd-network/lldp-internal.h | 20 +- src/systemd/src/libsystemd-network/lldp-neighbor.c | 23 +- src/systemd/src/libsystemd-network/lldp-neighbor.h | 20 +- src/systemd/src/libsystemd-network/lldp-network.c | 25 +- src/systemd/src/libsystemd-network/lldp-network.h | 20 +- .../src/libsystemd-network/network-internal.c | 153 +- .../src/libsystemd-network/network-internal.h | 59 +- .../src/libsystemd-network/sd-dhcp-client.c | 121 +- src/systemd/src/libsystemd-network/sd-dhcp-lease.c | 66 +- .../src/libsystemd-network/sd-dhcp6-client.c | 312 +- .../src/libsystemd-network/sd-dhcp6-lease.c | 73 +- src/systemd/src/libsystemd-network/sd-ipv4acd.c | 29 +- src/systemd/src/libsystemd-network/sd-ipv4ll.c | 24 +- src/systemd/src/libsystemd-network/sd-lldp.c | 31 +- src/systemd/src/libsystemd/sd-event/sd-event.c | 1061 ++- src/systemd/src/libsystemd/sd-id128/id128-util.c | 29 +- src/systemd/src/libsystemd/sd-id128/id128-util.h | 17 +- src/systemd/src/libsystemd/sd-id128/sd-id128.c | 19 +- src/systemd/src/shared/dns-domain.c | 95 +- src/systemd/src/shared/dns-domain.h | 20 +- src/systemd/src/systemd/_sd-common.h | 4 +- src/systemd/src/systemd/sd-dhcp-client.h | 14 +- src/systemd/src/systemd/sd-dhcp-lease.h | 7 +- src/systemd/src/systemd/sd-dhcp6-client.h | 15 +- src/systemd/src/systemd/sd-dhcp6-lease.h | 12 +- src/systemd/src/systemd/sd-event.h | 16 +- src/systemd/src/systemd/sd-id128.h | 4 +- src/systemd/src/systemd/sd-ipv4acd.h | 7 +- src/systemd/src/systemd/sd-ipv4ll.h | 5 +- src/systemd/src/systemd/sd-lldp.h | 7 +- src/systemd/src/systemd/sd-ndisc.h | 5 +- src/tests/config/meson.build | 21 + src/tests/config/nm-test-device.c | 2 +- src/tests/config/test-config.c | 99 +- src/tests/meson.build | 47 + src/tests/test-general-with-expect.c | 127 +- src/tests/test-general.c | 30 +- src/tests/test-ip4-config.c | 6 +- src/tests/test-ip6-config.c | 24 +- src/tests/test-resolvconf-capture.c | 298 - src/vpn/nm-vpn-connection.c | 102 +- src/vpn/nm-vpn-connection.h | 1 - tools/check-docs.sh | 22 + tools/create-exports-NetworkManager.sh | 2 +- tools/debug-helper.py | 10 +- tools/run-nm-test.sh | 44 +- tools/test-networkmanager-service.py | 2641 ++++--- vapi/meson.build | 29 + 1609 files changed, 233596 insertions(+), 210188 deletions(-) create mode 100644 clients/cli/meson.build create mode 100644 clients/common/meson.build delete mode 100644 clients/common/settings-docs.c delete mode 100644 clients/common/settings-docs.c.in create mode 100644 clients/common/settings-docs.h create mode 100644 clients/common/settings-docs.h.in create mode 100644 clients/common/tests/meson.build create mode 100644 clients/meson.build create mode 100644 clients/tests/test-client.check-on-disk/Makefile.am create mode 100644 clients/tests/test-client.check-on-disk/test_001-001.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-002.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-003.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-004.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-005.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-006.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-007.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-008.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-009.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-010.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-011.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-012.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-013.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-014.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-015.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-016.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-017.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-018.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-019.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-020.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-021.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-022.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-023.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-024.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-025.expected create mode 100644 clients/tests/test-client.check-on-disk/test_001-026.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-001.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-002.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-003.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-004.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-005.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-006.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-007.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-008.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-009.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-010.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-011.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-012.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-013.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-014.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-015.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-016.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-017.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-018.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-019.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-020.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-021.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-022.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-023.expected create mode 100644 clients/tests/test-client.check-on-disk/test_002-024.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-001.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-002.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-003.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-004.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-005.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-006.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-007.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-008.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-009.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-010.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-011.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-012.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-013.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-014.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-015.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-016.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-017.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-018.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-019.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-020.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-021.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-022.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-023.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-024.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-025.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-026.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-027.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-028.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-029.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-030.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-031.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-032.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-033.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-034.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-035.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-036.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-037.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-038.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-039.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-040.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-041.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-042.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-043.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-044.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-045.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-046.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-047.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-048.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-049.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-050.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-051.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-052.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-053.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-054.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-055.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-056.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-057.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-058.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-059.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-060.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-061.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-062.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-063.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-064.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-065.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-066.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-067.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-068.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-069.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-070.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-071.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-072.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-073.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-074.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-075.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-076.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-077.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-078.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-079.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-080.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-081.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-082.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-083.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-084.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-085.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-086.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-087.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-088.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-089.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-090.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-091.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-092.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-093.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-094.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-095.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-096.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-097.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-098.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-099.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-100.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-001.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-002.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-003.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-004.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-005.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-006.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-007.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-008.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-009.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-010.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-011.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-012.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-013.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-014.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-015.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-016.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-017.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-018.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-019.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-020.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-021.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-022.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-023.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-024.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-025.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-026.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-027.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-028.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-029.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-030.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-031.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-032.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-033.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-034.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-035.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-036.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-037.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-038.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-039.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-040.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-041.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-042.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-043.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-044.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-045.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-046.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-047.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-048.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-049.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-050.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-051.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-052.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-053.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-054.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-055.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-056.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-057.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-058.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-059.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-060.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-061.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-062.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-063.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-064.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-065.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-066.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-067.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-068.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-069.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-070.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-071.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-072.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-073.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-074.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-075.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-076.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-077.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-078.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-079.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-080.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-081.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-082.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-083.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-084.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-085.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-086.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-087.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-088.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-089.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-090.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-091.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-092.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-093.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-094.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-095.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-096.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-097.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-098.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-099.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-100.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-101.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-102.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-103.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-104.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-105.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-106.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-107.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-108.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-109.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-110.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-111.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-112.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-113.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-114.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-115.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-116.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-117.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-118.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-119.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-120.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-121.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-122.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-123.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-124.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-125.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-126.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-127.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-128.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-129.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-130.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-131.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-132.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-133.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-134.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-135.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-136.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-137.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-138.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-139.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-140.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-141.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-142.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-143.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-144.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-145.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-146.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-147.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-148.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-149.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-150.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-151.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-152.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-153.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-154.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-155.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-156.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-157.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-158.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-159.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-160.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-161.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-162.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-163.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-164.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-165.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-166.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-167.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-168.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-169.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-170.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-171.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-172.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-173.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-174.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-175.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-176.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-177.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-178.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-179.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-180.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-181.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-182.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-183.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-184.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-185.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-186.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-187.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-188.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-189.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-190.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-191.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-192.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-193.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-194.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-195.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-196.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-197.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-198.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-199.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-200.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-201.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-202.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-203.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-204.expected create mode 100755 clients/tests/test-client.py create mode 100644 clients/tui/meson.build create mode 100644 clients/tui/newt/meson.build create mode 100644 config.h.meson create mode 100644 data/90-nm-thunderbolt.rules create mode 100644 data/meson.build create mode 100644 dispatcher/meson.build create mode 100644 dispatcher/tests/meson.build delete mode 100644 docs/api/dbus-org.freedesktop.NetworkManager.Device.WiMax.xml create mode 100644 docs/api/html/dbus-vpn-plugin.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Checkpoint.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsBridge.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsInterface.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OvsPort.html create mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Ppp.html delete mode 100644 docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html create mode 100644 docs/api/html/ref-dbus-checkpoint.html create mode 100644 docs/api/meson.build create mode 100644 docs/libnm-glib/meson.build create mode 100644 docs/libnm-util/meson.build create mode 100644 docs/libnm/html/NMCheckpoint.html create mode 100644 docs/libnm/html/NMDeviceOvsBridge.html create mode 100644 docs/libnm/html/NMDeviceOvsInterface.html create mode 100644 docs/libnm/html/NMDeviceOvsPort.html create mode 100644 docs/libnm/html/NMDevicePpp.html create mode 100644 docs/libnm/html/NMSettingOvsBridge.html create mode 100644 docs/libnm/html/NMSettingOvsInterface.html create mode 100644 docs/libnm/html/NMSettingOvsPatch.html create mode 100644 docs/libnm/html/NMSettingOvsPort.html create mode 100644 docs/libnm/html/NMSettingProxy.html create mode 100644 docs/libnm/html/NMSettingTCConfig.html create mode 100644 docs/libnm/html/NMSettingUser.html create mode 100644 docs/libnm/html/NMVpnEditor.html delete mode 100644 docs/libnm/html/libnm-nm-vpn-dbus-interface.html create mode 100644 docs/libnm/html/libnm-nm-vpn-plugin-info.html create mode 100644 docs/libnm/html/libnm-nm-vpn-plugin-old.html create mode 100644 docs/libnm/html/libnm-nm-vpn-service-plugin.html create mode 100644 docs/libnm/meson.build create mode 100644 docs/meson.build create mode 100644 examples/C/glib/meson.build create mode 100644 examples/C/qt/meson.build create mode 100755 examples/js/get_ips.js create mode 100644 examples/python/nmex.py create mode 100644 introspection/meson.build create mode 100644 libnm-core/meson.build create mode 100644 libnm-core/nm-core-enum-types.c.template create mode 100644 libnm-core/nm-core-enum-types.h.template delete mode 100644 libnm-core/nm-keyfile-reader.c delete mode 100644 libnm-core/nm-keyfile-writer.c create mode 100644 libnm-core/nm-keyfile.c create mode 100644 libnm-core/tests/meson.build create mode 100644 libnm-core/tests/nm-core-tests-enum-types.c.template create mode 100644 libnm-core/tests/nm-core-tests-enum-types.h.template create mode 100644 libnm-glib/meson.build create mode 100644 libnm-glib/nm-glib-enum-types.c.template create mode 100644 libnm-glib/nm-glib-enum-types.h.template create mode 100644 libnm-glib/nm-vpn-enum-types.c.template create mode 100644 libnm-glib/nm-vpn-enum-types.h.template create mode 100644 libnm-glib/tests/meson.build create mode 100644 libnm-util/meson.build create mode 100644 libnm-util/nm-utils-enum-types.c.template create mode 100644 libnm-util/nm-utils-enum-types.h.template create mode 100644 libnm-util/tests/meson.build create mode 100644 libnm/fake-typelib/NMClient.gir create mode 100644 libnm/fake-typelib/NetworkManager.gir create mode 100644 libnm/fake-typelib/meson.build create mode 100644 libnm/fake-typelib/typelibs.gresource.xml create mode 100644 libnm/meson.build create mode 100644 libnm/nm-autoptr.h create mode 100644 libnm/nm-checkpoint.c create mode 100644 libnm/nm-checkpoint.h create mode 100644 libnm/nm-enum-types.c.template create mode 100644 libnm/nm-enum-types.h.template create mode 100644 libnm/tests/meson.build create mode 100644 man/meson.build create mode 100644 meson.build create mode 100644 meson_options.txt create mode 100644 meson_post_install.py create mode 100644 po/meson.build create mode 100644 shared/c-list/src/c-list.h create mode 100644 shared/c-siphash/src/c-siphash.c create mode 100644 shared/c-siphash/src/c-siphash.h create mode 100644 shared/meson.build create mode 100644 shared/n-acd/src/n-acd.c create mode 100644 shared/n-acd/src/n-acd.h delete mode 100644 shared/nm-utils/c-list.h create mode 100644 shared/nm-utils/nm-c-list.h create mode 100644 shared/nm-utils/nm-compat.c create mode 100644 shared/nm-utils/nm-compat.h create mode 100644 shared/nm-utils/nm-jansson.h delete mode 100644 shared/nm-utils/siphash24.c delete mode 100644 shared/nm-utils/siphash24.h create mode 100644 src/devices/adsl/meson.build create mode 100644 src/devices/bluetooth/meson.build create mode 100644 src/devices/meson.build create mode 100644 src/devices/nm-acd-manager.c create mode 100644 src/devices/nm-acd-manager.h delete mode 100644 src/devices/nm-arping-manager.c delete mode 100644 src/devices/nm-arping-manager.h create mode 100644 src/devices/ovs/meson.build create mode 100644 src/devices/team/meson.build create mode 100644 src/devices/tests/meson.build create mode 100644 src/devices/tests/test-acd.c delete mode 100644 src/devices/tests/test-arping.c create mode 100644 src/devices/wifi/meson.build create mode 100644 src/devices/wifi/nm-device-iwd.c create mode 100644 src/devices/wifi/nm-device-iwd.h create mode 100644 src/devices/wifi/nm-iwd-manager.c create mode 100644 src/devices/wifi/nm-iwd-manager.h create mode 100644 src/devices/wifi/nm-wifi-common.c create mode 100644 src/devices/wifi/nm-wifi-common.h create mode 100644 src/devices/wifi/tests/meson.build create mode 100644 src/devices/wwan/meson.build create mode 100644 src/dhcp/meson.build delete mode 100644 src/dhcp/tests/leases/basic.leases delete mode 100644 src/dhcp/tests/leases/malformed1.leases delete mode 100644 src/dhcp/tests/leases/malformed2.leases delete mode 100644 src/dhcp/tests/leases/malformed3.leases create mode 100644 src/dhcp/tests/meson.build create mode 100644 src/dnsmasq/tests/meson.build create mode 100644 src/meson.build create mode 100644 src/ndisc/tests/meson.build delete mode 100644 src/nm-bus-manager.c delete mode 100644 src/nm-bus-manager.h create mode 100644 src/nm-dbus-manager.c create mode 100644 src/nm-dbus-manager.h create mode 100644 src/nm-dbus-object.c create mode 100644 src/nm-dbus-object.h create mode 100644 src/nm-dbus-utils.c create mode 100644 src/nm-dbus-utils.h delete mode 100644 src/nm-exported-object.c delete mode 100644 src/nm-exported-object.h create mode 100644 src/platform/nm-netlink.c create mode 100644 src/platform/nm-netlink.h create mode 100644 src/platform/tests/meson.build create mode 100644 src/ppp/meson.build create mode 100644 src/settings/plugins/ibft/meson.build create mode 100644 src/settings/plugins/ibft/tests/meson.build create mode 100644 src/settings/plugins/ifcfg-rh/meson.build create mode 100644 src/settings/plugins/ifcfg-rh/nm-ifdown create mode 100644 src/settings/plugins/ifcfg-rh/nm-ifup create mode 100644 src/settings/plugins/ifcfg-rh/tests/meson.build create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection-parser.c delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection-parser.h delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection.c delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-connection.h delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-parser.c delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-parser.h delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-utils.c delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-net-utils.h delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-plugin.c delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-plugin.h delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c delete mode 100644 src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h delete mode 100644 src/settings/plugins/ifnet/tests/net delete mode 100644 src/settings/plugins/ifnet/tests/net.all delete mode 100644 src/settings/plugins/ifnet/tests/nm-system-settings.conf delete mode 100644 src/settings/plugins/ifnet/tests/test-ifnet.c delete mode 100644 src/settings/plugins/ifnet/tests/test_ca_cert.pem delete mode 100644 src/settings/plugins/ifnet/tests/wpa_supplicant.conf create mode 100644 src/settings/plugins/ifupdown/meson.build create mode 100644 src/settings/plugins/ifupdown/tests/meson.build create mode 100644 src/settings/plugins/keyfile/tests/meson.build create mode 100644 src/settings/plugins/meson.build create mode 100644 src/supplicant/tests/meson.build create mode 100644 src/systemd/meson.build create mode 100644 src/systemd/sd-adapt/copy.h create mode 100644 src/systemd/sd-adapt/device-nodes.h create mode 100644 src/systemd/sd-adapt/errno-list.h create mode 100644 src/systemd/sd-adapt/locale-util.h create mode 100644 src/systemd/sd-adapt/memfd-util.h create mode 100644 src/systemd/sd-adapt/procfs-util.h create mode 100644 src/systemd/sd-adapt/terminal-util.h create mode 100644 src/systemd/sd-adapt/unaligned.h create mode 100644 src/systemd/src/basic/siphash24.h create mode 100644 src/systemd/src/basic/stat-util.c create mode 100644 src/systemd/src/basic/stat-util.h create mode 100644 src/tests/config/meson.build create mode 100644 src/tests/meson.build delete mode 100644 src/tests/test-resolvconf-capture.c create mode 100755 tools/check-docs.sh create mode 100644 vapi/meson.build diff --git a/Makefile.am b/Makefile.am index 639921d5..b1a2e69e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,8 +19,9 @@ noinst_DATA = sbin_PROGRAMS = bin_PROGRAMS = libexec_PROGRAMS = +dist_libexec_SCRIPTS = lib_LTLIBRARIES = -pkglib_LTLIBRARIES = +plugin_LTLIBRARIES = core_plugins = service_DATA = man_MANS = @@ -53,7 +54,7 @@ INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is # executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) +INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) LDFLAGS="$(SANITIZER_LIB_LDFLAGS)" libnmincludedir = $(includedir)/libnm libnminclude_HEADERS = @@ -73,12 +74,16 @@ examplesdir = $(docdir)/examples rundir=$(runstatedir)/NetworkManager statedir=$(localstatedir)/lib/NetworkManager +plugindir=$(pkglibdir)/$(NM_DIST_VERSION) + dbusactivationdir = $(datadir)/dbus-1/system-services servicedir = $(datadir)/dbus-1/system-services completiondir = $(datadir)/bash-completion/completions +nmlocaledir = $(datadir)/locale + GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM @@ -102,14 +107,20 @@ endif ############################################################################### +nm_build_cflags = \ + -DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \ + -DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \ + $(NULL) + set_sanitizer_env = \ [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ - if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ - export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ + if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \ + [ -n "$(1)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ + [ -n "$(2)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(2) | grep libasan\.so\.. -o | head -n 1)"; \ fi check_so_symbols = \ - $(call set_sanitizer_env,$(1)); \ + $(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \ LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null ############################################################################### @@ -117,13 +128,13 @@ check_so_symbols = \ DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests=yes \ --with-valgrind=no \ + --with-libnm-glib=yes \ --enable-gtk-doc \ --enable-more-warnings=error \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-ifnet \ --disable-dependency-tracking dist-configure-check: @@ -164,14 +175,7 @@ DISTCLEANFILES += $(polkit_policy_DATA) noinst_LTLIBRARIES += \ introspection/libnmdbus.la -# gdbus-codegen 2.38 will emit code that requires glib 2.38, which -# will then cause availability warnings if we define -# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32. -# -# This is fixed in GLib 2.40 (it emits code that takes -# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go -# away when we depend on that. -introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) +introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS) introspection_sources = \ introspection/org.freedesktop.NetworkManager.AccessPoint.c \ @@ -373,11 +377,15 @@ CLEANFILES += $(DBUS_INTERFACE_DOCS) $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources) $(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources) $(libnm_libnm_la_OBJECTS): $(introspection_sources) -$(src_libNetworkManager_la_OBJECTS): $(introspection_sources) -$(src_libNetworkManagerBase_la_OBJECTS): $(introspection_sources) EXTRA_DIST += \ - $(dbusinterfaces_DATA) + $(dbusinterfaces_DATA) \ + introspection/meson.build + +check-docs: + $(srcdir)/tools/check-docs.sh "$(srcdir)" + +check_local += check-docs ############################################################################### @@ -444,7 +452,6 @@ libnm_core_lib_h_priv = \ shared/nm-utils/nm-shared-utils.h \ shared/nm-utils/nm-random-utils.h \ shared/nm-utils/nm-udev-utils.h \ - shared/nm-utils/siphash24.h \ shared/nm-meta-setting.h \ libnm-core/crypto.h \ libnm-core/nm-connection-private.h \ @@ -455,24 +462,7 @@ libnm_core_lib_h_priv = \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h \ libnm-core/nm-utils-private.h -libnm_core_lib_c_real = \ - shared/nm-utils/c-list-util.c \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-udev-utils.c \ - shared/nm-utils/siphash24.c \ - shared/nm-meta-setting.c \ - libnm-core/crypto.c \ - libnm-core/nm-connection.c \ - libnm-core/nm-dbus-utils.c \ - libnm-core/nm-errors.c \ - libnm-core/nm-keyfile-reader.c \ - libnm-core/nm-keyfile-utils.c \ - libnm-core/nm-keyfile-writer.c \ - libnm-core/nm-property-compare.c \ +libnm_core_lib_c_settings_real = \ libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c \ libnm-core/nm-setting-bluetooth.c \ @@ -512,14 +502,31 @@ libnm_core_lib_c_real = \ libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c \ + libnm-core/nm-setting-wireless.c +libnm_core_lib_c_real = \ + $(libnm_core_lib_c_settings_real) \ + shared/nm-utils/c-list-util.c \ + shared/nm-utils/nm-dedup-multi.c \ + shared/nm-utils/nm-enum-utils.c \ + shared/nm-utils/nm-hash-utils.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-random-utils.c \ + shared/nm-utils/nm-udev-utils.c \ + shared/nm-meta-setting.c \ + libnm-core/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 -if WITH_JANSSON +if WITH_JSON_VALIDATION libnm_core_lib_h_priv += \ libnm-core/nm-json.h libnm_core_lib_c_real += \ @@ -544,11 +551,8 @@ dflt_cppflags_libnm_core = \ -I$(builddir)/libnm-core \ $(CODE_COVERAGE_CFLAGS) \ $(GLIB_CFLAGS) \ - $(LIBUDEV_CFLAGS) - -if WITH_JANSSON -dflt_cppflags_libnm_core += $(JANSSON_CFLAGS) -endif + $(LIBUDEV_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) if WITH_GNUTLS dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS) @@ -585,12 +589,18 @@ $(src_devices_wwan_libnm_device_plugin_wwan_la_OBJECTS): $(li libnm_core_libnm_core_la_CPPFLAGS = \ $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ - -DNMPLUGINDIR=\"$(pkglibdir)\" \ + -DNMVPNDIR=\"$(pkglibdir)\" \ + -DNMPLUGINDIR=\"$(plugindir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB + $(NULL) + +if WITH_JSON_VALIDATION +libnm_core_libnm_core_la_CPPFLAGS += $(JANSSON_CFLAGS) +endif libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_h_pub_real) \ @@ -602,12 +612,15 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_c_mkenums) libnm_core_libnm_core_la_LIBADD = \ + shared/libcsiphash.la \ $(GLIB_LIBS) \ $(UUID_LIBS) \ - $(LIBUDEV_LIBS) + $(LIBUDEV_LIBS) \ + $(NULL) libnm_core_libnm_core_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) if WITH_GNUTLS libnm_core_lib_c_real += libnm-core/crypto_gnutls.c @@ -621,7 +634,10 @@ endif EXTRA_DIST += \ libnm-core/crypto_gnutls.c \ - libnm-core/crypto_nss.c + libnm-core/crypto_nss.c \ + libnm-core/nm-core-enum-types.c.template \ + libnm-core/nm-core-enum-types.h.template \ + libnm-core/meson.build libnm-core/nm-vpn-dbus-types.xml: libnm-core/nm-vpn-dbus-interface.h tools/enums-to-docbook.pl @$(MKDIR_P) libnm-core/ @@ -664,7 +680,10 @@ libnm_core_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + $(NULL) libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags) @@ -686,6 +705,9 @@ libnm_core_tests_ldadd = \ libnm-core/libnm-core.la \ $(GLIB_LIBS) +libnm_core_tests_ldflags = \ + $(SANITIZER_LIB_LDFLAGS) + libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) @@ -694,6 +716,14 @@ libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags) + $(libnm_core_tests_test_compare_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_core_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_core_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -705,11 +735,11 @@ $(libnm_core_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenu # test-cert.p12 created with: # # openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 EXTRA_DIST += \ libnm-core/tests/certs/ca-no-ending-newline.pem \ @@ -728,7 +758,10 @@ EXTRA_DIST += \ libnm-core/tests/certs/test-key-and-cert.pem \ libnm-core/tests/certs/test-key-only-decrypted.der \ libnm-core/tests/certs/test-key-only-decrypted.pem \ - libnm-core/tests/certs/test-key-only.pem + libnm-core/tests/certs/test-key-only.pem \ + libnm-core/tests/nm-core-tests-enum-types.c.template \ + libnm-core/tests/nm-core-tests-enum-types.h.template \ + libnm-core/tests/meson.build ############################################################################### @@ -737,6 +770,8 @@ libnm_lib_h_pub_real = \ libnm/NetworkManager.h \ libnm/nm-access-point.h \ libnm/nm-active-connection.h \ + libnm/nm-autoptr.h \ + libnm/nm-checkpoint.h \ libnm/nm-client.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ @@ -766,14 +801,13 @@ libnm_lib_h_pub_real = \ libnm/nm-ip-config.h \ libnm/nm-object.h \ libnm/nm-remote-connection.h \ + libnm/nm-secret-agent-old.h \ libnm/nm-types.h \ libnm/nm-vpn-connection.h \ libnm/nm-vpn-editor.h \ - libnm/nm-wimax-nsp.h -libnm_lib_h_pub_nointrospect = \ - libnm/nm-secret-agent-old.h \ libnm/nm-vpn-plugin-old.h \ - libnm/nm-vpn-service-plugin.h + libnm/nm-vpn-service-plugin.h \ + libnm/nm-wimax-nsp.h libnm_lib_h_pub_mkenums = \ libnm/nm-enum-types.h libnm_lib_h_priv = \ @@ -792,6 +826,7 @@ libnm_lib_h_priv = \ libnm_lib_c_real = \ libnm/nm-access-point.c \ libnm/nm-active-connection.c \ + libnm/nm-checkpoint.c \ libnm/nm-client.c \ libnm/nm-dbus-helpers.c \ libnm/nm-device-adsl.c \ @@ -843,12 +878,11 @@ libnm_lib_cppflags = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNMRUNDIR=\"$(nmrundir)\" + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + $(NULL) libnminclude_HEADERS += \ - $(libnm_lib_h_pub_real) \ - $(libnm_lib_h_pub_nointrospect) + $(libnm_lib_h_pub_real) nodist_libnminclude_HEADERS += \ $(libnm_lib_h_pub_mkenums) @@ -858,6 +892,7 @@ nodist_libnminclude_HEADERS += \ noinst_LTLIBRARIES += libnm/libnm-utils.la libnm_libnm_utils_la_CPPFLAGS = \ + $(INTROSPECTION_CFLAGS) \ $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ @@ -879,8 +914,7 @@ GLIB_GENERATED += \ $(libnm_lib_c_mkenums) nm_enum_types_sources = \ $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_h_pub_real) \ - $(libnm_lib_h_pub_nointrospect) + $(libnm_lib_h_pub_real) nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' @@ -891,11 +925,11 @@ $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS): $(libnm_core_lib_h_pub_m libnm_libnm_la_CPPFLAGS = \ $(libnm_lib_cppflags) \ - $(LIBUDEV_CFLAGS) + $(LIBUDEV_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) libnm_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ - $(libnm_lib_h_pub_nointrospect) \ $(libnm_lib_h_priv) \ $(libnm_lib_c_real) @@ -916,6 +950,7 @@ libnm_libnm_la_LIBADD = \ libnm_libnm_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ -version-info "1:0:1" check-local-exports-libnm: libnm/libnm.la @@ -932,8 +967,11 @@ EXTRA_DIST += \ libnm/libnm.pc.in \ libnm/libnm.ver +libnm_NM_1_0_typelib = if HAVE_INTROSPECTION +libnm_NM_1_0_typelib += libnm/NM-1.0.typelib + libnm/NM-1.0.gir: libnm/libnm.la libnm_NM_1_0_gir_INCLUDES = Gio-2.0 libnm_NM_1_0_gir_PACKAGES = gio-2.0 @@ -947,7 +985,6 @@ libnm_NM_1_0_gir_FILES = \ $(libnm_core_lib_c_real) \ $(libnm_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_real) \ - $(libnm_lib_h_pub_nointrospect) \ $(libnm_lib_c_mkenums) \ $(libnm_lib_c_real) libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm @@ -956,8 +993,35 @@ libnm/libnm.typelib: libnm/libnm.gir $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ INTROSPECTION_GIRS += libnm/NM-1.0.gir + +if WITH_FAKE_TYPELIBS + +libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp + $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ + +libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp + $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ + +libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register + +nodist_libnm_libnm_utils_la_SOURCES = \ + libnm/fake-typelib/typelibs.c + +CLEANFILES += \ + libnm/fake-typelib/typelibs.c \ + libnm/fake-typelib/NMClient.typelib \ + libnm/fake-typelib/NetworkManager.typelib endif +endif + +EXTRA_DIST += \ + libnm/fake-typelib/NetworkManager.gir \ + libnm/fake-typelib/NMClient.gir \ + libnm/fake-typelib/typelibs.gresource.xml \ + libnm/fake-typelib/meson.build + if HAVE_INTROSPECTION libnm_noinst_data = \ @@ -969,10 +1033,10 @@ libnm_noinst_data = \ noinst_DATA += $(libnm_noinst_data) -libnm_docs_sources = $(libnm_core_lib_c_real) +libnm_docs_sources = $(libnm_core_lib_c_settings_real) libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) - $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(srcdir)" $@ + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^) # When the python scripts loads libnm and the address sanitizers is # enabled, we must LD_PRELOAD libasan otherwise it will complain that @@ -999,9 +1063,9 @@ libnm/nm-settings-docs.xml: libnm/generate-setting-docs.py libnm/nm-settings-doc --output $@ libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) - $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(srcdir)" $@ + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile $@ $(filter-out $<,$^) libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) - $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@ + $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^) EXTRA_DIST += $(libnm_noinst_data) @@ -1009,35 +1073,52 @@ endif EXTRA_DIST += \ libnm/generate-setting-docs.py \ - libnm/generate-plugin-docs.pl + libnm/generate-plugin-docs.pl \ + libnm/nm-enum-types.c.template \ + libnm/nm-enum-types.h.template \ + libnm/meson.build ############################################################################### libnm_tests_programs = \ - libnm/tests/test-general \ + libnm/tests/test-general + +check_programs += $(libnm_tests_programs) + +libnm_tests_programs_req_introspection = \ libnm/tests/test-nm-client \ libnm/tests/test-remote-settings-client \ libnm/tests/test-secret-agent -check_programs += $(libnm_tests_programs) +if HAVE_INTROSPECTION +check_programs += $(libnm_tests_programs_req_introspection) +else +check_programs_norun += $(libnm_tests_programs_req_introspection) +endif libnm_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + $(NULL) libnm_tests_ldadd = \ libnm/libnm.la \ $(GLIB_LIBS) +libnm_tests_ldflags = \ + $(SANITIZER_LIB_LDFLAGS) + libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_general_SOURCES = \ + shared/nm-utils/nm-compat.c \ libnm/tests/test-general.c libnm_tests_test_nm_client_SOURCES = \ @@ -1062,11 +1143,22 @@ 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) +libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags) +libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags) +libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags) +libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags) + $(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it +# is built first. +$(libnm_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) +$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) +$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_NM_1_0_typelib) + ############################################################################### # just test, that we can build "nm-vpn-plugin-utils.c" @@ -1084,11 +1176,17 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ $(GLIB_LIBS) +EXTRA_DIST += \ + libnm/tests/meson.build + ############################################################################### # src/ ############################################################################### @@ -1099,8 +1197,7 @@ src_cppflags = \ -I$(builddir)/src \ \ -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -1112,8 +1209,8 @@ src_cppflags = \ -DRUNDIR=\"$(rundir)\" \ \ -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLOCALEDIR=\"$(datadir)/locale\" \ - -DNMPLUGINDIR=\"$(pkglibdir)\" \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" \ + -DNMPLUGINDIR=\"$(plugindir)\" \ -DNMRUNDIR=\"$(nmrundir)\" \ -DNMSTATEDIR=\"$(nmstatedir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ @@ -1123,7 +1220,6 @@ src_cppflags = \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ \ $(LIBUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ $(LIBNDP_CFLAGS) \ $(LIBPSL_CFLAGS) \ $(LIBCURL_CFLAGS) \ @@ -1131,6 +1227,7 @@ src_cppflags = \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ \ $(NULL) @@ -1149,6 +1246,38 @@ noinst_LTLIBRARIES += \ ############################################################################### +noinst_LTLIBRARIES += shared/libcsiphash.la + +shared_libcsiphash_la_CPPFLAGS = \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) + +shared_libcsiphash_la_SOURCES = \ + shared/c-siphash/src/c-siphash.c \ + shared/c-siphash/src/c-siphash.h + +############################################################################### + +noinst_LTLIBRARIES += shared/libnacd.la + +shared_libnacd_la_CFLAGS = -std=gnu99 + +shared_libnacd_la_CPPFLAGS = \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -I$(srcdir)/shared/c-list/src \ + -I$(srcdir)/shared/c-siphash/src \ + $(NULL) + +shared_libnacd_la_SOURCES = \ + shared/n-acd/src/n-acd.c \ + shared/n-acd/src/n-acd.h + +EXTRA_DIST += shared/c-list/src/c-list.h + +############################################################################### + src_libsystemd_nm_la_cppflags = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ @@ -1156,12 +1285,12 @@ src_libsystemd_nm_la_cppflags = \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ -I$(srcdir)/src/systemd/sd-adapt \ - -I$(srcdir)/shared/nm-utils \ -I$(srcdir)/src/systemd/src/systemd \ -I$(srcdir)/src/systemd/src/basic \ -I$(srcdir)/src/systemd/src/shared \ -I$(srcdir)/src/systemd/src/libsystemd-network \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ + $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) @@ -1180,24 +1309,32 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/sd-adapt/cgroup-util.h \ src/systemd/sd-adapt/condition.h \ src/systemd/sd-adapt/conf-parser.h \ + src/systemd/sd-adapt/copy.h \ src/systemd/sd-adapt/def.h \ + src/systemd/sd-adapt/device-nodes.h \ src/systemd/sd-adapt/dirent-util.h \ src/systemd/sd-adapt/env-util.h \ + src/systemd/sd-adapt/errno-list.h \ src/systemd/sd-adapt/format-util.h \ + src/systemd/sd-adapt/glob-util.h \ src/systemd/sd-adapt/gunicode.h \ src/systemd/sd-adapt/ioprio.h \ src/systemd/sd-adapt/khash.h \ src/systemd/sd-adapt/libudev.h \ + src/systemd/sd-adapt/locale-util.h \ + src/systemd/sd-adapt/memfd-util.h \ src/systemd/sd-adapt/missing.h \ src/systemd/sd-adapt/mkdir.h \ + src/systemd/sd-adapt/procfs-util.h \ src/systemd/sd-adapt/raw-clone.h \ src/systemd/sd-adapt/sd-daemon.h \ src/systemd/sd-adapt/stat-util.h \ + src/systemd/sd-adapt/terminal-util.h \ src/systemd/sd-adapt/udev-util.h \ src/systemd/sd-adapt/udev.h \ + src/systemd/sd-adapt/unaligned.h \ src/systemd/sd-adapt/user-util.h \ src/systemd/sd-adapt/virt.h \ - src/systemd/sd-adapt/glob-util.h \ src/systemd/src/basic/alloc-util.c \ src/systemd/src/basic/alloc-util.h \ src/systemd/src/basic/async.h \ @@ -1243,9 +1380,12 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/src/basic/refcnt.h \ src/systemd/src/basic/set.h \ src/systemd/src/basic/signal-util.h \ + src/systemd/src/basic/siphash24.h \ src/systemd/src/basic/socket-util.c \ src/systemd/src/basic/socket-util.h \ src/systemd/src/basic/sparse-endian.h \ + src/systemd/src/basic/stat-util.c \ + src/systemd/src/basic/stat-util.h \ src/systemd/src/basic/stdio-util.h \ src/systemd/src/basic/string-table.c \ src/systemd/src/basic/string-table.h \ @@ -1311,6 +1451,9 @@ src_libsystemd_nm_la_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) src_libsystemd_nm_la_LIBADD = $(src_libsystemd_nm_la_libadd) $(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + src/systemd/meson.build + ############################################################################### src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags) @@ -1325,6 +1468,9 @@ src_libNetworkManagerBase_la_SOURCES = \ src/NetworkManagerUtils.c \ src/NetworkManagerUtils.h \ \ + src/platform/nm-netlink.c \ + src/platform/nm-netlink.h \ + \ src/platform/nmp-netns.c \ src/platform/nmp-netns.h \ src/platform/nmp-object.c \ @@ -1348,8 +1494,10 @@ src_libNetworkManagerBase_la_SOURCES = \ src/ndisc/nm-ndisc.h \ src/ndisc/nm-ndisc-private.h \ \ - src/nm-exported-object.c \ - src/nm-exported-object.h \ + src/nm-dbus-utils.c \ + src/nm-dbus-utils.h \ + src/nm-dbus-object.c \ + src/nm-dbus-object.h \ src/nm-ip4-config.c \ src/nm-ip4-config.h \ src/nm-ip6-config.c \ @@ -1377,7 +1525,6 @@ endif src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ - introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -1391,17 +1538,17 @@ src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) src_libNetworkManager_la_SOURCES = \ \ - src/nm-checkpoint-manager.c \ - src/nm-checkpoint-manager.h \ src/nm-checkpoint.c \ src/nm-checkpoint.h \ + src/nm-checkpoint-manager.c \ + src/nm-checkpoint-manager.h \ \ src/devices/nm-device.c \ src/devices/nm-device.h \ src/devices/nm-lldp-listener.c \ src/devices/nm-lldp-listener.h \ - src/devices/nm-arping-manager.c \ - src/devices/nm-arping-manager.h \ + src/devices/nm-acd-manager.c \ + src/devices/nm-acd-manager.h \ src/devices/nm-device-ethernet-utils.c \ src/devices/nm-device-ethernet-utils.h \ src/devices/nm-device-factory.c \ @@ -1447,16 +1594,16 @@ src_libNetworkManager_la_SOURCES = \ src/dhcp/nm-dhcp-dhclient-utils.c \ src/dhcp/nm-dhcp-dhclient-utils.h \ \ + src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h \ + src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h \ src/dns/nm-dns-dnsmasq.c \ src/dns/nm-dns-dnsmasq.h \ src/dns/nm-dns-systemd-resolved.c \ src/dns/nm-dns-systemd-resolved.h \ src/dns/nm-dns-unbound.c \ src/dns/nm-dns-unbound.h \ - src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h \ - src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h \ \ src/dnsmasq/nm-dnsmasq-manager.c \ src/dnsmasq/nm-dnsmasq-manager.h \ @@ -1514,12 +1661,13 @@ src_libNetworkManager_la_SOURCES = \ src/nm-active-connection.h \ src/nm-audit-manager.c \ src/nm-audit-manager.h \ - src/nm-bus-manager.c \ - src/nm-bus-manager.h \ + src/nm-dbus-manager.c \ + src/nm-dbus-manager.h \ src/nm-config.c \ src/nm-config.h \ src/nm-config-data.c \ src/nm-config-data.h \ + src/nm-connectivity.c \ src/nm-connectivity.h \ src/nm-dcb.c \ src/nm-dcb.h \ @@ -1557,17 +1705,12 @@ src_libNetworkManager_la_SOURCES = \ \ $(NULL) -if WITH_CONCHECK -src_libNetworkManager_la_SOURCES += \ - src/nm-connectivity.c -endif - src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ + shared/libnacd.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) \ @@ -1583,7 +1726,9 @@ $(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) check_ltlibraries += src/libNetworkManagerTest.la src_tests_cppflags = \ - $(src_cppflags) + $(src_cppflags) \ + $(SANITIZER_EXEC_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION_TEST if REQUIRE_ROOT_TESTS src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1 @@ -1606,8 +1751,7 @@ src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) + $(LIBUDEV_LIBS) $(src_libNetworkManagerTest_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1631,7 +1775,8 @@ src_NetworkManager_LDADD = \ src_NetworkManager_LDFLAGS = \ -rdynamic \ - -Wl,--version-script="src/NetworkManager.ver" + -Wl,--version-script="src/NetworkManager.ver" \ + $(SANITIZER_EXEC_LDFLAGS) $(src_NetworkManager_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1647,12 +1792,12 @@ src_nm_iface_helper_LDADD = \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) src_nm_iface_helper_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ + $(SANITIZER_EXEC_LDFLAGS) $(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -1660,7 +1805,8 @@ $(src_nm_iface_helper_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/org.freedesktop.NetworkManager.conf \ - src/nm-test-utils-core.h + src/nm-test-utils-core.h \ + src/meson.build ############################################################################### # src/dhcp @@ -1672,9 +1818,8 @@ src_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ -DNMRUNDIR=\"$(nmrundir)\" src_dhcp_nm_dhcp_helper_SOURCES = \ @@ -1687,13 +1832,17 @@ src_dhcp_nm_dhcp_helper_LDFLAGS = \ src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS) +EXTRA_DIST += \ + src/dhcp/meson.build + ############################################################################### # src/dhcp/tests ############################################################################### src_dhcp_tests_cppflags = \ $(src_tests_cppflags) \ - -DTESTDIR="\"$(abs_srcdir)/src/dhcp/tests\"" + $(nm_build_cflags) \ + $(NULL) src_dhcp_tests_ldadd = \ src/libNetworkManagerTest.la @@ -1708,16 +1857,16 @@ src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) +src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags) +src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) + $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_dhcp_tests_test_dhcp_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/dhcp/tests/test-dhclient-duid.leases \ src/dhcp/tests/test-dhclient-commented-duid.leases \ - src/dhcp/tests/leases/basic.leases \ - src/dhcp/tests/leases/malformed1.leases \ - src/dhcp/tests/leases/malformed2.leases \ - src/dhcp/tests/leases/malformed3.leases + src/dhcp/tests/meson.build ############################################################################### # src/ppp @@ -1733,10 +1882,8 @@ src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ - -I$(srcdir)/src \ - -I$(builddir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ $(GLIB_CFLAGS) src_ppp_nm_pppd_plugin_la_SOURCES = \ @@ -1771,8 +1918,7 @@ src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ @@ -1780,13 +1926,15 @@ src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" src_ppp_libnm_ppp_plugin_la_LIBADD = \ - introspection/libnmdbus.la \ $(GLIB_LIBS) $(src_ppp_libnm_ppp_plugin_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif +EXTRA_DIST += \ + src/ppp/meson.build + ############################################################################### # src/settings/plugins/keyfile/tests ############################################################################### @@ -1795,12 +1943,13 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\" + $(nm_build_cflags) \ + $(NULL) src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ src/libNetworkManagerTest.la @@ -1845,7 +1994,9 @@ EXTRA_DIST += \ src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \ \ src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ - src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem + src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ + \ + src/settings/plugins/keyfile/tests/meson.build ############################################################################### # src/settings/plugins/ibft @@ -1863,9 +2014,8 @@ src_settings_plugins_ibft_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" @@ -1904,14 +2054,15 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\" + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + $(NULL) src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_settings_plugins_ibft_tests_test_ibft_LDADD = \ src/settings/plugins/ibft/libnms-ibft-core.la \ @@ -1937,6 +2088,10 @@ check_local += check-local-symbols-settings-ibft endif +EXTRA_DIST += \ + src/settings/plugins/ibft/meson.build \ + src/settings/plugins/ibft/tests/meson.build + ############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### @@ -1956,10 +2111,10 @@ src_settings_plugins_ifcfg_rh_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ $(NSS_CFLAGS) \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ + $(SANITIZER_EXEC_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DSBINDIR=\"$(sbindir)\" @@ -2015,11 +2170,11 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ -module -avoid-version \ - -Wl,--version-script="$(srcdir)/linker-script-settings.ver" + -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ + $(SANITIZER_EXEC_LDFLAGS) src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ - src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ - src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la + src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -2040,12 +2195,13 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\" + $(nm_build_cflags) \ + $(NULL) src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ @@ -2053,6 +2209,15 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +dist_libexec_SCRIPTS += \ + src/settings/plugins/ifcfg-rh/nm-ifup \ + src/settings/plugins/ifcfg-rh/nm-ifdown + +install-data-hook-ifcfg-rh: + $(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts + +install_data_hook += install-data-hook-ifcfg-rh + endif EXTRA_DIST += \ @@ -2118,6 +2283,8 @@ EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ @@ -2275,7 +2442,9 @@ endif EXTRA_DIST += \ src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ - src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml + src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ + src/settings/plugins/ifcfg-rh/meson.build \ + src/settings/plugins/ifcfg-rh/tests/meson.build ############################################################################### # src/settings/plugins/ifupdown @@ -2293,8 +2462,7 @@ src_settings_plugins_ifupdown_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) \ -DSYSCONFDIR=\"$(sysconfdir)\" @@ -2344,14 +2512,16 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ $(GLIB_CFLAGS) \ - -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ + $(nm_build_cflags) \ + $(NULL) src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ $(GLIB_LDFLAGS) \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @@ -2384,97 +2554,16 @@ EXTRA_DIST += \ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth0 \ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ - src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d + src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \ + src/settings/plugins/ifupdown/meson.build \ + src/settings/plugins/ifupdown/tests/meson.build ############################################################################### -# src/settings/plugins/ifnet -############################################################################### - -if CONFIG_PLUGIN_IFNET - -core_plugins += src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la - -noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la - -src_settings_plugins_ifnet_cppflags = \ - -I$(srcdir)/src \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ - -DSBINDIR=\"$(sbindir)\" - -src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ - src/settings/plugins/ifnet/nms-ifnet-net-parser.c\ - src/settings/plugins/ifnet/nms-ifnet-net-parser.h\ - src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ - src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ - src/settings/plugins/ifnet/nms-ifnet-net-utils.h\ - src/settings/plugins/ifnet/nms-ifnet-net-utils.c\ - src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\ - src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c - -src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) - -src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \ - src/settings/plugins/ifnet/nms-ifnet-connection.c \ - src/settings/plugins/ifnet/nms-ifnet-connection.h \ - src/settings/plugins/ifnet/nms-ifnet-plugin.c \ - src/settings/plugins/ifnet/nms-ifnet-plugin.h - -src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) - -src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \ - -module -avoid-version \ - -Wl,--version-script="$(srcdir)/linker-script-settings.ver" - -src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \ - src/settings/plugins/ifnet/libnms-ifnet-core.la - -check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la - $(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so) - -check_local += check-local-symbols-settings-ifnet - +# src/devices ############################################################################### -check_programs += src/settings/plugins/ifnet/tests/test-ifnet - -src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \ - -I$(srcdir)/shared \ - -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ - -I$(srcdir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - $(GLIB_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) \ - -DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \ - -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \ - -DSYSCONFDIR=\"nonexistent\" - -src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \ - $(GLIB_LDFLAGS) - $(CODE_COVERAGE_LDFLAGS) - -src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \ - src/settings/plugins/ifnet/libnms-ifnet-core.la \ - src/libNetworkManagerTest.la - -endif - EXTRA_DIST += \ - src/settings/plugins/ifnet/tests/net \ - src/settings/plugins/ifnet/tests/net.all \ - src/settings/plugins/ifnet/tests/nm-system-settings.conf \ - src/settings/plugins/ifnet/tests/wpa_supplicant.conf \ - src/settings/plugins/ifnet/tests/test_ca_cert.pem + src/devices/meson.build ############################################################################### # src/devices/adsl @@ -2494,8 +2583,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) @@ -2504,7 +2592,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ - introspection/libnmdbus.la \ $(LIBUDEV_LIBS) check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la @@ -2513,6 +2600,9 @@ check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la check_local += check-local-devices-adsl +EXTRA_DIST += \ + src/devices/adsl/meson.build + ############################################################################### # src/devices/wwan ############################################################################### @@ -2526,8 +2616,7 @@ src_devices_wwan_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) \ $(LIBSYSTEMD_CFLAGS) \ $(MM_GLIB_CFLAGS) @@ -2578,7 +2667,6 @@ src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ - introspection/libnmdbus.la \ src/devices/wwan/libnm-wwan.la \ $(GLIB_LIBS) @@ -2593,7 +2681,8 @@ check_local += check-local-devices-wwan endif EXTRA_DIST += \ - src/devices/wwan/libnm-wwan.ver + src/devices/wwan/libnm-wwan.ver \ + src/devices/wwan/meson.build ############################################################################### # src/devices/bluetooth @@ -2627,8 +2716,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ @@ -2636,7 +2724,6 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ - introspection/libnmdbus.la \ src/devices/wwan/libnm-wwan.la \ $(GLIB_LIBS) @@ -2658,6 +2745,9 @@ check_local += check-local-devices-bluetooth endif +EXTRA_DIST += \ + src/devices/bluetooth/meson.build + ############################################################################### # src/devices/wifi ############################################################################### @@ -2674,9 +2764,19 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ src/devices/wifi/nm-wifi-ap.h \ src/devices/wifi/nm-wifi-utils.c \ src/devices/wifi/nm-wifi-utils.h \ + src/devices/wifi/nm-wifi-common.c \ + src/devices/wifi/nm-wifi-common.h \ src/devices/wifi/nm-device-olpc-mesh.c \ src/devices/wifi/nm-device-olpc-mesh.h +if WITH_IWD +src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \ + src/devices/wifi/nm-device-iwd.c \ + src/devices/wifi/nm-device-iwd.h \ + src/devices/wifi/nm-iwd-manager.c \ + src/devices/wifi/nm-iwd-manager.h +endif + src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ -I$(srcdir)/src \ -I$(builddir)/src \ @@ -2684,8 +2784,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ @@ -2693,7 +2792,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ - introspection/libnmdbus.la \ $(GLIB_LIBS) check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la @@ -2718,16 +2816,21 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ -I$(builddir)/src \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la +src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) $(src_devices_wifi_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) endif +EXTRA_DIST += \ + src/devices/wifi/meson.build \ + src/devices/wifi/tests/meson.build + ############################################################################### # src/devices/team ############################################################################### @@ -2748,8 +2851,7 @@ src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(LIBTEAMDCTL_CFLAGS) \ $(JANSSON_CFLAGS) \ $(GLIB_CFLAGS) @@ -2759,7 +2861,6 @@ src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_team_libnm_device_plugin_team_la_LIBADD = \ - introspection/libnmdbus.la \ $(LIBTEAMDCTL_LIBS) \ $(JANSSON_LIBS) \ $(GLIB_LIBS) @@ -2772,6 +2873,9 @@ check_local += check-local-devices-team endif +EXTRA_DIST += \ + src/devices/team/meson.build + ############################################################################### # src/devices/ovs ############################################################################### @@ -2807,8 +2911,7 @@ src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ -DRUNSTATEDIR=\"$(runstatedir)\" \ \ $(JANSSON_CFLAGS) \ @@ -2819,7 +2922,6 @@ src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ - introspection/libnmdbus.la \ $(JANSSON_LIBS) \ $(GLIB_LIBS) @@ -2830,7 +2932,8 @@ check-local-devices-ovs: src/devices/ovs/libnm-device-plugin-ovs.la endif EXTRA_DIST += \ - data/NetworkManager-ovs.conf + data/NetworkManager-ovs.conf \ + src/devices/ovs/meson.build ############################################################################### # src/dnsmasq/tests @@ -2840,25 +2943,31 @@ check_programs += src/dnsmasq/tests/test-dnsmasq-utils src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTESTDIR="\"$(abs_srcdir)\"" + $(NULL) src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src/libNetworkManagerTest.la +src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + src/dnsmasq/tests/meson.build + ############################################################################### # src/platform/tests ############################################################################### src_platform_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_platform_tests_libadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) + $(LIBUDEV_LIBS) check_programs_norun += \ src/platform/tests/monitor @@ -2939,36 +3048,44 @@ $(src_platform_tests_test_cleanup_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums $(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + src/platform/tests/meson.build + ############################################################################### # src/devices/tests ############################################################################### src_devices_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) check_programs += \ src/devices/tests/test-lldp \ - src/devices/tests/test-arping + src/devices/tests/test-acd src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags) src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_lldp_LDADD = \ src/libNetworkManagerTest.la -src_devices_tests_test_arping_CPPFLAGS = $(src_tests_cppflags) -src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) -src_devices_tests_test_arping_LDADD = \ +src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags) +src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_acd_LDADD = \ src/libNetworkManagerTest.la $(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +EXTRA_DIST += \ + src/devices/tests/meson.build ############################################################################### # src/ndisc/tests ############################################################################### src_ndisc_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_ndisc_tests_ldadd = \ src/libNetworkManagerTest.la \ @@ -2978,16 +3095,19 @@ check_programs += src/ndisc/tests/test-ndisc-fake check_programs_norun += src/ndisc/tests/test-ndisc-linux src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_flags) +src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags) src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd) src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags) +src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) $(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + src/ndisc/tests/meson.build + ############################################################################### # src/supplicant/tests ############################################################################### @@ -2996,16 +3116,21 @@ check_programs += src/supplicant/tests/test-supplicant-config src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant/tests/certs\" + $(nm_build_cflags) \ + $(NULL) src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la +src_supplicant_tests_test_supplicant_config_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + $(src_supplicant_tests_test_supplicant_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ src/supplicant/tests/certs/test-ca-cert.pem \ - src/supplicant/tests/certs/test-cert.p12 + src/supplicant/tests/certs/test-cert.p12 \ + src/supplicant/tests/meson.build ############################################################################### # src/tests/config @@ -3020,12 +3145,15 @@ src_tests_config_test_config_SOURCES = \ src_tests_config_test_config_CPPFLAGS = \ $(src_tests_cppflags) \ - -DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \ - -DBUILDDIR=\""$(abs_builddir)/src/tests/config"\" + $(nm_build_cflags) \ + $(NULL) src_tests_config_test_config_LDADD = \ src/libNetworkManagerTest.la +src_tests_config_test_config_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ @@ -3036,14 +3164,16 @@ EXTRA_DIST += \ src/tests/config/conf.d/00-overrides.conf \ src/tests/config/conf.d/10-more.conf \ src/tests/config/conf.d/20-config-enable-1.conf \ - src/tests/config/conf.d/90-last.conf + src/tests/config/conf.d/90-last.conf \ + src/tests/config/meson.build ############################################################################### # src/tests ############################################################################### src_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_tests_ldadd = \ src/libNetworkManagerTest.la @@ -3055,7 +3185,6 @@ check_programs += \ src/tests/test-ip6-config \ src/tests/test-dcb \ src/tests/test-systemd \ - src/tests/test-resolvconf-capture \ src/tests/test-wired-defname \ src/tests/test-utils @@ -3071,10 +3200,6 @@ src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags) src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags) src_tests_test_dcb_LDADD = $(src_tests_ldadd) -src_tests_test_resolvconf_capture_CPPFLAGS = $(src_tests_cppflags) -src_tests_test_resolvconf_capture_LDFLAGS = $(src_tests_ldflags) -src_tests_test_resolvconf_capture_LDADD = $(src_tests_ldadd) - src_tests_test_general_CPPFLAGS = $(src_tests_cppflags) src_tests_test_general_LDFLAGS = $(src_tests_ldflags) src_tests_test_general_LDADD = $(src_tests_ldadd) @@ -3094,24 +3219,27 @@ src_tests_test_utils_LDADD = $(src_tests_ldadd) $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) +src_tests_test_systemd_CPPFLAGS = \ + $(src_libsystemd_nm_la_cppflags) \ + -DNETWORKMANAGER_COMPILATION_TEST src_tests_test_systemd_SOURCES = \ - shared/nm-utils/siphash24.c \ src/tests/test-systemd.c src_tests_test_systemd_LDADD = \ src/libsystemd-nm.la \ - $(src_libsystemd_nm_la_libadd) + shared/libcsiphash.la \ + $(src_libsystemd_nm_la_libadd) \ + $(NULL) $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) EXTRA_DIST += \ - src/tests/test-secret-agent.py + src/tests/test-secret-agent.py \ + src/tests/meson.build ############################################################################### # dispatcher @@ -3127,9 +3255,13 @@ dispatcher_cppflags = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""nm-dispatcher"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -3208,7 +3340,8 @@ dbusservice_DATA += dispatcher/nm-dispatcher.conf EXTRA_DIST += \ dispatcher/nm-dispatcher.conf \ dispatcher/org.freedesktop.nm_dispatcher.service.in \ - dispatcher/nm-dispatcher.xml + dispatcher/nm-dispatcher.xml \ + dispatcher/meson.build ############################################################################### # dispatcher/tests @@ -3221,10 +3354,19 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ - -DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \ - $(GLIB_CFLAGS) + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(GLIB_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ + $(NULL) + +dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) dispatcher_tests_test_dispatcher_envp_LDADD = \ libnm/libnm.la \ @@ -3240,7 +3382,8 @@ EXTRA_DIST += \ dispatcher/tests/dispatcher-external \ dispatcher/tests/dispatcher-up \ dispatcher/tests/dispatcher-vpn-down \ - dispatcher/tests/dispatcher-vpn-up + dispatcher/tests/dispatcher-vpn-up \ + dispatcher/tests/meson.build ############################################################################### # clients @@ -3257,7 +3400,8 @@ clients_nm_online_CPPFLAGS = \ -I$(builddir)/libnm \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-online"\" \ - -DNMLOCALEDIR=\"$(datadir)/locale\" + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" clients_nm_online_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @@ -3268,6 +3412,9 @@ clients_nm_online_LDADD = \ $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + clients/meson.build + ############################################################################### # clients/common ############################################################################### @@ -3282,7 +3429,8 @@ clients_cppflags = \ -I$(srcdir)/clients/common \ -I$(builddir)/clients/common \ $(GLIB_CFLAGS) \ - -DNMLOCALEDIR=\"$(datadir)/locale\" + -DNMLOCALEDIR=\"$(nmlocaledir)\" \ + $(NULL) check_ltlibraries += clients/common/libnmc-base.la @@ -3295,8 +3443,6 @@ clients_common_libnmc_base_la_SOURCES = \ shared/nm-utils/nm-random-utils.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ - shared/nm-utils/siphash24.c \ - shared/nm-utils/siphash24.h \ \ clients/common/nm-secret-agent-simple.c \ clients/common/nm-secret-agent-simple.h \ @@ -3307,37 +3453,44 @@ clients_common_libnmc_base_la_SOURCES = \ clients_common_libnmc_base_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" + -DG_LOG_DOMAIN=\""libnmc"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ - $(GLIB_LIBS) + shared/libcsiphash.la \ + $(GLIB_LIBS) \ + $(NULL) $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp -clients_common_settings_doc_c = clients/common/settings-docs.c +clients_common_settings_doc_h = clients/common/settings-docs.h if HAVE_INTROSPECTION -$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) -DISTCLEANFILES += $(clients_common_settings_doc_c) -check-local-settings-docs: $(clients_common_settings_doc_c) - @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ - if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ - echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ - false; \ +DISTCLEANFILES += $(clients_common_settings_doc_h) +check-local-settings-docs: $(clients_common_settings_doc_h) + @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ + if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ + if test "$$NM_TEST_REGENERATE" == 1 ; then \ + cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \ + else \ + echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \ + false; \ + fi; \ fi;\ fi check_local += check-local-settings-docs else -$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp - $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" +$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp + $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" check-local-settings-docs: endif EXTRA_DIST += \ - $(clients_common_settings_doc_c) \ - $(clients_common_settings_doc_c).in - + $(clients_common_settings_doc_h) \ + $(clients_common_settings_doc_h).in if HAVE_INTROSPECTION check_ltlibraries += clients/common/libnmc.la @@ -3357,7 +3510,8 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" + -DG_LOG_DOMAIN=\""libnmc"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT clients_common_libnmc_la_LIBADD = \ libnm/libnm.la \ @@ -3365,7 +3519,7 @@ clients_common_libnmc_la_LIBADD = \ $(GLIB_LIBS) $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c) +$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp if HAVE_INTROSPECTION @@ -3379,7 +3533,12 @@ endif clients_common_tests_test_general_CPPFLAGS = \ -I$(srcdir)/clients/common/tests \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(SANITIZER_EXEC_CFLAGS) + +clients_common_tests_test_general_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) clients_common_tests_test_general_LDADD = \ libnm/libnm.la \ @@ -3421,8 +3580,11 @@ clients_cli_nmcli_SOURCES = \ clients_cli_nmcli_CPPFLAGS = \ -I$(srcdir)/clients/cli \ $(clients_cppflags) \ + $(SANITIZER_EXEC_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ -DG_LOG_DOMAIN=\""nmcli"\" \ - -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" clients_cli_nmcli_LDADD = \ libnm/libnm.la \ @@ -3440,9 +3602,11 @@ clients_cli_nmcli_LDADD += $(POLKIT_LIBS) endif clients_cli_nmcli_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ + $(SANITIZER_EXEC_LDFLAGS) $(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) install-data-hook-nmcli: $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -3459,7 +3623,10 @@ endif EXTRA_DIST += \ clients/cli/nmcli-completion \ - clients/common/settings-docs.xsl + clients/cli/meson.build \ + clients/common/settings-docs.xsl \ + clients/common/meson.build \ + clients/common/tests/meson.build ############################################################################### # clients/tui @@ -3519,11 +3686,17 @@ clients_tui_newt_libnmt_newt_a_CPPFLAGS = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ -DG_LOG_DOMAIN=\""nmtui"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ $(GLIB_CFLAGS) \ $(NEWT_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ $(NULL) +$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + bin_PROGRAMS += clients/tui/nmtui clients_tui_nmtui_SOURCES = \ @@ -3616,10 +3789,12 @@ clients_tui_nmtui_CPPFLAGS = \ $(clients_cppflags) \ $(NEWT_CFLAGS) \ -DG_LOG_DOMAIN=\""nmtui"\" \ - -DLOCALEDIR=\""$(localedir)"\" + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + -DNMLOCALEDIR=\""$(nmlocaledir)"\" clients_tui_nmtui_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ + $(SANITIZER_EXEC_LDFLAGS) clients_tui_nmtui_LDADD = \ libnm/libnm.la \ @@ -3649,6 +3824,36 @@ uninstall_hook += uninstall-hook-nmtui endif +EXTRA_DIST += \ + clients/tui/meson.build \ + clients/tui/newt/meson.build + +############################################################################### +# clients/tests +############################################################################### + +check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py + mkdir -p "$(builddir)/clients/tests/" + GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ + LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ + NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \ + NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \ + "$(PYTHON)" \ + $(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \ + cat "$(builddir)/clients/tests/test-client.log"; \ + test "$$r" == ok + +check_local += check-local-clients-tests-test-client + +CLEANFILES += clients/tests/test-client.log + +include clients/tests/test-client.check-on-disk/Makefile.am + +EXTRA_DIST += \ + clients/tests/test-client.py \ + clients/tests/test-client.check-on-disk/Makefile.am \ + $(clients_tests_expected_files) + ############################################################################### # data ############################################################################### @@ -3702,7 +3907,8 @@ if WITH_UDEV_DIR udevrulesdir = $(UDEV_DIR)/rules.d udevrules_DATA = \ data/84-nm-drivers.rules \ - data/85-nm-unmanaged.rules + data/85-nm-unmanaged.rules \ + data/90-nm-thunderbolt.rules endif data/server.conf: $(srcdir)/data/server.conf.in @@ -3717,7 +3923,9 @@ EXTRA_DIST += \ data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules \ data/85-nm-unmanaged.rules \ - data/server.conf.in + data/90-nm-thunderbolt.rules \ + data/server.conf.in \ + data/meson.build CLEANFILES += \ data/NetworkManager.service \ @@ -3742,8 +3950,8 @@ libnm_util_cppflags = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -DG_LOG_DOMAIN=\""libnm-util"\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ $(UUID_CFLAGS) @@ -3907,7 +4115,10 @@ DISTCLEANFILES += libnm-util/libnm-util.pc EXTRA_DIST += \ libnm-util/COPYING \ libnm-util/libnm-util.pc.in \ - libnm-util/libnm-util.ver + libnm-util/libnm-util.ver \ + libnm-util/nm-utils-enum-types.c.template \ + libnm-util/nm-utils-enum-types.h.template \ + libnm-util/meson.build if HAVE_INTROSPECTION libnm-util/NetworkManager-1.0.gir: libnm-util/libnm-util.la @@ -3952,14 +4163,20 @@ libnm_util_tests_cppflags = \ -I$(builddir)/libnm-util \ $(GLIB_CFLAGS) \ $(DBUS_CFLAGS) \ - -DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ + $(SANITIZER_EXEC_CFLAGS) \ + $(NULL) libnm_util_tests_ldadd = \ libnm-util/libnm-util.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) +libnm_util_tests_ldflags = \ + $(SANITIZER_EXEC_LDFLAGS) + check_programs += \ libnm-util/tests/test-settings-defaults \ libnm-util/tests/test-crypto \ @@ -3973,29 +4190,36 @@ check_programs_norun += \ libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd) +libnm_util_tests_test_settings_defaults_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_crypto_LDADD = \ libnm-util/libtest-crypto.la \ $(libnm_util_tests_ldadd) +libnm_util_tests_test_crypto_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd) +libnm_util_tests_test_secrets_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd) +libnm_util_tests_test_general_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd) +libnm_util_tests_test_setting_8021x_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd) +libnm_util_tests_test_setting_dcb_LDFLAGS = $(libnm_util_tests_ldflags) libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags) libnm_util_tests_test_libnm_linking_LDADD = \ libnm/libnm.la \ $(libnm_util_tests_ldadd) +libnm_util_tests_test_libnm_linking_LDFLAGS = $(libnm_util_tests_ldflags) $(libnm_util_tests_test_settings_defaults_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_util_tests_test_crypto_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -4005,6 +4229,9 @@ $(libnm_util_tests_test_setting_8021x_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_util_tests_test_setting_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_util_tests_test_libnm_linking_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +EXTRA_DIST += \ + libnm-util/tests/meson.build + ############################################################################### # libnm-glib ############################################################################### @@ -4017,7 +4244,7 @@ libnm_glib_cppflags = \ -I$(srcdir)/libnm-glib \ -I$(builddir)/libnm-glib \ -DG_LOG_DOMAIN=\""libnm-glib"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) @@ -4152,7 +4379,7 @@ nodist_libnm_glib_libnm_glib_la_SOURCES = \ libnm_glib_libnm_glib_la_CPPFLAGS = \ $(libnm_glib_cppflags) \ $(LIBUDEV_CFLAGS) \ - -DNMRUNDIR=\"$(nmrundir)\" + $(NULL) libnm_glib_libnm_glib_la_LDFLAGS = \ -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \ @@ -4239,7 +4466,12 @@ EXTRA_DIST += \ libnm-glib/libnm-glib.pc.in \ libnm-glib/libnm-glib-vpn.pc.in \ libnm-glib/libnm-glib.ver \ - libnm-glib/libnm-glib-vpn.ver + libnm-glib/libnm-glib-vpn.ver \ + libnm-glib/nm-vpn-enum-types.c.template \ + libnm-glib/nm-vpn-enum-types.h.template \ + libnm-glib/nm-glib-enum-types.c.template \ + libnm-glib/nm-glib-enum-types.h.template \ + libnm-glib/meson.build if HAVE_INTROSPECTION libnm-glib/NMClient-1.0.gir: libnm-glib/libnm-glib.la $(builddir)/libnm-util/NetworkManager-1.0.gir @@ -4288,14 +4520,31 @@ libnm_glib_tests_cppflags = \ -I$(srcdir)/libnm-util \ -I$(builddir)/libnm-util \ -I$(srcdir)/libnm-glib \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ - -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \ + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) + $(DBUS_CFLAGS) \ + $(NULL) -check_programs += \ - libnm-glib/tests/test-nm-client \ - libnm-glib/tests/test-remote-settings-client +if HAVE_INTROSPECTION +check-local-libnm-glib-nm-client: libnm-glib/tests/test-nm-client + ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ + ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ + ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ + ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ + ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ + false + +check_local += check-local-libnm-glib-nm-client +endif +check_programs_norun += libnm-glib/tests/test-nm-client + +if HAVE_INTROSPECTION +check_programs += libnm-glib/tests/test-remote-settings-client +else +check_programs_norun += libnm-glib/tests/test-remote-settings-client +endif libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags) @@ -4328,8 +4577,16 @@ libnm_glib_tests_test_remote_settings_client_LDADD = \ $(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it +# is built first. +$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) +$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) + endif +EXTRA_DIST += \ + libnm-glib/tests/meson.build + ############################################################################### # man ############################################################################### @@ -4363,6 +4620,8 @@ man_nm_settings_xml = \ if HAVE_INTROSPECTION +man/nm-setting%.xml: man/common.ent + man/nm-setting%.xml: man/nm-setting%.xsl libnm/nm-setting%-docs.xml $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $^ @@ -4439,6 +4698,9 @@ endif dist_dependencies += $(man_pages) dist_dependencies += $(man_pages_autogen) +EXTRA_DIST += \ + man/meson.build + ############################################################################### # vapi ############################################################################### @@ -4485,7 +4747,8 @@ EXTRA_DIST += \ vapi/NMClient-1.0.metadata \ vapi/libnm.deps \ vapi/libnm-util.deps \ - vapi/libnm-glib.deps + vapi/libnm-glib.deps \ + vapi/meson.build ############################################################################### @@ -4510,7 +4773,7 @@ check_PROGRAMS += $(check_programs) $(check_programs_norun) check_LTLIBRARIES += $(check_ltlibraries) endif -pkglib_LTLIBRARIES += $(core_plugins) +plugin_LTLIBRARIES += $(core_plugins) TESTS += $(check_programs) @@ -4527,6 +4790,13 @@ EXTRA_DIST += \ Makefile.glib \ autogen.sh \ valgrind.suppressions \ + meson.build \ + meson_options.txt \ + meson_post_install.py \ + config.h.meson \ + docs/meson.build \ + \ + po/meson.build \ \ shared/nm-common-macros.h \ shared/nm-dbus-compat.h \ @@ -4534,11 +4804,14 @@ EXTRA_DIST += \ shared/nm-dispatcher-api.h \ shared/nm-test-libnm-utils.h \ shared/nm-test-utils-impl.c \ - shared/nm-utils/c-list.h \ shared/nm-utils/c-list-util.c \ shared/nm-utils/c-list-util.h \ shared/nm-utils/gsystem-local-alloc.h \ + shared/nm-utils/nm-c-list.h \ + shared/nm-utils/nm-compat.c \ + shared/nm-utils/nm-compat.h \ shared/nm-utils/nm-glib.h \ + shared/nm-utils/nm-jansson.h \ shared/nm-utils/nm-obj.h \ shared/nm-utils/nm-macros-internal.h \ shared/nm-utils/nm-shared-utils.c \ @@ -4550,7 +4823,9 @@ EXTRA_DIST += \ shared/nm-utils/nm-vpn-plugin-utils.h \ shared/nm-utils/unaligned.h \ shared/nm-version-macros.h.in \ + shared/meson.build \ \ + tools/check-docs.sh \ tools/check-exports.sh \ tools/create-exports-NetworkManager.sh \ tools/debug-helper.py \ @@ -4560,6 +4835,7 @@ EXTRA_DIST += \ tools/enums-to-docbook.pl \ \ src/settings/plugins/README \ + src/settings/plugins/meson.build \ \ $(NULL) @@ -4596,7 +4872,7 @@ install-data-hook: $(install_data_hook) $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN $(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir) - $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir) uninstall-hook: $(uninstall_hook) diff --git a/Makefile.examples b/Makefile.examples index 0326f7a2..d5433395 100644 --- a/Makefile.examples +++ b/Makefile.examples @@ -9,8 +9,7 @@ examples_C_glib_cppflags = \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ - $(GLIB_CFLAGS) \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE + $(GLIB_CFLAGS) examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags) @@ -66,6 +65,9 @@ examples_C_glib_monitor_nm_state_gdbus_CPPFLAGS = $(examples_C_glib_cppflags_gdb examples_C_glib_monitor_nm_state_gdbus_LDADD = \ $(GLIB_LIBS) +EXTRA_DIST += \ + examples/C/glib/meson.build + ############################################################################### # examples/C/qt ############################################################################### @@ -123,7 +125,8 @@ EXTRA_DIST += \ examples/C/qt/add-connection-wired.cpp \ examples/C/qt/list-connections.cpp \ examples/C/qt/change-ipv4-addresses.cpp \ - examples/C/qt/monitor-nm-running.cpp + examples/C/qt/monitor-nm-running.cpp \ + examples/C/qt/meson.build ############################################################################### # examples @@ -133,6 +136,8 @@ EXTRA_DIST += \ examples/dispatcher/10-ifcfg-rh-routes.sh \ examples/dispatcher/70-wifi-wired-exclusive.sh \ \ + examples/js/get_ips.js \ + \ examples/lua/lgi/add-connection.lua \ examples/lua/lgi/list-connections.lua \ examples/lua/lgi/list-devices.lua \ @@ -145,6 +150,8 @@ EXTRA_DIST += \ examples/nm-conf.d/30-anon.conf \ examples/nm-conf.d/31-mac-addr-change.conf \ \ + examples/python/nmex.py \ + \ examples/python/dbus/nm-state.py \ examples/python/dbus/add-connection.py \ examples/python/dbus/add-connection-compat.py \ diff --git a/Makefile.in b/Makefile.in index 45c5b28d..0eac6450 100644 --- a/Makefile.in +++ b/Makefile.in @@ -52,6 +52,9 @@ # # The files which should be used to generate the VAPI. +# generated with `NM_TEST_REGENERATE=1 make check` +# See howto in "clients/tests/test-client.py" + ############################################################################### # examples/C/glib ############################################################################### @@ -60,6 +63,7 @@ + VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -134,15 +138,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -noinst_PROGRAMS = $(am__EXEEXT_17) -check_PROGRAMS = $(am__EXEEXT_16) +noinst_PROGRAMS = $(am__EXEEXT_21) +check_PROGRAMS = $(am__EXEEXT_20) sbin_PROGRAMS = src/NetworkManager$(EXEEXT) bin_PROGRAMS = clients/nm-online$(EXEEXT) $(am__EXEEXT_1) \ $(am__EXEEXT_2) libexec_PROGRAMS = src/nm-iface-helper$(EXEEXT) \ src/dhcp/nm-dhcp-helper$(EXEEXT) \ dispatcher/nm-dispatcher$(EXEEXT) -TESTS = $(am__EXEEXT_12) +TESTS = $(am__EXEEXT_14) @HAVE_DOCS_TRUE@am__append_1 = \ @HAVE_DOCS_TRUE@ docs/libnm \ @HAVE_DOCS_TRUE@ docs/api @@ -156,44 +160,49 @@ TESTS = $(am__EXEEXT_12) ############################################################################### @WITH_LEGACY_LIBRARIES_TRUE@am__append_5 = NetworkManager.pc -@WITH_JANSSON_TRUE@am__append_6 = \ -@WITH_JANSSON_TRUE@ libnm-core/nm-json.h +@WITH_JSON_VALIDATION_TRUE@am__append_6 = \ +@WITH_JSON_VALIDATION_TRUE@ libnm-core/nm-json.h -@WITH_JANSSON_TRUE@am__append_7 = \ -@WITH_JANSSON_TRUE@ libnm-core/nm-json.c +@WITH_JSON_VALIDATION_TRUE@am__append_7 = \ +@WITH_JSON_VALIDATION_TRUE@ libnm-core/nm-json.c -@WITH_JANSSON_TRUE@am__append_8 = $(JANSSON_CFLAGS) -@WITH_GNUTLS_TRUE@am__append_9 = $(GNUTLS_CFLAGS) -@WITH_NSS_TRUE@am__append_10 = $(NSS_CFLAGS) +@WITH_GNUTLS_TRUE@am__append_8 = $(GNUTLS_CFLAGS) +@WITH_NSS_TRUE@am__append_9 = $(NSS_CFLAGS) +@WITH_JSON_VALIDATION_TRUE@am__append_10 = $(JANSSON_CFLAGS) @WITH_GNUTLS_TRUE@am__append_11 = libnm-core/crypto_gnutls.c @WITH_GNUTLS_TRUE@am__append_12 = $(GNUTLS_LIBS) @WITH_NSS_TRUE@am__append_13 = libnm-core/crypto_nss.c @WITH_NSS_TRUE@am__append_14 = $(NSS_LIBS) -@HAVE_INTROSPECTION_TRUE@am__append_15 = libnm/NM-1.0.gir -@HAVE_INTROSPECTION_TRUE@am__append_16 = $(libnm_noinst_data) -@HAVE_INTROSPECTION_TRUE@am__append_17 = $(libnm_noinst_data) -@WITH_WEXT_TRUE@am__append_18 = \ +@HAVE_INTROSPECTION_TRUE@am__append_15 = libnm/NM-1.0.typelib +@HAVE_INTROSPECTION_TRUE@am__append_16 = libnm/NM-1.0.gir +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@am__append_17 = \ +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/typelibs.c \ +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/NMClient.typelib \ +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/NetworkManager.typelib + +@HAVE_INTROSPECTION_TRUE@am__append_18 = $(libnm_noinst_data) +@HAVE_INTROSPECTION_TRUE@am__append_19 = $(libnm_noinst_data) +@HAVE_INTROSPECTION_TRUE@am__append_20 = $(libnm_tests_programs_req_introspection) +@HAVE_INTROSPECTION_FALSE@am__append_21 = $(libnm_tests_programs_req_introspection) +@WITH_WEXT_TRUE@am__append_22 = \ @WITH_WEXT_TRUE@ src/platform/wifi/wifi-utils-wext.c \ @WITH_WEXT_TRUE@ src/platform/wifi/wifi-utils-wext.h -@WITH_CONCHECK_TRUE@am__append_19 = \ -@WITH_CONCHECK_TRUE@ src/nm-connectivity.c - -@REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1 +@REQUIRE_ROOT_TESTS_TRUE@am__append_23 = -DREQUIRE_ROOT_TESTS=1 ############################################################################### # src/ppp ############################################################################### -@WITH_PPP_TRUE@am__append_21 = src/ppp/libnm-ppp-plugin.la -@WITH_PPP_TRUE@am__append_22 = src/ppp/nm-pppd-plugin.la +@WITH_PPP_TRUE@am__append_24 = src/ppp/libnm-ppp-plugin.la +@WITH_PPP_TRUE@am__append_25 = src/ppp/nm-pppd-plugin.la ############################################################################### # src/settings/plugins/ibft ############################################################################### -@CONFIG_PLUGIN_IBFT_TRUE@am__append_23 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la -@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = src/settings/plugins/ibft/libnms-ibft-core.la -@CONFIG_PLUGIN_IBFT_TRUE@am__append_25 = src/settings/plugins/ibft/tests/test-ibft -@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = \ +@CONFIG_PLUGIN_IBFT_TRUE@am__append_26 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la +@CONFIG_PLUGIN_IBFT_TRUE@am__append_27 = src/settings/plugins/ibft/libnms-ibft-core.la +@CONFIG_PLUGIN_IBFT_TRUE@am__append_28 = src/settings/plugins/ibft/tests/test-ibft +@CONFIG_PLUGIN_IBFT_TRUE@am__append_29 = \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-static \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \ @@ -204,212 +213,226 @@ TESTS = $(am__EXEEXT_12) @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/tests/iscsiadm-test-vlan -@CONFIG_PLUGIN_IBFT_TRUE@am__append_27 = check-local-symbols-settings-ibft +@CONFIG_PLUGIN_IBFT_TRUE@am__append_30 = check-local-symbols-settings-ibft ############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_28 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = check-local-symbols-settings-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_34 = check-local-symbols-settings-ifcfg-rh ############################################################################### # src/settings/plugins/ifcfg-rh/tests ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh - -############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_35 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_36 = \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nm-ifup \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/nm-ifdown -############################################################################### -# src/settings/plugins/ifupdown -############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_36 = check-local-symbols-settings-ifupdown +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_37 = install-data-hook-ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/tests/test-ifupdown +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_38 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf ############################################################################### -# src/settings/plugins/ifnet +# src/settings/plugins/ifupdown ############################################################################### -@CONFIG_PLUGIN_IFNET_TRUE@am__append_38 = src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la -@CONFIG_PLUGIN_IFNET_TRUE@am__append_39 = src/settings/plugins/ifnet/libnms-ifnet-core.la -@CONFIG_PLUGIN_IFNET_TRUE@am__append_40 = check-local-symbols-settings-ifnet +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_39 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_40 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_41 = check-local-symbols-settings-ifupdown ############################################################################### -@CONFIG_PLUGIN_IFNET_TRUE@am__append_41 = src/settings/plugins/ifnet/tests/test-ifnet +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_42 = src/settings/plugins/ifupdown/tests/test-ifupdown ############################################################################### # src/devices/bluetooth ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-device-plugin-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/libnm-device-plugin-bluetooth.la -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_43 = \ +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_44 = \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.c \ @WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@ src/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = check-local-devices-wwan \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = check-local-devices-wwan \ @WITH_MODEM_MANAGER_1_TRUE@ check-local-devices-bluetooth -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_45 = $(BLUEZ5_CFLAGS) -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_46 = \ +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_46 = $(BLUEZ5_CFLAGS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_47 = \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.c \ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bluez5-dun.h -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_47 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_48 = $(BLUEZ5_LIBS) ############################################################################### # src/devices/wifi ############################################################################### -@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/libnm-device-plugin-wifi.la -@WITH_WIFI_TRUE@am__append_49 = check-local-devices-wifi -@WITH_WIFI_TRUE@am__append_50 = src/devices/wifi/tests/test-general +@WITH_WIFI_TRUE@am__append_49 = src/devices/wifi/libnm-device-plugin-wifi.la +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__append_50 = \ +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-iwd.c \ +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-iwd.h \ +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-iwd-manager.c \ +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/nm-iwd-manager.h + +@WITH_WIFI_TRUE@am__append_51 = check-local-devices-wifi +@WITH_WIFI_TRUE@am__append_52 = src/devices/wifi/tests/test-general ############################################################################### # src/devices/team ############################################################################### -@WITH_TEAMDCTL_TRUE@am__append_51 = src/devices/team/libnm-device-plugin-team.la -@WITH_TEAMDCTL_TRUE@am__append_52 = check-local-devices-team -@WITH_OPENVSWITCH_TRUE@am__append_53 = src/devices/ovs/libnm-device-plugin-ovs.la -@HAVE_INTROSPECTION_TRUE@am__append_54 = $(clients_common_settings_doc_c) -@HAVE_INTROSPECTION_TRUE@am__append_55 = check-local-settings-docs -@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/libnmc.la -@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/libnmc.la -@HAVE_INTROSPECTION_TRUE@am__append_58 = clients/common/tests/test-general -@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_59 = clients/common/tests/test-general +@WITH_TEAMDCTL_TRUE@am__append_53 = src/devices/team/libnm-device-plugin-team.la +@WITH_TEAMDCTL_TRUE@am__append_54 = check-local-devices-team +@WITH_OPENVSWITCH_TRUE@am__append_55 = src/devices/ovs/libnm-device-plugin-ovs.la +@HAVE_INTROSPECTION_TRUE@am__append_56 = $(clients_common_settings_doc_h) +@HAVE_INTROSPECTION_TRUE@am__append_57 = check-local-settings-docs +@HAVE_INTROSPECTION_TRUE@am__append_58 = clients/common/libnmc.la +@HAVE_INTROSPECTION_FALSE@am__append_59 = clients/common/libnmc.la +@HAVE_INTROSPECTION_TRUE@am__append_60 = clients/common/tests/test-general +@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_61 = clients/common/tests/test-general ############################################################################### # clients/cli ############################################################################### -@BUILD_NMCLI_TRUE@am__append_60 = clients/cli/nmcli -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_61 = $(POLKIT_CFLAGS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_62 = \ +@BUILD_NMCLI_TRUE@am__append_62 = clients/cli/nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_63 = $(POLKIT_CFLAGS) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_64 = \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.c \ @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_63 = $(POLKIT_LIBS) -@BUILD_NMCLI_TRUE@am__append_64 = install-data-hook-nmcli -@BUILD_NMCLI_TRUE@am__append_65 = uninstall-hook-nmcli +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_65 = $(POLKIT_LIBS) +@BUILD_NMCLI_TRUE@am__append_66 = install-data-hook-nmcli +@BUILD_NMCLI_TRUE@am__append_67 = uninstall-hook-nmcli ############################################################################### # clients/tui ############################################################################### -@BUILD_NMTUI_TRUE@am__append_66 = clients/tui/newt/libnmt-newt.a -@BUILD_NMTUI_TRUE@am__append_67 = clients/tui/nmtui -@BUILD_NMTUI_TRUE@am__append_68 = install-exec-hook-nmtui -@BUILD_NMTUI_TRUE@am__append_69 = uninstall-hook-nmtui -@HAVE_SYSTEMD_TRUE@am__append_70 = data/org.freedesktop.NetworkManager.service +@BUILD_NMTUI_TRUE@am__append_68 = clients/tui/newt/libnmt-newt.a +@BUILD_NMTUI_TRUE@am__append_69 = clients/tui/nmtui +@BUILD_NMTUI_TRUE@am__append_70 = install-exec-hook-nmtui +@BUILD_NMTUI_TRUE@am__append_71 = uninstall-hook-nmtui +@HAVE_SYSTEMD_TRUE@am__append_72 = data/org.freedesktop.NetworkManager.service ############################################################################### # libnm-util ############################################################################### -@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_h_pub_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_lib_c_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_h_mkenums) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_vpn_c_mkenums) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_CFLAGS) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_74 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_CFLAGS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_77 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_78 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = \ +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_75 = $(GNUTLS_CFLAGS) +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_76 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_78 = $(NSS_CFLAGS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_79 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_80 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_gnutls.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_nss.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/COPYING \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.ver \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c.template \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.h.template \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/meson.build \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/meson.build \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc.in \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.ver \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.ver -@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = libnm-util/libtest-crypto.la -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_81 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_83 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_84 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_85 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.ver \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-enum-types.c.template \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-enum-types.h.template \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.c.template \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-glib-enum-types.h.template \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/meson.build +@WITH_LEGACY_LIBRARIES_TRUE@am__append_82 = libnm-util/libtest-crypto.la +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/crypto_gnutls.c +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = $(GNUTLS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_85 = libnm-util/crypto_nss.c +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_86 = $(NSS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc -@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = libnm-util/libnm-util.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.pc -@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/NetworkManager-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/NetworkManager-1.0.gir \ @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/NMClient-1.0.gir -@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-glib -@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib.la \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = libnm-util/tests/test-settings-defaults \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-settings-defaults \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-crypto \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-secrets \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-general \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-8021x \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-remote-settings-client -@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = libnm-util/tests/test-libnm-linking \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test -@WITH_LEGACY_LIBRARIES_TRUE@am__append_92 = libnm-glib/libdeprecated-nm-glib.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb + +@WITH_LEGACY_LIBRARIES_TRUE@am__append_93 = libnm-util/tests/test-libnm-linking \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client +@WITH_LEGACY_LIBRARIES_TRUE@am__append_94 = libnm-glib/libdeprecated-nm-glib.la +@WITH_LEGACY_LIBRARIES_TRUE@am__append_95 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-vpn-plugin-glue.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-secret-agent-glue.h -@HAVE_INTROSPECTION_TRUE@am__append_94 = $(man_nm_settings_xml) -@WITH_OPENVSWITCH_TRUE@am__append_95 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_96 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_97 = man/nm-openvswitch.7 -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_98 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_99 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_100 = man/nm-settings-ifcfg-rh.5 -@HAVE_DOCS_TRUE@am__append_101 = install-data-hook-man -@HAVE_DOCS_TRUE@am__append_102 = uninstall-hook-man -@HAVE_DOCS_TRUE@am__append_103 = $(man_pages) $(man_pages_autogen) -@BUILD_DOCS_TRUE@am__append_104 = $(man_pages) $(man_pages_autogen) +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_96 = check-local-libnm-glib-nm-client +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_97 = libnm-glib/tests/test-remote-settings-client +@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_98 = libnm-glib/tests/test-remote-settings-client +@HAVE_INTROSPECTION_TRUE@am__append_99 = $(man_nm_settings_xml) +@WITH_OPENVSWITCH_TRUE@am__append_100 = man/nm-openvswitch.7 +@WITH_OPENVSWITCH_FALSE@am__append_101 = man/nm-openvswitch.7 +@WITH_OPENVSWITCH_FALSE@am__append_102 = man/nm-openvswitch.7 +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_103 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_104 = man/nm-settings-ifcfg-rh.5 +@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_105 = man/nm-settings-ifcfg-rh.5 +@HAVE_DOCS_TRUE@am__append_106 = install-data-hook-man +@HAVE_DOCS_TRUE@am__append_107 = uninstall-hook-man +@HAVE_DOCS_TRUE@am__append_108 = $(man_pages) $(man_pages_autogen) +@BUILD_DOCS_TRUE@am__append_109 = $(man_pages) $(man_pages_autogen) ############################################################################### # vapi ############################################################################### -@ENABLE_VAPIGEN_TRUE@am__append_105 = \ +@ENABLE_VAPIGEN_TRUE@am__append_110 = \ @ENABLE_VAPIGEN_TRUE@ vapi/libnm.vapi -@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_106 = \ +@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_111 = \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-util.vapi \ @ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ vapi/libnm-glib.vapi -@ENABLE_VAPIGEN_TRUE@am__append_107 = \ +@ENABLE_VAPIGEN_TRUE@am__append_112 = \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS) \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS:.vapi=.deps) -@ENABLE_VAPIGEN_TRUE@am__append_108 = $(VAPIGEN_VAPIS) +@ENABLE_VAPIGEN_TRUE@am__append_113 = $(VAPIGEN_VAPIS) ############################################################################### -@ENABLE_TESTS_TRUE@am__append_109 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_TRUE@am__append_110 = $(check_ltlibraries) -@ENABLE_TESTS_FALSE@am__append_111 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_FALSE@am__append_112 = $(check_ltlibraries) -@WITH_QT_TRUE@am__append_113 = \ +@ENABLE_TESTS_TRUE@am__append_114 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_TRUE@am__append_115 = $(check_ltlibraries) +@ENABLE_TESTS_FALSE@am__append_116 = $(check_programs) $(check_programs_norun) +@ENABLE_TESTS_FALSE@am__append_117 = $(check_ltlibraries) +@WITH_QT_TRUE@am__append_118 = \ @WITH_QT_TRUE@ examples/C/qt/add-connection-wired \ @WITH_QT_TRUE@ examples/C/qt/list-connections \ @WITH_QT_TRUE@ examples/C/qt/change-ipv4-addresses \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running -@WITH_QT_TRUE@am__append_114 = \ +@WITH_QT_TRUE@am__append_119 = \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running.moc subdir = . @@ -431,7 +454,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(am__libdeprecated_HEADERS_DIST) \ + $(am__configure_deps) $(am__dist_libexec_SCRIPTS_DIST) \ + $(am__libdeprecated_HEADERS_DIST) \ $(am__libnm_glib_libnminclude_HEADERS_DIST) \ $(am__libnm_glib_libnmvpn_HEADERS_DIST) \ $(am__libnm_util_libnm_util_include_HEADERS_DIST) \ @@ -546,12 +570,12 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" \ +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \ "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" \ - "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" \ - "$(DESTDIR)$(dbusactivationdir)" \ + "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \ + "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusactivationdir)" \ "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" \ "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(girdir)" \ "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" \ @@ -568,15 +592,14 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" \ "$(DESTDIR)$(libnm_util_libnm_util_includedir)" \ "$(DESTDIR)$(libnmincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \ - $(pkglib_LTLIBRARIES) $(pppd_plugin_LTLIBRARIES) + $(plugin_LTLIBRARIES) $(pppd_plugin_LTLIBRARIES) am__DEPENDENCIES_1 = clients_common_libnmc_base_la_DEPENDENCIES = libnm/libnm.la \ - $(am__DEPENDENCIES_1) + shared/libcsiphash.la $(am__DEPENDENCIES_1) am_clients_common_libnmc_base_la_OBJECTS = shared/nm-utils/clients_common_libnmc_base_la-nm-enum-utils.lo \ shared/nm-utils/clients_common_libnmc_base_la-nm-hash-utils.lo \ shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo \ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo \ - shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo \ clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo \ clients/common/clients_common_libnmc_base_la-nm-vpn-helpers.lo \ clients/common/clients_common_libnmc_base_la-nm-client-utils.lo @@ -652,9 +675,10 @@ introspection_libnmdbus_la_OBJECTS = \ $(nodist_introspection_libnmdbus_la_OBJECTS) @WITH_GNUTLS_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) @WITH_NSS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) -libnm_core_libnm_core_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +libnm_core_libnm_core_la_DEPENDENCIES = shared/libcsiphash.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_3) am__libnm_core_libnm_core_la_SOURCES_DIST = \ shared/nm-version-macros.h libnm-core/nm-connection.h \ libnm-core/nm-core-types.h libnm-core/nm-dbus-interface.h \ @@ -695,26 +719,14 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ shared/nm-utils/nm-hash-utils.h \ shared/nm-utils/nm-shared-utils.h \ shared/nm-utils/nm-random-utils.h \ - shared/nm-utils/nm-udev-utils.h shared/nm-utils/siphash24.h \ - shared/nm-meta-setting.h libnm-core/crypto.h \ - libnm-core/nm-connection-private.h \ + shared/nm-utils/nm-udev-utils.h shared/nm-meta-setting.h \ + libnm-core/crypto.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 \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \ - libnm-core/nm-json.h shared/nm-utils/c-list-util.c \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \ - shared/nm-meta-setting.c libnm-core/crypto.c \ - libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ - libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \ - libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \ - libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \ + libnm-core/nm-json.h libnm-core/nm-setting-8021x.c \ libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \ libnm-core/nm-setting-bond.c \ libnm-core/nm-setting-bridge-port.c \ @@ -741,34 +753,24 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ + libnm-core/nm-setting-wireless.c shared/nm-utils/c-list-util.c \ + shared/nm-utils/nm-dedup-multi.c \ + shared/nm-utils/nm-enum-utils.c \ + shared/nm-utils/nm-hash-utils.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-random-utils.c \ + shared/nm-utils/nm-udev-utils.c shared/nm-meta-setting.c \ + libnm-core/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 \ libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c am__objects_2 = am__objects_3 = $(am__objects_2) -@WITH_JANSSON_TRUE@am__objects_4 = libnm-core/libnm_core_libnm_core_la-nm-json.lo -@WITH_GNUTLS_TRUE@am__objects_5 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo -@WITH_NSS_TRUE@am__objects_6 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo -am__objects_7 = \ - shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \ - shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo \ - shared/libnm_core_libnm_core_la-nm-meta-setting.lo \ - libnm-core/libnm_core_libnm_core_la-crypto.lo \ - libnm-core/libnm_core_libnm_core_la-nm-connection.lo \ - libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \ - libnm-core/libnm_core_libnm_core_la-nm-errors.lo \ - libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo \ - libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo \ - libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo \ - libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo \ +am__objects_4 = \ libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-adsl.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-bluetooth.lo \ @@ -808,19 +810,38 @@ am__objects_7 = \ libnm-core/libnm_core_libnm_core_la-nm-setting-wimax.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-wired.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless-security.lo \ - libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo \ + libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo +@WITH_JSON_VALIDATION_TRUE@am__objects_5 = libnm-core/libnm_core_libnm_core_la-nm-json.lo +@WITH_GNUTLS_TRUE@am__objects_6 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo +@WITH_NSS_TRUE@am__objects_7 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo +am__objects_8 = $(am__objects_4) \ + shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo \ + shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo \ + shared/libnm_core_libnm_core_la-nm-meta-setting.lo \ + libnm-core/libnm_core_libnm_core_la-crypto.lo \ + libnm-core/libnm_core_libnm_core_la-nm-connection.lo \ + libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo \ + libnm-core/libnm_core_libnm_core_la-nm-errors.lo \ + libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo \ + libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo \ + libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo \ libnm-core/libnm_core_libnm_core_la-nm-setting.lo \ libnm-core/libnm_core_libnm_core_la-nm-simple-connection.lo \ libnm-core/libnm_core_libnm_core_la-nm-utils.lo \ libnm-core/libnm_core_libnm_core_la-nm-vpn-editor-plugin.lo \ libnm-core/libnm_core_libnm_core_la-nm-vpn-plugin-info.lo \ - $(am__objects_4) $(am__objects_5) $(am__objects_6) + $(am__objects_5) $(am__objects_6) $(am__objects_7) am_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \ - $(am__objects_3) $(am__objects_7) -am__objects_8 = \ + $(am__objects_3) $(am__objects_8) +am__objects_9 = \ libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo nodist_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \ - $(am__objects_8) + $(am__objects_9) libnm_core_libnm_core_la_OBJECTS = \ $(am_libnm_core_libnm_core_la_OBJECTS) \ $(nodist_libnm_core_libnm_core_la_OBJECTS) @@ -845,14 +866,14 @@ am__libnm_glib_libnm_glib_vpn_la_SOURCES_DIST = \ libnm-glib/nm-vpn-plugin.c \ libnm-glib/nm-vpn-plugin-ui-interface.c \ libnm-glib/nm-vpn-plugin-utils.c -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin-ui-interface.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin-utils.lo @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_vpn_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_9) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo -@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_10) +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS = \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_11) libnm_glib_libnm_glib_vpn_la_OBJECTS = \ $(am_libnm_glib_libnm_glib_vpn_la_OBJECTS) \ $(nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS) @@ -904,7 +925,7 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST = \ libnm-glib/nm-object-cache.h \ libnm-glib/nm-remote-connection-private.h \ libnm-glib/nm-dbus-helpers-private.h -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-object.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-dbus-helpers.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-client.lo \ @@ -936,11 +957,11 @@ am__libnm_glib_libnm_glib_la_SOURCES_DIST = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-device-wimax.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm_glib_libnm_glib_la-nm-wimax-nsp.lo @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_11) $(am__objects_2) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_12) $(am__objects_2) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_glib_libnm_glib_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_12) $(am__objects_2) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_13) $(am__objects_2) libnm_glib_libnm_glib_la_OBJECTS = \ $(am_libnm_glib_libnm_glib_la_OBJECTS) \ $(nodist_libnm_glib_libnm_glib_la_OBJECTS) @@ -1005,9 +1026,9 @@ am__libnm_util_libnm_util_la_SOURCES_DIST = \ libnm-util/nm-gvaluearray-compat.h \ libnm-util/nm-param-spec-specialized.h \ libnm-util/nm-setting-private.h libnm-util/nm-utils-private.h -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_15 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \ +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_15 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-crypto.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-connection.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-param-spec-specialized.lo \ @@ -1040,14 +1061,14 @@ am__libnm_util_libnm_util_la_SOURCES_DIST = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-setting-vpn.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-utils.lo \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm_util_libnm_util_la-nm-value-transforms.lo \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_13) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_14) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_14) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_15) @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libnm_util_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_15) $(am__objects_2) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_16) $(am__objects_2) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_17 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo @WITH_LEGACY_LIBRARIES_TRUE@nodist_libnm_util_libnm_util_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) $(am__objects_16) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) $(am__objects_17) libnm_util_libnm_util_la_OBJECTS = \ $(am_libnm_util_libnm_util_la_OBJECTS) \ $(nodist_libnm_util_libnm_util_la_OBJECTS) @@ -1063,11 +1084,11 @@ libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) am__libnm_util_libtest_crypto_la_SOURCES_DIST = libnm-util/crypto.c \ libnm-util/crypto_gnutls.c libnm-util/crypto_nss.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_17 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_18 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__objects_18 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_19 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libtest_crypto_la_OBJECTS = libnm-util/libnm_util_libtest_crypto_la-crypto.lo \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_17) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_18) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_18) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_19) 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 = @@ -1076,12 +1097,15 @@ libnm_libnm_utils_la_DEPENDENCIES = libnm-core/libnm-core.la \ introspection/libnmdbus.la $(am__DEPENDENCIES_1) am_libnm_libnm_utils_la_OBJECTS = \ libnm/libnm_libnm_utils_la-nm-libnm-utils.lo -libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_OBJECTS = libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo +libnm_libnm_utils_la_OBJECTS = $(am_libnm_libnm_utils_la_OBJECTS) \ + $(nodist_libnm_libnm_utils_la_OBJECTS) libnm_libnm_la_DEPENDENCIES = libnm/libnm-utils.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -am__objects_19 = libnm/libnm_libnm_la-nm-access-point.lo \ +am__objects_20 = libnm/libnm_libnm_la-nm-access-point.lo \ libnm/libnm_libnm_la-nm-active-connection.lo \ + libnm/libnm_libnm_la-nm-checkpoint.lo \ libnm/libnm_libnm_la-nm-client.lo \ libnm/libnm_libnm_la-nm-dbus-helpers.lo \ libnm/libnm_libnm_la-nm-device-adsl.lo \ @@ -1126,9 +1150,9 @@ am__objects_19 = libnm/libnm_libnm_la-nm-access-point.lo \ libnm/libnm_libnm_la-nm-vpn-service-plugin.lo \ libnm/libnm_libnm_la-nm-wimax-nsp.lo am_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_2) \ - $(am__objects_2) $(am__objects_19) -am__objects_20 = libnm/libnm_libnm_la-nm-enum-types.lo -nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_20) + $(am__objects_20) +am__objects_21 = libnm/libnm_libnm_la-nm-enum-types.lo +nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_21) libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS) \ $(nodist_libnm_libnm_la_OBJECTS) libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1147,8 +1171,20 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_LINK = $(LIBTOOL) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ @ENABLE_TESTS_FALSE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath = @ENABLE_TESTS_TRUE@am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath = +shared_libcsiphash_la_LIBADD = +am_shared_libcsiphash_la_OBJECTS = \ + shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo +shared_libcsiphash_la_OBJECTS = $(am_shared_libcsiphash_la_OBJECTS) +shared_libnacd_la_LIBADD = +am_shared_libnacd_la_OBJECTS = \ + shared/n-acd/src/shared_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 $@ src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES = \ - introspection/libnmdbus.la $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo \ src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-device-adsl.lo src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS = \ @@ -1160,7 +1196,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \ $(LDFLAGS) -o $@ @WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_DEPENDENCIES = \ -@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_6) @@ -1181,7 +1216,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST = \ src/devices/bluetooth/nm-device-bt.h \ src/devices/bluetooth/nm-bluez5-dun.c \ src/devices/bluetooth/nm-bluez5-dun.h -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_21 = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__objects_22 = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-dun.lo @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez-manager.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez-device.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez4-adapter.lo \ @@ -1189,7 +1224,7 @@ am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bluez5-manager.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-bt-error.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/src_devices_bluetooth_libnm_device_plugin_bluetooth_la-nm-device-bt.lo \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_21) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_22) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS = $(am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_OBJECTS) src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK = \ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ @@ -1197,9 +1232,8 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LINK = \ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS) \ $(LDFLAGS) -o $@ @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_bluetooth_libnm_device_plugin_bluetooth_la_rpath = \ -@WITH_MODEM_MANAGER_1_TRUE@ -rpath $(pkglibdir) +@WITH_MODEM_MANAGER_1_TRUE@ -rpath $(plugindir) @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_DEPENDENCIES = \ -@WITH_OPENVSWITCH_TRUE@ introspection/libnmdbus.la \ @WITH_OPENVSWITCH_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_OPENVSWITCH_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST = \ @@ -1224,9 +1258,8 @@ src_devices_ovs_libnm_device_plugin_ovs_la_LINK = $(LIBTOOL) \ $(src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS) \ $(LDFLAGS) -o $@ @WITH_OPENVSWITCH_TRUE@am_src_devices_ovs_libnm_device_plugin_ovs_la_rpath = \ -@WITH_OPENVSWITCH_TRUE@ -rpath $(pkglibdir) +@WITH_OPENVSWITCH_TRUE@ -rpath $(plugindir) @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_DEPENDENCIES = \ -@WITH_TEAMDCTL_TRUE@ introspection/libnmdbus.la \ @WITH_TEAMDCTL_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_TEAMDCTL_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_TEAMDCTL_TRUE@ $(am__DEPENDENCIES_1) @@ -1244,9 +1277,8 @@ src_devices_team_libnm_device_plugin_team_la_LINK = $(LIBTOOL) \ $(src_devices_team_libnm_device_plugin_team_la_LDFLAGS) \ $(LDFLAGS) -o $@ @WITH_TEAMDCTL_TRUE@am_src_devices_team_libnm_device_plugin_team_la_rpath = \ -@WITH_TEAMDCTL_TRUE@ -rpath $(pkglibdir) +@WITH_TEAMDCTL_TRUE@ -rpath $(plugindir) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES = \ -@WITH_WIFI_TRUE@ introspection/libnmdbus.la \ @WITH_WIFI_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ src/devices/wifi/nm-wifi-factory.c \ @@ -1255,13 +1287,23 @@ am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST = \ src/devices/wifi/nm-wifi-ap.c src/devices/wifi/nm-wifi-ap.h \ src/devices/wifi/nm-wifi-utils.c \ src/devices/wifi/nm-wifi-utils.h \ + src/devices/wifi/nm-wifi-common.c \ + src/devices/wifi/nm-wifi-common.h \ src/devices/wifi/nm-device-olpc-mesh.c \ - src/devices/wifi/nm-device-olpc-mesh.h + src/devices/wifi/nm-device-olpc-mesh.h \ + src/devices/wifi/nm-device-iwd.c \ + src/devices/wifi/nm-device-iwd.h \ + src/devices/wifi/nm-iwd-manager.c \ + src/devices/wifi/nm-iwd-manager.h +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@am__objects_23 = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo \ +@WITH_IWD_TRUE@@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-factory.lo \ @WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-wifi.lo \ @WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.lo \ @WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo \ -@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo +@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo \ +@WITH_WIFI_TRUE@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo \ +@WITH_WIFI_TRUE@ $(am__objects_23) src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS = \ $(am_src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \ @@ -1270,9 +1312,8 @@ src_devices_wifi_libnm_device_plugin_wifi_la_LINK = $(LIBTOOL) \ $(src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS) \ $(LDFLAGS) -o $@ @WITH_WIFI_TRUE@am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath = \ -@WITH_WIFI_TRUE@ -rpath $(pkglibdir) +@WITH_WIFI_TRUE@ -rpath $(plugindir) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_DEPENDENCIES = \ -@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST = \ @@ -1289,7 +1330,7 @@ src_devices_wwan_libnm_device_plugin_wwan_la_LINK = $(LIBTOOL) \ $(src_devices_wwan_libnm_device_plugin_wwan_la_LDFLAGS) \ $(LDFLAGS) -o $@ @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_device_plugin_wwan_la_rpath = \ -@WITH_MODEM_MANAGER_1_TRUE@ -rpath $(pkglibdir) +@WITH_MODEM_MANAGER_1_TRUE@ -rpath $(plugindir) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_DEPENDENCIES = \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_1) \ @@ -1302,11 +1343,11 @@ am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST = \ src/devices/wwan/nm-modem.c src/devices/wwan/nm-modem.h \ src/devices/wwan/nm-modem-ofono.c \ src/devices/wwan/nm-modem-ofono.h -@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_22 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__objects_24 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_OBJECTS = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-broadband.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-manager.lo \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem.lo \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_22) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_24) src_devices_wwan_libnm_wwan_la_OBJECTS = \ $(am_src_devices_wwan_libnm_wwan_la_OBJECTS) src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1314,115 +1355,19 @@ src_devices_wwan_libnm_wwan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) \ $(src_devices_wwan_libnm_wwan_la_LDFLAGS) $(LDFLAGS) -o $@ @WITH_MODEM_MANAGER_1_TRUE@am_src_devices_wwan_libnm_wwan_la_rpath = \ -@WITH_MODEM_MANAGER_1_TRUE@ -rpath $(pkglibdir) +@WITH_MODEM_MANAGER_1_TRUE@ -rpath $(plugindir) src_libNetworkManager_la_DEPENDENCIES = src/libNetworkManagerBase.la \ - src/libsystemd-nm.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ + src/libsystemd-nm.la shared/libnacd.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am__src_libNetworkManager_la_SOURCES_DIST = \ - src/nm-checkpoint-manager.c src/nm-checkpoint-manager.h \ - src/nm-checkpoint.c src/nm-checkpoint.h \ - src/devices/nm-device.c src/devices/nm-device.h \ - src/devices/nm-lldp-listener.c src/devices/nm-lldp-listener.h \ - src/devices/nm-arping-manager.c \ - src/devices/nm-arping-manager.h \ - src/devices/nm-device-ethernet-utils.c \ - src/devices/nm-device-ethernet-utils.h \ - src/devices/nm-device-factory.c \ - src/devices/nm-device-factory.h \ - src/devices/nm-device-generic.c \ - src/devices/nm-device-generic.h \ - src/devices/nm-device-logging.h \ - src/devices/nm-device-private.h src/devices/nm-device-bond.c \ - src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \ - src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \ - src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \ - src/devices/nm-device-ethernet.h \ - src/devices/nm-device-infiniband.c \ - src/devices/nm-device-infiniband.h \ - src/devices/nm-device-ip-tunnel.c \ - src/devices/nm-device-ip-tunnel.h \ - src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \ - src/devices/nm-device-macvlan.c \ - src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \ - src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \ - src/devices/nm-device-tun.h src/devices/nm-device-veth.c \ - src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \ - src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \ - src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \ - src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \ - src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \ - src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \ - src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \ - src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \ - src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \ - src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \ - src/dnsmasq/nm-dnsmasq-manager.h \ - src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \ - src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \ - src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \ - src/nm-hostname-manager.c src/nm-hostname-manager.h \ - src/settings/nm-agent-manager.c \ - src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \ - src/settings/nm-secret-agent.h \ - src/settings/nm-settings-connection.c \ - src/settings/nm-settings-connection.h \ - src/settings/nm-settings-plugin.c \ - src/settings/nm-settings-plugin.h src/settings/nm-settings.c \ - src/settings/nm-settings.h \ - src/settings/plugins/keyfile/nms-keyfile-connection.c \ - src/settings/plugins/keyfile/nms-keyfile-connection.h \ - src/settings/plugins/keyfile/nms-keyfile-plugin.c \ - src/settings/plugins/keyfile/nms-keyfile-plugin.h \ - src/settings/plugins/keyfile/nms-keyfile-reader.c \ - src/settings/plugins/keyfile/nms-keyfile-reader.h \ - src/settings/plugins/keyfile/nms-keyfile-utils.c \ - src/settings/plugins/keyfile/nms-keyfile-utils.h \ - src/settings/plugins/keyfile/nms-keyfile-writer.c \ - src/settings/plugins/keyfile/nms-keyfile-writer.h \ - src/supplicant/nm-supplicant-config.c \ - src/supplicant/nm-supplicant-config.h \ - src/supplicant/nm-supplicant-interface.c \ - src/supplicant/nm-supplicant-interface.h \ - src/supplicant/nm-supplicant-manager.c \ - src/supplicant/nm-supplicant-manager.h \ - src/supplicant/nm-supplicant-settings-verify.c \ - src/supplicant/nm-supplicant-settings-verify.h \ - src/supplicant/nm-supplicant-types.h \ - src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \ - src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \ - src/nm-act-request.c src/nm-act-request.h \ - src/nm-active-connection.c src/nm-active-connection.h \ - src/nm-audit-manager.c src/nm-audit-manager.h \ - src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \ - src/nm-config.h src/nm-config-data.c src/nm-config-data.h \ - src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \ - src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \ - src/nm-dhcp6-config.c src/nm-dhcp6-config.h \ - src/nm-dispatcher.c src/nm-dispatcher.h \ - src/nm-firewall-manager.c src/nm-firewall-manager.h \ - src/nm-proxy-config.c src/nm-proxy-config.h \ - src/nm-auth-manager.c src/nm-auth-manager.h \ - src/nm-auth-subject.c src/nm-auth-subject.h \ - src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \ - src/nm-manager.h src/nm-pacrunner-manager.c \ - src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \ - src/nm-rfkill-manager.c src/nm-rfkill-manager.h \ - src/nm-session-monitor.h src/nm-session-monitor.c \ - src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \ - src/nm-connectivity.c -@WITH_CONCHECK_TRUE@am__objects_23 = src/src_libNetworkManager_la-nm-connectivity.lo + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_src_libNetworkManager_la_OBJECTS = \ - src/src_libNetworkManager_la-nm-checkpoint-manager.lo \ src/src_libNetworkManager_la-nm-checkpoint.lo \ + src/src_libNetworkManager_la-nm-checkpoint-manager.lo \ src/devices/src_libNetworkManager_la-nm-device.lo \ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo \ - src/devices/src_libNetworkManager_la-nm-arping-manager.lo \ + src/devices/src_libNetworkManager_la-nm-acd-manager.lo \ src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo \ src/devices/src_libNetworkManager_la-nm-device-factory.lo \ src/devices/src_libNetworkManager_la-nm-device-generic.lo \ @@ -1444,11 +1389,11 @@ am_src_libNetworkManager_la_OBJECTS = \ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhcpcd.lo \ src/dhcp/src_libNetworkManager_la-nm-dhcp-listener.lo \ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo \ + src/dns/src_libNetworkManager_la-nm-dns-manager.lo \ + src/dns/src_libNetworkManager_la-nm-dns-plugin.lo \ src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo \ src/dns/src_libNetworkManager_la-nm-dns-systemd-resolved.lo \ src/dns/src_libNetworkManager_la-nm-dns-unbound.lo \ - src/dns/src_libNetworkManager_la-nm-dns-manager.lo \ - src/dns/src_libNetworkManager_la-nm-dns-plugin.lo \ src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo \ src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-utils.lo \ src/ppp/src_libNetworkManager_la-nm-ppp-manager-call.lo \ @@ -1472,9 +1417,10 @@ am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-act-request.lo \ src/src_libNetworkManager_la-nm-active-connection.lo \ src/src_libNetworkManager_la-nm-audit-manager.lo \ - src/src_libNetworkManager_la-nm-bus-manager.lo \ + src/src_libNetworkManager_la-nm-dbus-manager.lo \ src/src_libNetworkManager_la-nm-config.lo \ src/src_libNetworkManager_la-nm-config-data.lo \ + src/src_libNetworkManager_la-nm-connectivity.lo \ src/src_libNetworkManager_la-nm-dcb.lo \ src/src_libNetworkManager_la-nm-netns.lo \ src/src_libNetworkManager_la-nm-dhcp4-config.lo \ @@ -1490,16 +1436,16 @@ am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-policy.lo \ src/src_libNetworkManager_la-nm-rfkill-manager.lo \ src/src_libNetworkManager_la-nm-session-monitor.lo \ - src/src_libNetworkManager_la-nm-sleep-monitor.lo \ - $(am__objects_23) + src/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 \ - introspection/libnmdbus.la $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(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 \ src/NetworkManagerUtils.c src/NetworkManagerUtils.h \ + src/platform/nm-netlink.c src/platform/nm-netlink.h \ src/platform/nmp-netns.c src/platform/nmp-netns.h \ src/platform/nmp-object.c src/platform/nmp-object.h \ src/platform/nm-platform-utils.c \ @@ -1513,21 +1459,22 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ src/platform/wifi/wifi-utils.c src/platform/wifi/wifi-utils.h \ src/ndisc/nm-lndp-ndisc.c src/ndisc/nm-lndp-ndisc.h \ src/ndisc/nm-ndisc.c src/ndisc/nm-ndisc.h \ - src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \ - src/nm-exported-object.h src/nm-ip4-config.c \ - src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \ - src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \ - src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \ - src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \ - src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \ - src/main-utils.c src/main-utils.h \ + src/ndisc/nm-ndisc-private.h src/nm-dbus-utils.c \ + src/nm-dbus-utils.h src/nm-dbus-object.c src/nm-dbus-object.h \ + src/nm-ip4-config.c src/nm-ip4-config.h src/nm-ip6-config.c \ + src/nm-ip6-config.h src/dhcp/nm-dhcp-client.c \ + src/dhcp/nm-dhcp-client.h src/dhcp/nm-dhcp-client-logging.h \ + src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \ + src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \ + src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \ src/platform/wifi/wifi-utils-wext.c \ src/platform/wifi/wifi-utils-wext.h -@WITH_WEXT_TRUE@am__objects_24 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo +@WITH_WEXT_TRUE@am__objects_25 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo am_src_libNetworkManagerBase_la_OBJECTS = \ src/src_libNetworkManagerBase_la-nm-core-utils.lo \ src/src_libNetworkManagerBase_la-nm-logging.lo \ src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo \ + src/platform/src_libNetworkManagerBase_la-nm-netlink.lo \ src/platform/src_libNetworkManagerBase_la-nmp-netns.lo \ src/platform/src_libNetworkManagerBase_la-nmp-object.lo \ src/platform/src_libNetworkManagerBase_la-nm-platform-utils.lo \ @@ -1537,7 +1484,8 @@ am_src_libNetworkManagerBase_la_OBJECTS = \ src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils.lo \ src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo \ src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo \ - src/src_libNetworkManagerBase_la-nm-exported-object.lo \ + src/src_libNetworkManagerBase_la-nm-dbus-utils.lo \ + src/src_libNetworkManagerBase_la-nm-dbus-object.lo \ src/src_libNetworkManagerBase_la-nm-ip4-config.lo \ src/src_libNetworkManagerBase_la-nm-ip6-config.lo \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-client.lo \ @@ -1545,12 +1493,12 @@ am_src_libNetworkManagerBase_la_OBJECTS = \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-systemd.lo \ src/dhcp/src_libNetworkManagerBase_la-nm-dhcp-manager.lo \ src/src_libNetworkManagerBase_la-main-utils.lo \ - $(am__objects_24) + $(am__objects_25) src_libNetworkManagerBase_la_OBJECTS = \ $(am_src_libNetworkManagerBase_la_OBJECTS) src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) am_src_libNetworkManagerTest_la_OBJECTS = \ src/ndisc/src_libNetworkManagerTest_la-nm-fake-ndisc.lo \ src/platform/src_libNetworkManagerTest_la-nm-fake-platform.lo \ @@ -1584,6 +1532,7 @@ am_src_libsystemd_nm_la_OBJECTS = \ src/systemd/src/basic/src_libsystemd_nm_la-process-util.lo \ src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo \ src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo \ + src/systemd/src/basic/src_libsystemd_nm_la-stat-util.lo \ src/systemd/src/basic/src_libsystemd_nm_la-string-table.lo \ src/systemd/src/basic/src_libsystemd_nm_la-string-util.lo \ src/systemd/src/basic/src_libsystemd_nm_la-strv.lo \ @@ -1613,7 +1562,6 @@ am_src_libsystemd_nm_la_OBJECTS = \ src/systemd/src/shared/src_libsystemd_nm_la-dns-domain.lo src_libsystemd_nm_la_OBJECTS = $(am_src_libsystemd_nm_la_OBJECTS) @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \ -@WITH_PPP_TRUE@ introspection/libnmdbus.la \ @WITH_PPP_TRUE@ $(am__DEPENDENCIES_1) am__src_ppp_libnm_ppp_plugin_la_SOURCES_DIST = \ src/ppp/nm-pppd-plugin.h src/ppp/nm-ppp-manager.c \ @@ -1627,7 +1575,7 @@ src_ppp_libnm_ppp_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_CFLAGS) $(CFLAGS) $(src_ppp_libnm_ppp_plugin_la_LDFLAGS) \ $(LDFLAGS) -o $@ @WITH_PPP_TRUE@am_src_ppp_libnm_ppp_plugin_la_rpath = -rpath \ -@WITH_PPP_TRUE@ $(pkglibdir) +@WITH_PPP_TRUE@ $(plugindir) @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_DEPENDENCIES = \ @WITH_PPP_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am__src_ppp_nm_pppd_plugin_la_SOURCES_DIST = src/ppp/nm-pppd-plugin.c \ @@ -1656,7 +1604,7 @@ src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LINK = \ $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS) \ $(LDFLAGS) -o $@ @CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_rpath = \ -@CONFIG_PLUGIN_IBFT_TRUE@ -rpath $(pkglibdir) +@CONFIG_PLUGIN_IBFT_TRUE@ -rpath $(plugindir) src_settings_plugins_ibft_libnms_ibft_core_la_LIBADD = am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST = \ src/settings/plugins/ibft/nms-ibft-reader.c \ @@ -1665,8 +1613,7 @@ am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST = \ src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS = \ $(am_src_settings_plugins_ibft_libnms_ibft_core_la_OBJECTS) @CONFIG_PLUGIN_IBFT_TRUE@am_src_settings_plugins_ibft_libnms_ibft_core_la_rpath = -@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_DEPENDENCIES = src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST = \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c \ src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h \ @@ -1681,7 +1628,7 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LINK = \ $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS) \ $(LDFLAGS) -o $@ @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_rpath = \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -rpath $(pkglibdir) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -rpath $(plugindir) src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_LIBADD = @CONFIG_PLUGIN_IFCFG_RH_TRUE@nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS = src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la-nmdbus-ifcfg-rh.lo src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_OBJECTS) @@ -1706,39 +1653,6 @@ am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS = $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) @CONFIG_PLUGIN_IFCFG_RH_TRUE@am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath = -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES = src/settings/plugins/ifnet/libnms-ifnet-core.la -am__src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES_DIST = \ - src/settings/plugins/ifnet/nms-ifnet-connection.c \ - src/settings/plugins/ifnet/nms-ifnet-connection.h \ - src/settings/plugins/ifnet/nms-ifnet-plugin.c \ - src/settings/plugins/ifnet/nms-ifnet-plugin.h -@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS = src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo -src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS = $(am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) -src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LINK = \ - $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS) \ - $(LDFLAGS) -o $@ -@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_rpath = \ -@CONFIG_PLUGIN_IFNET_TRUE@ -rpath $(pkglibdir) -src_settings_plugins_ifnet_libnms_ifnet_core_la_LIBADD = -am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST = \ - src/settings/plugins/ifnet/nms-ifnet-net-parser.c \ - src/settings/plugins/ifnet/nms-ifnet-net-parser.h \ - src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ - src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ - src/settings/plugins/ifnet/nms-ifnet-net-utils.h \ - src/settings/plugins/ifnet/nms-ifnet-net-utils.c \ - src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h \ - src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c -@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS = src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo -src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS = \ - $(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) -@CONFIG_PLUGIN_IFNET_TRUE@am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath = @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_DEPENDENCIES = src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(am__DEPENDENCIES_1) am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST = \ @@ -1755,7 +1669,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LINK = \ $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS) \ $(LDFLAGS) -o $@ @CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_rpath = \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -rpath $(pkglibdir) +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -rpath $(plugindir) @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_libnms_ifupdown_core_la_DEPENDENCIES = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(am__DEPENDENCIES_1) am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST = \ @@ -1769,39 +1683,38 @@ src_settings_plugins_ifupdown_libnms_ifupdown_core_la_OBJECTS = $(am_src_setting @CONFIG_PLUGIN_IFUPDOWN_TRUE@am_src_settings_plugins_ifupdown_libnms_ifupdown_core_la_rpath = @BUILD_NMCLI_TRUE@am__EXEEXT_1 = clients/cli/nmcli$(EXEEXT) @BUILD_NMTUI_TRUE@am__EXEEXT_2 = clients/tui/nmtui$(EXEEXT) -am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) \ - libnm/tests/test-nm-client$(EXEEXT) \ +am__EXEEXT_3 = libnm/tests/test-general$(EXEEXT) +am__EXEEXT_4 = libnm/tests/test-nm-client$(EXEEXT) \ libnm/tests/test-remote-settings-client$(EXEEXT) \ libnm/tests/test-secret-agent$(EXEEXT) -@CONFIG_PLUGIN_IBFT_TRUE@am__EXEEXT_4 = src/settings/plugins/ibft/tests/test-ibft$(EXEEXT) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_5 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT) -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_6 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT) -@CONFIG_PLUGIN_IFNET_TRUE@am__EXEEXT_7 = src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT) -@WITH_WIFI_TRUE@am__EXEEXT_8 = \ +@HAVE_INTROSPECTION_TRUE@am__EXEEXT_5 = $(am__EXEEXT_4) +@CONFIG_PLUGIN_IBFT_TRUE@am__EXEEXT_6 = src/settings/plugins/ibft/tests/test-ibft$(EXEEXT) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__EXEEXT_7 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT) +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__EXEEXT_8 = src/settings/plugins/ifupdown/tests/test-ifupdown$(EXEEXT) +@WITH_WIFI_TRUE@am__EXEEXT_9 = \ @WITH_WIFI_TRUE@ src/devices/wifi/tests/test-general$(EXEEXT) -@HAVE_INTROSPECTION_TRUE@am__EXEEXT_9 = clients/common/tests/test-general$(EXEEXT) -@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_10 = clients/common/tests/test-general$(EXEEXT) -@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_11 = libnm-util/tests/test-settings-defaults$(EXEEXT) \ +@HAVE_INTROSPECTION_TRUE@am__EXEEXT_10 = clients/common/tests/test-general$(EXEEXT) +@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__EXEEXT_11 = clients/common/tests/test-general$(EXEEXT) +@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_12 = libnm-util/tests/test-settings-defaults$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-crypto$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-secrets$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-general$(EXEEXT) \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-8021x$(EXEEXT) \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb$(EXEEXT) \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client$(EXEEXT) \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-remote-settings-client$(EXEEXT) -am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/tests/test-setting-dcb$(EXEEXT) +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-glib/tests/test-remote-settings-client$(EXEEXT) +am__EXEEXT_14 = libnm-core/tests/test-compare$(EXEEXT) \ libnm-core/tests/test-crypto$(EXEEXT) \ libnm-core/tests/test-general$(EXEEXT) \ libnm-core/tests/test-keyfile$(EXEEXT) \ libnm-core/tests/test-secrets$(EXEEXT) \ libnm-core/tests/test-setting$(EXEEXT) \ libnm-core/tests/test-settings-defaults$(EXEEXT) \ - $(am__EXEEXT_3) src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) \ + $(am__EXEEXT_3) $(am__EXEEXT_5) \ + src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) \ src/dhcp/tests/test-dhcp-utils$(EXEEXT) \ src/settings/plugins/keyfile/tests/test-keyfile$(EXEEXT) \ - $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6) \ - $(am__EXEEXT_7) $(am__EXEEXT_8) \ - src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \ + $(am__EXEEXT_6) $(am__EXEEXT_7) $(am__EXEEXT_8) \ + $(am__EXEEXT_9) src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) \ src/platform/tests/test-link-fake$(EXEEXT) \ src/platform/tests/test-link-linux$(EXEEXT) \ src/platform/tests/test-address-fake$(EXEEXT) \ @@ -1813,7 +1726,7 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \ src/platform/tests/test-cleanup-fake$(EXEEXT) \ src/platform/tests/test-cleanup-linux$(EXEEXT) \ src/devices/tests/test-lldp$(EXEEXT) \ - src/devices/tests/test-arping$(EXEEXT) \ + src/devices/tests/test-acd$(EXEEXT) \ src/ndisc/tests/test-ndisc-fake$(EXEEXT) \ src/supplicant/tests/test-supplicant-config$(EXEEXT) \ src/tests/config/test-config$(EXEEXT) \ @@ -1822,21 +1735,24 @@ am__EXEEXT_12 = libnm-core/tests/test-compare$(EXEEXT) \ src/tests/test-ip4-config$(EXEEXT) \ src/tests/test-ip6-config$(EXEEXT) src/tests/test-dcb$(EXEEXT) \ src/tests/test-systemd$(EXEEXT) \ - src/tests/test-resolvconf-capture$(EXEEXT) \ src/tests/test-wired-defname$(EXEEXT) \ src/tests/test-utils$(EXEEXT) \ - dispatcher/tests/test-dispatcher-envp$(EXEEXT) $(am__EXEEXT_9) \ - $(am__EXEEXT_10) $(am__EXEEXT_11) -@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_13 = libnm-util/tests/test-libnm-linking$(EXEEXT) \ -@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test$(EXEEXT) -@WITH_QT_TRUE@am__EXEEXT_14 = \ + dispatcher/tests/test-dispatcher-envp$(EXEEXT) \ + $(am__EXEEXT_10) $(am__EXEEXT_11) $(am__EXEEXT_12) \ + $(am__EXEEXT_13) +@HAVE_INTROSPECTION_FALSE@am__EXEEXT_15 = $(am__EXEEXT_4) +@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_16 = libnm-util/tests/test-libnm-linking$(EXEEXT) \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-test$(EXEEXT) \ +@WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/tests/test-nm-client$(EXEEXT) +@HAVE_INTROSPECTION_FALSE@@WITH_LEGACY_LIBRARIES_TRUE@am__EXEEXT_17 = libnm-glib/tests/test-remote-settings-client$(EXEEXT) +@WITH_QT_TRUE@am__EXEEXT_18 = \ @WITH_QT_TRUE@ examples/C/qt/add-connection-wired$(EXEEXT) \ @WITH_QT_TRUE@ examples/C/qt/list-connections$(EXEEXT) \ @WITH_QT_TRUE@ examples/C/qt/change-ipv4-addresses$(EXEEXT) \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running$(EXEEXT) -am__EXEEXT_15 = src/platform/tests/monitor$(EXEEXT) \ - src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_13) \ - examples/C/glib/add-connection-gdbus$(EXEEXT) \ +am__EXEEXT_19 = $(am__EXEEXT_15) src/platform/tests/monitor$(EXEEXT) \ + src/ndisc/tests/test-ndisc-linux$(EXEEXT) $(am__EXEEXT_16) \ + $(am__EXEEXT_17) examples/C/glib/add-connection-gdbus$(EXEEXT) \ examples/C/glib/add-connection-libnm$(EXEEXT) \ examples/C/glib/get-active-connections-gdbus$(EXEEXT) \ examples/C/glib/get-ap-info-libnm$(EXEEXT) \ @@ -1844,9 +1760,9 @@ am__EXEEXT_15 = src/platform/tests/monitor$(EXEEXT) \ examples/C/glib/list-connections-libnm$(EXEEXT) \ examples/C/glib/monitor-nm-running-gdbus$(EXEEXT) \ examples/C/glib/monitor-nm-state-gdbus$(EXEEXT) \ - $(am__EXEEXT_14) -@ENABLE_TESTS_FALSE@am__EXEEXT_16 = $(am__EXEEXT_12) $(am__EXEEXT_15) -@ENABLE_TESTS_TRUE@am__EXEEXT_17 = $(am__EXEEXT_12) $(am__EXEEXT_15) + $(am__EXEEXT_18) +@ENABLE_TESTS_FALSE@am__EXEEXT_20 = $(am__EXEEXT_14) $(am__EXEEXT_19) +@ENABLE_TESTS_TRUE@am__EXEEXT_21 = $(am__EXEEXT_14) $(am__EXEEXT_19) PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(noinst_PROGRAMS) \ $(sbin_PROGRAMS) am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \ @@ -1859,7 +1775,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \ clients/cli/polkit-agent.c clients/cli/polkit-agent.h \ clients/common/nm-polkit-listener.c \ clients/common/nm-polkit-listener.h -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_25 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_26 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) @BUILD_NMCLI_TRUE@am_clients_cli_nmcli_OBJECTS = clients/cli/clients_cli_nmcli-common.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-utils.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-agent.$(OBJEXT) \ @@ -1869,7 +1785,7 @@ am__clients_cli_nmcli_SOURCES_DIST = clients/cli/common.c \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-settings.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-nmcli.$(OBJEXT) \ @BUILD_NMCLI_TRUE@ clients/cli/clients_cli_nmcli-polkit-agent.$(OBJEXT) \ -@BUILD_NMCLI_TRUE@ $(am__objects_25) +@BUILD_NMCLI_TRUE@ $(am__objects_26) clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS) @BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \ @@ -1887,6 +1803,10 @@ clients_common_tests_test_general_OBJECTS = clients/common/tests/clients_common_ clients_common_tests_test_general_DEPENDENCIES = libnm/libnm.la \ clients/common/libnmc-base.la clients/common/libnmc.la \ $(am__DEPENDENCIES_1) +clients_common_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(clients_common_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@ clients_nm_online_SOURCES = clients/nm-online.c clients_nm_online_OBJECTS = \ clients/clients_nm_online-nm-online.$(OBJEXT) @@ -1995,8 +1915,8 @@ clients_tui_nmtui_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ -o $@ am_dispatcher_nm_dispatcher_OBJECTS = \ dispatcher/dispatcher_nm_dispatcher-nm-dispatcher.$(OBJEXT) -am__objects_26 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) -nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_26) +am__objects_27 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) +nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_27) dispatcher_nm_dispatcher_OBJECTS = \ $(am_dispatcher_nm_dispatcher_OBJECTS) \ $(nodist_dispatcher_nm_dispatcher_OBJECTS) @@ -2011,6 +1931,11 @@ dispatcher_tests_test_dispatcher_envp_SOURCES = \ dispatcher_tests_test_dispatcher_envp_OBJECTS = dispatcher/tests/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_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(dispatcher_tests_test_dispatcher_envp_LDFLAGS) $(LDFLAGS) -o \ + $@ examples_C_glib_add_connection_gdbus_SOURCES = \ examples/C/glib/add-connection-gdbus.c examples_C_glib_add_connection_gdbus_OBJECTS = examples/C/glib/examples_C_glib_add_connection_gdbus-add-connection-gdbus.$(OBJEXT) @@ -2084,32 +2009,61 @@ libnm_core_tests_test_compare_SOURCES = \ libnm_core_tests_test_compare_OBJECTS = libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT) am__DEPENDENCIES_9 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1) libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_tests_test_compare_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_crypto_SOURCES = libnm-core/tests/test-crypto.c libnm_core_tests_test_crypto_OBJECTS = libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT) libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libnm_core_tests_test_crypto_LDFLAGS) \ + $(LDFLAGS) -o $@ am_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT) nodist_libnm_core_tests_test_general_OBJECTS = libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT) libnm_core_tests_test_general_OBJECTS = \ $(am_libnm_core_tests_test_general_OBJECTS) \ $(nodist_libnm_core_tests_test_general_OBJECTS) libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_keyfile_SOURCES = \ libnm-core/tests/test-keyfile.c libnm_core_tests_test_keyfile_OBJECTS = libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT) libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_keyfile_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_tests_test_keyfile_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_secrets_SOURCES = \ libnm-core/tests/test-secrets.c libnm_core_tests_test_secrets_OBJECTS = libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT) libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_setting_SOURCES = \ libnm-core/tests/test-setting.c libnm_core_tests_test_setting_OBJECTS = libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT) libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_9) +libnm_core_tests_test_setting_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_tests_test_setting_LDFLAGS) $(LDFLAGS) -o $@ libnm_core_tests_test_settings_defaults_SOURCES = \ libnm-core/tests/test-settings-defaults.c libnm_core_tests_test_settings_defaults_OBJECTS = libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT) libnm_core_tests_test_settings_defaults_DEPENDENCIES = \ $(am__DEPENDENCIES_9) +libnm_core_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_core_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \ + -o $@ libnm_glib_libnm_glib_test_SOURCES = libnm-glib/libnm-glib-test.c libnm_glib_libnm_glib_test_OBJECTS = libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_test_DEPENDENCIES = \ @@ -2154,58 +2108,107 @@ libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_cr @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libtest-crypto.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +libnm_util_tests_test_crypto_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libnm_util_tests_test_crypto_LDFLAGS) \ + $(LDFLAGS) -o $@ libnm_util_tests_test_general_SOURCES = \ libnm-util/tests/test-general.c libnm_util_tests_test_general_OBJECTS = libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT) +libnm_util_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_util_tests_test_general_LDFLAGS) $(LDFLAGS) -o $@ libnm_util_tests_test_libnm_linking_SOURCES = \ libnm-util/tests/test-libnm-linking.c libnm_util_tests_test_libnm_linking_OBJECTS = libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm/libnm.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +libnm_util_tests_test_libnm_linking_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_util_tests_test_libnm_linking_LDFLAGS) $(LDFLAGS) -o \ + $@ libnm_util_tests_test_secrets_SOURCES = \ libnm-util/tests/test-secrets.c libnm_util_tests_test_secrets_OBJECTS = libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +libnm_util_tests_test_secrets_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_util_tests_test_secrets_LDFLAGS) $(LDFLAGS) -o $@ libnm_util_tests_test_setting_8021x_SOURCES = \ libnm-util/tests/test-setting-8021x.c libnm_util_tests_test_setting_8021x_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +libnm_util_tests_test_setting_8021x_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_util_tests_test_setting_8021x_LDFLAGS) $(LDFLAGS) -o \ + $@ libnm_util_tests_test_setting_dcb_SOURCES = \ libnm-util/tests/test-setting-dcb.c libnm_util_tests_test_setting_dcb_OBJECTS = libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +libnm_util_tests_test_setting_dcb_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_util_tests_test_setting_dcb_LDFLAGS) $(LDFLAGS) -o $@ libnm_util_tests_test_settings_defaults_SOURCES = \ libnm-util/tests/test-settings-defaults.c libnm_util_tests_test_settings_defaults_OBJECTS = libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) +libnm_util_tests_test_settings_defaults_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_util_tests_test_settings_defaults_LDFLAGS) $(LDFLAGS) \ + -o $@ am_libnm_tests_test_general_OBJECTS = \ + shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT) \ libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT) libnm_tests_test_general_OBJECTS = \ $(am_libnm_tests_test_general_OBJECTS) am__DEPENDENCIES_11 = libnm/libnm.la $(am__DEPENDENCIES_1) libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \ $(am__DEPENDENCIES_11) +libnm_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_general_LDFLAGS) \ + $(LDFLAGS) -o $@ am_libnm_tests_test_nm_client_OBJECTS = shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT) libnm_tests_test_nm_client_OBJECTS = \ $(am_libnm_tests_test_nm_client_OBJECTS) libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_11) +libnm_tests_test_nm_client_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libnm_tests_test_nm_client_LDFLAGS) \ + $(LDFLAGS) -o $@ am_libnm_tests_test_remote_settings_client_OBJECTS = shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT) libnm_tests_test_remote_settings_client_OBJECTS = \ $(am_libnm_tests_test_remote_settings_client_OBJECTS) libnm_tests_test_remote_settings_client_DEPENDENCIES = \ $(am__DEPENDENCIES_11) +libnm_tests_test_remote_settings_client_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_tests_test_remote_settings_client_LDFLAGS) $(LDFLAGS) \ + -o $@ am_libnm_tests_test_secret_agent_OBJECTS = shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT) \ libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT) libnm_tests_test_secret_agent_OBJECTS = \ $(am_libnm_tests_test_secret_agent_OBJECTS) libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_11) +libnm_tests_test_secret_agent_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libnm_tests_test_secret_agent_LDFLAGS) $(LDFLAGS) -o $@ am_src_NetworkManager_OBJECTS = src/src_NetworkManager-main.$(OBJEXT) src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS) src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la @@ -2213,15 +2216,14 @@ src_NetworkManager_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_NetworkManager_LDFLAGS) \ $(LDFLAGS) -o $@ -src_devices_tests_test_arping_SOURCES = \ - src/devices/tests/test-arping.c -src_devices_tests_test_arping_OBJECTS = src/devices/tests/src_devices_tests_test_arping-test-arping.$(OBJEXT) -src_devices_tests_test_arping_DEPENDENCIES = \ +src_devices_tests_test_acd_SOURCES = src/devices/tests/test-acd.c +src_devices_tests_test_acd_OBJECTS = src/devices/tests/src_devices_tests_test_acd-test-acd.$(OBJEXT) +src_devices_tests_test_acd_DEPENDENCIES = \ src/libNetworkManagerTest.la -src_devices_tests_test_arping_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ +src_devices_tests_test_acd_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) \ - $(src_devices_tests_test_arping_LDFLAGS) $(LDFLAGS) -o $@ + $(AM_CFLAGS) $(CFLAGS) $(src_devices_tests_test_acd_LDFLAGS) \ + $(LDFLAGS) -o $@ src_devices_tests_test_lldp_SOURCES = src/devices/tests/test-lldp.c src_devices_tests_test_lldp_OBJECTS = src/devices/tests/src_devices_tests_test_lldp-test-lldp.$(OBJEXT) src_devices_tests_test_lldp_DEPENDENCIES = \ @@ -2242,6 +2244,11 @@ src_devices_wifi_tests_test_general_OBJECTS = \ $(am_src_devices_wifi_tests_test_general_OBJECTS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_DEPENDENCIES = \ @WITH_WIFI_TRUE@ src/libNetworkManagerTest.la +src_devices_wifi_tests_test_general_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_devices_wifi_tests_test_general_LDFLAGS) $(LDFLAGS) -o \ + $@ am_src_dhcp_nm_dhcp_helper_OBJECTS = \ src/dhcp/src_dhcp_nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT) src_dhcp_nm_dhcp_helper_OBJECTS = \ @@ -2256,15 +2263,28 @@ src_dhcp_tests_test_dhcp_dhclient_SOURCES = \ src_dhcp_tests_test_dhcp_dhclient_OBJECTS = src/dhcp/tests/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT) src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES = \ $(src_dhcp_tests_ldadd) +src_dhcp_tests_test_dhcp_dhclient_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_dhcp_tests_test_dhcp_dhclient_LDFLAGS) $(LDFLAGS) -o $@ src_dhcp_tests_test_dhcp_utils_SOURCES = \ src/dhcp/tests/test-dhcp-utils.c src_dhcp_tests_test_dhcp_utils_OBJECTS = src/dhcp/tests/src_dhcp_tests_test_dhcp_utils-test-dhcp-utils.$(OBJEXT) src_dhcp_tests_test_dhcp_utils_DEPENDENCIES = $(src_dhcp_tests_ldadd) +src_dhcp_tests_test_dhcp_utils_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(src_dhcp_tests_test_dhcp_utils_LDFLAGS) $(LDFLAGS) -o $@ src_dnsmasq_tests_test_dnsmasq_utils_SOURCES = \ src/dnsmasq/tests/test-dnsmasq-utils.c src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS = src/dnsmasq/tests/src_dnsmasq_tests_test_dnsmasq_utils-test-dnsmasq-utils.$(OBJEXT) src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES = \ src/libNetworkManagerTest.la +src_dnsmasq_tests_test_dnsmasq_utils_LINK = $(LIBTOOL) $(AM_V_lt) \ + --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ + $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS) $(LDFLAGS) -o \ + $@ src_ndisc_tests_test_ndisc_fake_SOURCES = \ src/ndisc/tests/test-ndisc-fake.c src_ndisc_tests_test_ndisc_fake_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.$(OBJEXT) @@ -2290,7 +2310,7 @@ src_nm_iface_helper_OBJECTS = $(am_src_nm_iface_helper_OBJECTS) src_nm_iface_helper_DEPENDENCIES = src/libNetworkManagerBase.la \ src/libsystemd-nm.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_nm_iface_helper_LDFLAGS) \ @@ -2298,8 +2318,7 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ src_platform_tests_monitor_SOURCES = src/platform/tests/monitor.c src_platform_tests_monitor_OBJECTS = src/platform/tests/src_platform_tests_monitor-monitor.$(OBJEXT) am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \ - $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_13) src_platform_tests_monitor_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ @@ -2421,16 +2440,6 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK = $(LIBTOOL) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS) \ $(LDFLAGS) -o $@ -src_settings_plugins_ifnet_tests_test_ifnet_SOURCES = \ - src/settings/plugins/ifnet/tests/test-ifnet.c -src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS = src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.$(OBJEXT) -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES = src/settings/plugins/ifnet/libnms-ifnet-core.la \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/libNetworkManagerTest.la -src_settings_plugins_ifnet_tests_test_ifnet_LINK = $(LIBTOOL) \ - $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS) \ - $(LDFLAGS) -o $@ src_settings_plugins_ifupdown_tests_test_ifupdown_SOURCES = \ src/settings/plugins/ifupdown/tests/test-ifupdown.c src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS = src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.$(OBJEXT) @@ -2456,12 +2465,21 @@ src_supplicant_tests_test_supplicant_config_SOURCES = \ src_supplicant_tests_test_supplicant_config_OBJECTS = src/supplicant/tests/src_supplicant_tests_test_supplicant_config-test-supplicant-config.$(OBJEXT) src_supplicant_tests_test_supplicant_config_DEPENDENCIES = \ src/libNetworkManagerTest.la +src_supplicant_tests_test_supplicant_config_LINK = $(LIBTOOL) \ + $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(src_supplicant_tests_test_supplicant_config_LDFLAGS) \ + $(LDFLAGS) -o $@ am_src_tests_config_test_config_OBJECTS = src/tests/config/src_tests_config_test_config-nm-test-device.$(OBJEXT) \ src/tests/config/src_tests_config_test_config-test-config.$(OBJEXT) src_tests_config_test_config_OBJECTS = \ $(am_src_tests_config_test_config_OBJECTS) src_tests_config_test_config_DEPENDENCIES = \ src/libNetworkManagerTest.la +src_tests_config_test_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(src_tests_config_test_config_LDFLAGS) \ + $(LDFLAGS) -o $@ src_tests_test_dcb_SOURCES = src/tests/test-dcb.c src_tests_test_dcb_OBJECTS = \ src/tests/src_tests_test_dcb-test-dcb.$(OBJEXT) @@ -2502,20 +2520,11 @@ src_tests_test_ip6_config_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_tests_test_ip6_config_LDFLAGS) \ $(LDFLAGS) -o $@ -src_tests_test_resolvconf_capture_SOURCES = \ - src/tests/test-resolvconf-capture.c -src_tests_test_resolvconf_capture_OBJECTS = src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT) -src_tests_test_resolvconf_capture_DEPENDENCIES = $(src_tests_ldadd) -src_tests_test_resolvconf_capture_LINK = $(LIBTOOL) $(AM_V_lt) \ - --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(src_tests_test_resolvconf_capture_LDFLAGS) $(LDFLAGS) -o $@ am_src_tests_test_systemd_OBJECTS = \ - shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT) \ src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT) src_tests_test_systemd_OBJECTS = $(am_src_tests_test_systemd_OBJECTS) src_tests_test_systemd_DEPENDENCIES = src/libsystemd-nm.la \ - $(am__DEPENDENCIES_7) + shared/libcsiphash.la $(am__DEPENDENCIES_7) src_tests_test_utils_SOURCES = src/tests/test-utils.c src_tests_test_utils_OBJECTS = \ src/tests/src_tests_test_utils-test-utils.$(OBJEXT) @@ -2531,6 +2540,9 @@ src_tests_test_wired_defname_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(src_tests_test_wired_defname_LDFLAGS) \ $(LDFLAGS) -o $@ +am__dist_libexec_SCRIPTS_DIST = src/settings/plugins/ifcfg-rh/nm-ifup \ + src/settings/plugins/ifcfg-rh/nm-ifdown +SCRIPTS = $(dist_libexec_SCRIPTS) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -2598,9 +2610,11 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(libnm_util_libnm_util_la_SOURCES) \ $(nodist_libnm_util_libnm_util_la_SOURCES) \ $(libnm_util_libtest_crypto_la_SOURCES) \ - $(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \ - $(nodist_libnm_libnm_la_SOURCES) \ + $(libnm_libnm_utils_la_SOURCES) \ + $(nodist_libnm_libnm_utils_la_SOURCES) \ + $(libnm_libnm_la_SOURCES) $(nodist_libnm_libnm_la_SOURCES) \ $(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \ + $(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \ $(src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES) \ $(src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES) \ @@ -2619,8 +2633,6 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES) \ $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) \ $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES) \ - $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES) \ - $(src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES) \ $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES) \ $(src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES) \ $(clients_cli_nmcli_SOURCES) \ @@ -2661,7 +2673,7 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(libnm_tests_test_nm_client_SOURCES) \ $(libnm_tests_test_remote_settings_client_SOURCES) \ $(libnm_tests_test_secret_agent_SOURCES) \ - $(src_NetworkManager_SOURCES) src/devices/tests/test-arping.c \ + $(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \ src/devices/tests/test-lldp.c \ $(src_devices_wifi_tests_test_general_SOURCES) \ $(src_dhcp_nm_dhcp_helper_SOURCES) \ @@ -2683,14 +2695,12 @@ SOURCES = $(clients_tui_newt_libnmt_newt_a_SOURCES) \ $(src_platform_tests_test_route_linux_SOURCES) \ src/settings/plugins/ibft/tests/test-ibft.c \ $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES) \ - src/settings/plugins/ifnet/tests/test-ifnet.c \ src/settings/plugins/ifupdown/tests/test-ifupdown.c \ src/settings/plugins/keyfile/tests/test-keyfile.c \ src/supplicant/tests/test-supplicant-config.c \ $(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \ src/tests/test-general.c src/tests/test-general-with-expect.c \ src/tests/test-ip4-config.c src/tests/test-ip6-config.c \ - src/tests/test-resolvconf-capture.c \ $(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \ src/tests/test-wired-defname.c DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ @@ -2705,6 +2715,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__libnm_util_libtest_crypto_la_SOURCES_DIST) \ $(libnm_libnm_utils_la_SOURCES) $(libnm_libnm_la_SOURCES) \ $(libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES) \ + $(shared_libcsiphash_la_SOURCES) $(shared_libnacd_la_SOURCES) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES) \ $(am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST) \ $(am__src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES_DIST) \ @@ -2712,7 +2723,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES_DIST) \ $(am__src_devices_wwan_libnm_device_plugin_wwan_la_SOURCES_DIST) \ $(am__src_devices_wwan_libnm_wwan_la_SOURCES_DIST) \ - $(am__src_libNetworkManager_la_SOURCES_DIST) \ + $(src_libNetworkManager_la_SOURCES) \ $(am__src_libNetworkManagerBase_la_SOURCES_DIST) \ $(src_libNetworkManagerTest_la_SOURCES) \ $(src_libsystemd_nm_la_SOURCES) \ @@ -2722,8 +2733,6 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(am__src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES_DIST) \ - $(am__src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES_DIST) \ - $(am__src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES_DIST) \ $(am__src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES_DIST) \ $(am__clients_cli_nmcli_SOURCES_DIST) \ @@ -2762,7 +2771,7 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(libnm_tests_test_nm_client_SOURCES) \ $(libnm_tests_test_remote_settings_client_SOURCES) \ $(libnm_tests_test_secret_agent_SOURCES) \ - $(src_NetworkManager_SOURCES) src/devices/tests/test-arping.c \ + $(src_NetworkManager_SOURCES) src/devices/tests/test-acd.c \ src/devices/tests/test-lldp.c \ $(am__src_devices_wifi_tests_test_general_SOURCES_DIST) \ $(src_dhcp_nm_dhcp_helper_SOURCES) \ @@ -2784,14 +2793,12 @@ DIST_SOURCES = $(am__clients_tui_newt_libnmt_newt_a_SOURCES_DIST) \ $(src_platform_tests_test_route_linux_SOURCES) \ src/settings/plugins/ibft/tests/test-ibft.c \ $(am__src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES_DIST) \ - src/settings/plugins/ifnet/tests/test-ifnet.c \ src/settings/plugins/ifupdown/tests/test-ifupdown.c \ src/settings/plugins/keyfile/tests/test-keyfile.c \ src/supplicant/tests/test-supplicant-config.c \ $(src_tests_config_test_config_SOURCES) src/tests/test-dcb.c \ src/tests/test-general.c src/tests/test-general-with-expect.c \ src/tests/test-ip4-config.c src/tests/test-ip6-config.c \ - src/tests/test-resolvconf-capture.c \ $(src_tests_test_systemd_SOURCES) src/tests/test-utils.c \ src/tests/test-wired-defname.c RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -3076,6 +3083,7 @@ DIST_SUBDIRS = . po docs/libnm docs/api docs/libnm-util \ docs/libnm-glib am__DIST_COMMON = $(srcdir)/Makefile.examples $(srcdir)/Makefile.in \ $(srcdir)/Makefile.vapigen $(srcdir)/NetworkManager.pc.in \ + $(srcdir)/clients/tests/test-client.check-on-disk/Makefile.am \ $(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.rpath \ @@ -3190,7 +3198,7 @@ GENHTML = @GENHTML@ GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GLIB_CFLAGS = @GLIB_CFLAGS@ -GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ GLIB_LIBS = @GLIB_LIBS@ GLIB_MAKEFILE = @GLIB_MAKEFILE@ GLIB_MKENUMS = @GLIB_MKENUMS@ @@ -3244,14 +3252,13 @@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBNDP_CFLAGS = @LIBNDP_CFLAGS@ LIBNDP_LIBS = @LIBNDP_LIBS@ -LIBNL_CFLAGS = @LIBNL_CFLAGS@ -LIBNL_LIBS = @LIBNL_LIBS@ LIBOBJS = @LIBOBJS@ LIBPSL_CFLAGS = @LIBPSL_CFLAGS@ LIBPSL_LIBS = @LIBPSL_LIBS@ LIBS = @LIBS@ LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@ LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@ +LIBSYSTEMD_NM_CFLAGS = @LIBSYSTEMD_NM_CFLAGS@ LIBTEAMDCTL_CFLAGS = @LIBTEAMDCTL_CFLAGS@ LIBTEAMDCTL_LIBS = @LIBTEAMDCTL_LIBS@ LIBTOOL = @LIBTOOL@ @@ -3283,6 +3290,7 @@ NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT = @NM_CONFIG_DEFAULT_LOGGING_BACKEND_TEXT NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT = @NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT@ NM_CONFIG_DEFAULT_MAIN_DHCP = @NM_CONFIG_DEFAULT_MAIN_DHCP@ NM_CONFIG_DEFAULT_MAIN_RC_MANAGER = @NM_CONFIG_DEFAULT_MAIN_RC_MANAGER@ +NM_DIST_VERSION = @NM_DIST_VERSION@ NM_LOG_COMPILER = @NM_LOG_COMPILER@ NM_MAJOR_VERSION = @NM_MAJOR_VERSION@ NM_MICRO_VERSION = @NM_MICRO_VERSION@ @@ -3322,8 +3330,11 @@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ -SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ +SANITIZER_EXEC_CFLAGS = @SANITIZER_EXEC_CFLAGS@ +SANITIZER_EXEC_LDFLAGS = @SANITIZER_EXEC_LDFLAGS@ +SANITIZER_LIB_CFLAGS = @SANITIZER_LIB_CFLAGS@ +SANITIZER_LIB_LDFLAGS = @SANITIZER_LIB_LDFLAGS@ SED = @SED@ SELINUX_CFLAGS = @SELINUX_CFLAGS@ SELINUX_LIBS = @SELINUX_LIBS@ @@ -3440,64 +3451,76 @@ AUTOMAKE_OPTIONS = subdir-objects ############################################################################### +############################################################################### + +############################################################################### + ############################################################################### noinst_LTLIBRARIES = introspection/libnmdbus.la \ libnm-core/libnm-core.la libnm/libnm-utils.la \ src/libNetworkManagerBase.la src/libNetworkManager.la \ - src/libsystemd-nm.la $(am__append_24) $(am__append_29) \ - $(am__append_35) $(am__append_39) \ - dispatcher/libnm-dispatcher-core.la $(am__append_92) \ - $(am__append_110) -check_LTLIBRARIES = $(am__append_112) -noinst_LIBRARIES = $(am__append_66) -noinst_DATA = $(am__append_16) + src/libsystemd-nm.la shared/libcsiphash.la shared/libnacd.la \ + $(am__append_27) $(am__append_32) $(am__append_40) \ + dispatcher/libnm-dispatcher-core.la $(am__append_94) \ + $(am__append_115) +check_LTLIBRARIES = $(am__append_117) +noinst_LIBRARIES = $(am__append_68) +noinst_DATA = $(am__append_18) +dist_libexec_SCRIPTS = $(am__append_36) ############################################################################### -lib_LTLIBRARIES = libnm/libnm.la $(am__append_71) -pkglib_LTLIBRARIES = $(core_plugins) +lib_LTLIBRARIES = libnm/libnm.la $(am__append_73) +plugin_LTLIBRARIES = $(core_plugins) ############################################################################### # src/devices/adsl ############################################################################### -core_plugins = $(am__append_21) $(am__append_23) $(am__append_28) \ - $(am__append_34) $(am__append_38) \ - src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_42) \ - $(am__append_48) $(am__append_51) $(am__append_53) -service_DATA = $(am__append_70) -man_MANS = $(am__append_103) +core_plugins = $(am__append_24) $(am__append_26) $(am__append_31) \ + $(am__append_39) src/devices/adsl/libnm-device-plugin-adsl.la \ + $(am__append_43) $(am__append_49) $(am__append_53) \ + $(am__append_55) +service_DATA = $(am__append_72) +man_MANS = $(am__append_108) examples_DATA = data/server.conf CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ - src/NetworkManager.ver $(am__append_30) \ + $(am__append_17) src/NetworkManager.ver $(am__append_33) \ $(dispatcher_nmdbus_dispatcher_sources) \ dispatcher/org.freedesktop.nm_dispatcher.service \ - data/NetworkManager.service \ + clients/tests/test-client.log data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ data/org.freedesktop.NetworkManager.service data/server.conf \ - $(am__append_93) $(am__append_94) man/common.ent \ - $(am__append_104) $(am__append_108) $(GLIB_GENERATED) \ + $(am__append_95) $(am__append_99) man/common.ent \ + $(am__append_109) $(am__append_113) $(GLIB_GENERATED) \ $(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \ - cscope.po.out $(NULL) $(am__append_114) + cscope.po.out $(NULL) $(am__append_119) DISTCLEANFILES = intltool-extract intltool-merge intltool-update \ - $(polkit_policy_DATA) libnm/libnm.pc $(am__append_54) \ - $(am__append_86) + $(polkit_policy_DATA) libnm/libnm.pc $(am__append_56) \ + $(am__append_88) # test-cert.p12 created with: # # openssl pkcs12 -export \ -# -in test_key_and_cert.pem \ -# -inkey test_key_and_cert.pem \ -# -certfile test_ca_cert.pem \ -# -name "test-pkcs12" \ -# -out test-cert.p12 +# -in test_key_and_cert.pem \ +# -inkey test_key_and_cert.pem \ +# -certfile test_ca_cert.pem \ +# -name "test-pkcs12" \ +# -out test-cert.p12 + +############################################################################### +############################################################################### +# src/devices ############################################################################### ############################################################################### # examples ############################################################################### -EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ - libnm-core/crypto_nss.c \ +EXTRA_DIST = $(dbusinterfaces_DATA) introspection/meson.build \ + libnm-core/crypto_gnutls.c libnm-core/crypto_nss.c \ + libnm-core/nm-core-enum-types.c.template \ + libnm-core/nm-core-enum-types.h.template \ + libnm-core/meson.build \ libnm-core/tests/certs/ca-no-ending-newline.pem \ libnm-core/tests/certs/pkcs8-decrypted.der \ libnm-core/tests/certs/pkcs8-enc-key.pem \ @@ -3514,17 +3537,23 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ libnm-core/tests/certs/test-key-and-cert.pem \ libnm-core/tests/certs/test-key-only-decrypted.der \ libnm-core/tests/certs/test-key-only-decrypted.pem \ - libnm-core/tests/certs/test-key-only.pem libnm/libnm.pc.in \ - libnm/libnm.ver $(am__append_17) \ + libnm-core/tests/certs/test-key-only.pem \ + libnm-core/tests/nm-core-tests-enum-types.c.template \ + libnm-core/tests/nm-core-tests-enum-types.h.template \ + libnm-core/tests/meson.build libnm/libnm.pc.in libnm/libnm.ver \ + libnm/fake-typelib/NetworkManager.gir \ + libnm/fake-typelib/NMClient.gir \ + libnm/fake-typelib/typelibs.gresource.xml \ + libnm/fake-typelib/meson.build $(am__append_19) \ libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \ + libnm/nm-enum-types.c.template libnm/nm-enum-types.h.template \ + libnm/meson.build libnm/tests/meson.build \ + shared/c-list/src/c-list.h src/systemd/meson.build \ src/org.freedesktop.NetworkManager.conf \ - src/nm-test-utils-core.h \ + src/nm-test-utils-core.h src/meson.build src/dhcp/meson.build \ src/dhcp/tests/test-dhclient-duid.leases \ src/dhcp/tests/test-dhclient-commented-duid.leases \ - src/dhcp/tests/leases/basic.leases \ - src/dhcp/tests/leases/malformed1.leases \ - src/dhcp/tests/leases/malformed2.leases \ - src/dhcp/tests/leases/malformed3.leases \ + src/dhcp/tests/meson.build src/ppp/meson.build \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wired_Connection \ src/settings/plugins/keyfile/tests/keyfiles/Test_GSM_Connection \ src/settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection \ @@ -3562,7 +3591,9 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/keyfile/tests/keyfiles/Test_TC_Config \ src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \ src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem \ - $(am__append_26) \ + src/settings/plugins/keyfile/tests/meson.build \ + $(am__append_29) src/settings/plugins/ibft/meson.build \ + src/settings/plugins/ibft/tests/meson.build \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-a.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected \ @@ -3625,6 +3656,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sit-ignore \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc \ + src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 \ src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid \ @@ -3752,6 +3785,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/ifcfg-rh/tests/network-scripts/test_ca_cert.pem \ $(NULL) src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf \ src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.xml \ + src/settings/plugins/ifcfg-rh/meson.build \ + src/settings/plugins/ifcfg-rh/tests/meson.build \ src/settings/plugins/ifupdown/tests/test1 \ src/settings/plugins/ifupdown/tests/test2 \ src/settings/plugins/ifupdown/tests/test3 \ @@ -3775,14 +3810,19 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/settings/plugins/ifupdown/tests/test20-source-stanza.eth1 \ src/settings/plugins/ifupdown/tests/test21-source-dir-stanza \ src/settings/plugins/ifupdown/tests/test21-source-dir-stanza.d \ - src/settings/plugins/ifnet/tests/net \ - src/settings/plugins/ifnet/tests/net.all \ - src/settings/plugins/ifnet/tests/nm-system-settings.conf \ - src/settings/plugins/ifnet/tests/wpa_supplicant.conf \ - src/settings/plugins/ifnet/tests/test_ca_cert.pem \ - src/devices/wwan/libnm-wwan.ver data/NetworkManager-ovs.conf \ + src/settings/plugins/ifupdown/meson.build \ + src/settings/plugins/ifupdown/tests/meson.build \ + src/devices/meson.build src/devices/adsl/meson.build \ + src/devices/wwan/libnm-wwan.ver src/devices/wwan/meson.build \ + src/devices/bluetooth/meson.build src/devices/wifi/meson.build \ + src/devices/wifi/tests/meson.build \ + src/devices/team/meson.build data/NetworkManager-ovs.conf \ + src/devices/ovs/meson.build src/dnsmasq/tests/meson.build \ + src/platform/tests/meson.build src/devices/tests/meson.build \ + src/ndisc/tests/meson.build \ src/supplicant/tests/certs/test-ca-cert.pem \ src/supplicant/tests/certs/test-cert.p12 \ + src/supplicant/tests/meson.build \ src/tests/config/NetworkManager.conf \ src/tests/config/NetworkManager.state \ src/tests/config/bad.conf \ @@ -3791,9 +3831,10 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ src/tests/config/conf.d/10-more.conf \ src/tests/config/conf.d/20-config-enable-1.conf \ src/tests/config/conf.d/90-last.conf \ - src/tests/test-secret-agent.py dispatcher/nm-dispatcher.conf \ + src/tests/config/meson.build src/tests/test-secret-agent.py \ + src/tests/meson.build dispatcher/nm-dispatcher.conf \ dispatcher/org.freedesktop.nm_dispatcher.service.in \ - dispatcher/nm-dispatcher.xml \ + dispatcher/nm-dispatcher.xml dispatcher/meson.build \ dispatcher/tests/dispatcher-connectivity-full \ dispatcher/tests/dispatcher-connectivity-unknown \ dispatcher/tests/dispatcher-down \ @@ -3801,33 +3842,44 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ dispatcher/tests/dispatcher-up \ dispatcher/tests/dispatcher-vpn-down \ dispatcher/tests/dispatcher-vpn-up \ - $(clients_common_settings_doc_c) \ - $(clients_common_settings_doc_c).in \ - clients/cli/nmcli-completion clients/common/settings-docs.xsl \ - data/NetworkManager.service.in \ + dispatcher/tests/meson.build clients/meson.build \ + $(clients_common_settings_doc_h) \ + $(clients_common_settings_doc_h).in \ + clients/cli/nmcli-completion clients/cli/meson.build \ + clients/common/settings-docs.xsl clients/common/meson.build \ + clients/common/tests/meson.build clients/tui/meson.build \ + clients/tui/newt/meson.build clients/tests/test-client.py \ + clients/tests/test-client.check-on-disk/Makefile.am \ + $(clients_tests_expected_files) data/NetworkManager.service.in \ data/NetworkManager-wait-online.service.in \ data/NetworkManager-wait-online-systemd-pre200.service.in \ data/NetworkManager-dispatcher.service.in \ data/org.freedesktop.NetworkManager.service.in \ data/84-nm-drivers.rules data/85-nm-unmanaged.rules \ - data/server.conf.in $(am__append_79) $(am__append_96) \ - $(am__append_99) man/common.ent.in $(man_nm_settings_xml) \ - $(addsuffix .xsl,$(basename $(man_nm_settings_xml))) \ - $(man_pages) $(addsuffix .xml,$(basename $(man_pages))) \ - $(man_pages_autogen) vapi/NM-1.0.metadata \ + data/90-nm-thunderbolt.rules data/server.conf.in \ + data/meson.build $(am__append_81) libnm-glib/tests/meson.build \ + $(am__append_101) $(am__append_104) man/common.ent.in \ + $(man_nm_settings_xml) $(addsuffix .xsl,$(basename \ + $(man_nm_settings_xml))) $(man_pages) $(addsuffix \ + .xml,$(basename $(man_pages))) $(man_pages_autogen) \ + man/meson.build vapi/NM-1.0.metadata \ vapi/NetworkManager-1.0.metadata vapi/NMClient-1.0.metadata \ vapi/libnm.deps vapi/libnm-util.deps vapi/libnm-glib.deps \ - CONTRIBUTING NetworkManager.pc.in intltool-extract.in \ - intltool-merge.in intltool-update.in linker-script-binary.ver \ - linker-script-devices.ver linker-script-settings.ver \ - src/ppp/nm-ppp-plugin.ver Makefile.glib autogen.sh \ - valgrind.suppressions shared/nm-common-macros.h \ + vapi/meson.build CONTRIBUTING NetworkManager.pc.in \ + intltool-extract.in intltool-merge.in intltool-update.in \ + linker-script-binary.ver linker-script-devices.ver \ + linker-script-settings.ver src/ppp/nm-ppp-plugin.ver \ + Makefile.glib autogen.sh valgrind.suppressions meson.build \ + meson_options.txt meson_post_install.py config.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/c-list.h \ - shared/nm-utils/c-list-util.c shared/nm-utils/c-list-util.h \ + shared/nm-test-utils-impl.c shared/nm-utils/c-list-util.c \ + shared/nm-utils/c-list-util.h \ shared/nm-utils/gsystem-local-alloc.h \ - shared/nm-utils/nm-glib.h shared/nm-utils/nm-obj.h \ + shared/nm-utils/nm-c-list.h shared/nm-utils/nm-compat.c \ + shared/nm-utils/nm-compat.h shared/nm-utils/nm-glib.h \ + shared/nm-utils/nm-jansson.h shared/nm-utils/nm-obj.h \ shared/nm-utils/nm-macros-internal.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ @@ -3837,18 +3889,19 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h \ shared/nm-utils/unaligned.h shared/nm-version-macros.h.in \ - tools/check-exports.sh tools/create-exports-NetworkManager.sh \ - tools/debug-helper.py tools/run-nm-test.sh \ - tools/test-networkmanager-service.py \ + shared/meson.build tools/check-docs.sh tools/check-exports.sh \ + tools/create-exports-NetworkManager.sh tools/debug-helper.py \ + tools/run-nm-test.sh tools/test-networkmanager-service.py \ tools/test-sudo-wrapper.sh tools/enums-to-docbook.pl \ - src/settings/plugins/README $(NULL) \ + src/settings/plugins/README 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 \ - examples/C/qt/monitor-nm-running.cpp \ + examples/C/qt/monitor-nm-running.cpp examples/C/qt/meson.build \ examples/dispatcher/10-ifcfg-rh-routes.sh \ examples/dispatcher/70-wifi-wired-exclusive.sh \ - examples/lua/lgi/add-connection.lua \ + examples/js/get_ips.js examples/lua/lgi/add-connection.lua \ examples/lua/lgi/list-connections.lua \ examples/lua/lgi/list-devices.lua \ examples/lua/lgi/show-wifi-networks.lua \ @@ -3858,7 +3911,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ examples/lua/lgi/deactivate-all.lua \ examples/nm-conf.d/30-anon.conf \ examples/nm-conf.d/31-mac-addr-change.conf \ - examples/python/dbus/nm-state.py \ + examples/python/nmex.py examples/python/dbus/nm-state.py \ examples/python/dbus/add-connection.py \ examples/python/dbus/add-connection-compat.py \ examples/python/dbus/add-wifi-eap-connection.py \ @@ -3893,16 +3946,17 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ examples/shell/get-hostname.sh examples/shell/list-devices.sh \ examples/shell/disconnect-device.sh \ examples/shell/active-wifi.sh $(NULL) -EXTRA_LTLIBRARIES = $(am__append_57) +EXTRA_LTLIBRARIES = $(am__append_59) dist_hook = dist-hook-settings-ifcfg-rh-alias-files dist_dependencies = libnm-core/nm-vpn-dbus-types.xml \ - libnm-core/nm-dbus-types.xml $(am__append_89) $(am__append_97) \ - $(am__append_100) $(man_pages) $(man_pages_autogen) + libnm-core/nm-dbus-types.xml $(am__append_91) \ + $(am__append_102) $(am__append_105) $(man_pages) \ + $(man_pages_autogen) dist_configure_check = $(am__append_3) $(am__append_4) -install_data_hook = install-data-hook-dispatcher $(am__append_64) \ - $(am__append_101) -install_exec_hook = $(am__append_68) -uninstall_hook = $(am__append_65) $(am__append_69) $(am__append_102) +install_data_hook = $(am__append_37) install-data-hook-dispatcher \ + $(am__append_66) $(am__append_106) +install_exec_hook = $(am__append_70) +uninstall_hook = $(am__append_67) $(am__append_71) $(am__append_107) BUILT_SOURCES = libnm-core/nm-vpn-dbus-types.xml \ libnm-core/nm-dbus-types.xml $(gir_DATA) $(typelib_DATA) GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ @@ -3910,12 +3964,12 @@ GLIB_GENERATED = $(libnm_core_lib_h_pub_mkenums) \ libnm-core/tests/nm-core-tests-enum-types.h \ libnm-core/tests/nm-core-tests-enum-types.c \ $(libnm_lib_h_pub_mkenums) $(libnm_lib_c_mkenums) \ - $(am__append_72) + $(am__append_74) man_pages = man/NetworkManager.8 man/NetworkManager.conf.5 \ man/nm-online.1 man/nmcli-examples.7 man/nmcli.1 man/nmtui.1 \ - $(am__append_95) + $(am__append_100) man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ - $(am__append_98) + $(am__append_103) ############################################################################### @@ -3943,12 +3997,12 @@ check_programs = libnm-core/tests/test-compare \ libnm-core/tests/test-keyfile libnm-core/tests/test-secrets \ libnm-core/tests/test-setting \ libnm-core/tests/test-settings-defaults \ - $(libnm_tests_programs) src/dhcp/tests/test-dhcp-dhclient \ + $(libnm_tests_programs) $(am__append_20) \ + src/dhcp/tests/test-dhcp-dhclient \ src/dhcp/tests/test-dhcp-utils \ src/settings/plugins/keyfile/tests/test-keyfile \ - $(am__append_25) $(am__append_32) $(am__append_37) \ - $(am__append_41) $(am__append_50) \ - src/dnsmasq/tests/test-dnsmasq-utils \ + $(am__append_28) $(am__append_35) $(am__append_42) \ + $(am__append_52) src/dnsmasq/tests/test-dnsmasq-utils \ src/platform/tests/test-link-fake \ src/platform/tests/test-link-linux \ src/platform/tests/test-address-fake \ @@ -3959,26 +4013,26 @@ check_programs = libnm-core/tests/test-compare \ src/platform/tests/test-route-linux \ src/platform/tests/test-cleanup-fake \ src/platform/tests/test-cleanup-linux \ - src/devices/tests/test-lldp src/devices/tests/test-arping \ + src/devices/tests/test-lldp src/devices/tests/test-acd \ src/ndisc/tests/test-ndisc-fake \ src/supplicant/tests/test-supplicant-config \ src/tests/config/test-config src/tests/test-general \ src/tests/test-general-with-expect src/tests/test-ip4-config \ src/tests/test-ip6-config src/tests/test-dcb \ - src/tests/test-systemd src/tests/test-resolvconf-capture \ - src/tests/test-wired-defname src/tests/test-utils \ - dispatcher/tests/test-dispatcher-envp $(am__append_58) \ - $(am__append_59) $(am__append_90) -check_programs_norun = src/platform/tests/monitor \ - src/ndisc/tests/test-ndisc-linux $(am__append_91) \ - examples/C/glib/add-connection-gdbus \ + src/tests/test-systemd src/tests/test-wired-defname \ + src/tests/test-utils dispatcher/tests/test-dispatcher-envp \ + $(am__append_60) $(am__append_61) $(am__append_92) \ + $(am__append_97) +check_programs_norun = $(am__append_21) src/platform/tests/monitor \ + src/ndisc/tests/test-ndisc-linux $(am__append_93) \ + $(am__append_98) examples/C/glib/add-connection-gdbus \ examples/C/glib/add-connection-libnm \ examples/C/glib/get-active-connections-gdbus \ examples/C/glib/get-ap-info-libnm \ examples/C/glib/list-connections-gdbus \ examples/C/glib/list-connections-libnm \ examples/C/glib/monitor-nm-running-gdbus \ - examples/C/glib/monitor-nm-state-gdbus $(am__append_113) + examples/C/glib/monitor-nm-state-gdbus $(am__append_118) ############################################################################### @@ -3987,52 +4041,61 @@ check_programs_norun = src/platform/tests/monitor \ ############################################################################### check_ltlibraries = libnm/tests/libnm-vpn-plugin-utils-test.la \ src/libNetworkManagerTest.la clients/common/libnmc-base.la \ - $(am__append_56) $(am__append_80) -check_local = check-local-exports-libnm $(am__append_27) \ - $(am__append_31) $(am__append_36) $(am__append_40) \ - check-local-devices-adsl $(am__append_44) $(am__append_49) \ - $(am__append_52) $(am__append_55) $(am__append_88) -VAPIGEN_VAPIS = $(am__append_105) $(am__append_106) -dbusservice_DATA = $(am__append_33) dispatcher/nm-dispatcher.conf \ + $(am__append_58) $(am__append_82) +check_local = check-docs check-local-exports-libnm $(am__append_30) \ + $(am__append_34) $(am__append_41) check-local-devices-adsl \ + $(am__append_45) $(am__append_51) $(am__append_54) \ + $(am__append_57) check-local-clients-tests-test-client \ + $(am__append_90) $(am__append_96) +VAPIGEN_VAPIS = $(am__append_110) $(am__append_111) +dbusservice_DATA = $(am__append_38) dispatcher/nm-dispatcher.conf \ src/org.freedesktop.NetworkManager.conf dbusactivation_DATA = \ dispatcher/org.freedesktop.nm_dispatcher.service -INTROSPECTION_GIRS = $(am__append_15) $(am__append_87) +INTROSPECTION_GIRS = $(am__append_16) $(am__append_89) INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is # executed, to suppress possible errors -INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) +INTROSPECTION_SCANNER_ENV = $(SANITIZER_ENV) LDFLAGS="$(SANITIZER_LIB_LDFLAGS)" libnmincludedir = $(includedir)/libnm libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \ - $(libnm_lib_h_pub_real) $(libnm_lib_h_pub_nointrospect) + $(libnm_lib_h_pub_real) nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_mkenums) pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_85) +pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_87) pppd_plugindir = $(PPPD_PLUGIN_DIR) -pppd_plugin_LTLIBRARIES = $(am__append_22) +pppd_plugin_LTLIBRARIES = $(am__append_25) vapidir = $(datadir)/vala/vapi -vapi_DATA = $(am__append_107) +vapi_DATA = $(am__append_112) examplesdir = $(docdir)/examples rundir = $(runstatedir)/NetworkManager statedir = $(localstatedir)/lib/NetworkManager +plugindir = $(pkglibdir)/$(NM_DIST_VERSION) dbusactivationdir = $(datadir)/dbus-1/system-services servicedir = $(datadir)/dbus-1/system-services completiondir = $(datadir)/bash-completion/completions +nmlocaledir = $(datadir)/locale GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM SUBDIRS = . po $(am__append_1) $(am__append_2) ############################################################################### +nm_build_cflags = \ + -DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \ + -DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \ + $(NULL) + set_sanitizer_env = \ [ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \ - if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \ - export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ + if echo $(SANITIZER_LIB_CFLAGS) $(SANITIZER_EXEC_CFLAGS) | grep -e -fsanitize=address > /dev/null; then \ + [ -n "$(1)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \ + [ -n "$(2)" ] && export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(2) | grep libasan\.so\.. -o | head -n 1)"; \ fi check_so_symbols = \ - $(call set_sanitizer_env,$(1)); \ + $(call set_sanitizer_env,$(1),$(builddir)/src/NetworkManager); \ LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(builddir)/src/NetworkManager --version >/dev/null @@ -4040,13 +4103,13 @@ check_so_symbols = \ DISTCHECK_CONFIGURE_FLAGS = \ --enable-tests=yes \ --with-valgrind=no \ + --with-libnm-glib=yes \ --enable-gtk-doc \ --enable-more-warnings=error \ --with-udev-dir=$$dc_install_base/lib/udev \ --with-wext=no \ --enable-ifcfg-rh \ --enable-ifupdown \ - --enable-ifnet \ --disable-dependency-tracking @@ -4056,15 +4119,7 @@ dist_polkit_policy_in_in_files = \ data/org.freedesktop.NetworkManager.policy.in.in polkit_policy_DATA = $(dist_polkit_policy_in_in_files:.policy.in.in=.policy) - -# gdbus-codegen 2.38 will emit code that requires glib 2.38, which -# will then cause availability warnings if we define -# GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32. -# -# This is fixed in GLib 2.40 (it emits code that takes -# GLIB_VERSION_MAX_ALLOWED into account), so this workaround can go -# away when we depend on that. -introspection_libnmdbus_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(GLIB_CFLAGS)) +introspection_libnmdbus_la_CPPFLAGS = $(GLIB_CFLAGS) introspection_sources = \ introspection/org.freedesktop.NetworkManager.AccessPoint.c \ introspection/org.freedesktop.NetworkManager.AccessPoint.h \ @@ -4307,54 +4362,67 @@ libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \ shared/nm-utils/nm-hash-utils.h \ shared/nm-utils/nm-shared-utils.h \ shared/nm-utils/nm-random-utils.h \ - shared/nm-utils/nm-udev-utils.h shared/nm-utils/siphash24.h \ - shared/nm-meta-setting.h libnm-core/crypto.h \ - libnm-core/nm-connection-private.h \ + shared/nm-utils/nm-udev-utils.h shared/nm-meta-setting.h \ + libnm-core/crypto.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 \ libnm-core/nm-property-compare.h \ libnm-core/nm-setting-private.h libnm-core/nm-utils-private.h \ $(am__append_6) -libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \ - shared/nm-utils/nm-dedup-multi.c \ - shared/nm-utils/nm-enum-utils.c \ - shared/nm-utils/nm-hash-utils.c \ - shared/nm-utils/nm-shared-utils.c \ - shared/nm-utils/nm-random-utils.c \ - shared/nm-utils/nm-udev-utils.c shared/nm-utils/siphash24.c \ - shared/nm-meta-setting.c libnm-core/crypto.c \ - libnm-core/nm-connection.c libnm-core/nm-dbus-utils.c \ - libnm-core/nm-errors.c libnm-core/nm-keyfile-reader.c \ - libnm-core/nm-keyfile-utils.c libnm-core/nm-keyfile-writer.c \ - libnm-core/nm-property-compare.c libnm-core/nm-setting-8021x.c \ - libnm-core/nm-setting-adsl.c libnm-core/nm-setting-bluetooth.c \ +libnm_core_lib_c_settings_real = \ + libnm-core/nm-setting-8021x.c \ + libnm-core/nm-setting-adsl.c \ + libnm-core/nm-setting-bluetooth.c \ libnm-core/nm-setting-bond.c \ libnm-core/nm-setting-bridge-port.c \ - libnm-core/nm-setting-bridge.c libnm-core/nm-setting-cdma.c \ - libnm-core/nm-setting-connection.c libnm-core/nm-setting-dcb.c \ - libnm-core/nm-setting-dummy.c libnm-core/nm-setting-generic.c \ - libnm-core/nm-setting-gsm.c libnm-core/nm-setting-infiniband.c \ + libnm-core/nm-setting-bridge.c \ + libnm-core/nm-setting-cdma.c \ + libnm-core/nm-setting-connection.c \ + libnm-core/nm-setting-dcb.c \ + libnm-core/nm-setting-dummy.c \ + libnm-core/nm-setting-generic.c \ + libnm-core/nm-setting-gsm.c \ + libnm-core/nm-setting-infiniband.c \ libnm-core/nm-setting-ip-config.c \ libnm-core/nm-setting-ip-tunnel.c \ libnm-core/nm-setting-ip4-config.c \ libnm-core/nm-setting-ip6-config.c \ - libnm-core/nm-setting-macsec.c libnm-core/nm-setting-macvlan.c \ + libnm-core/nm-setting-macsec.c \ + libnm-core/nm-setting-macvlan.c \ libnm-core/nm-setting-olpc-mesh.c \ libnm-core/nm-setting-ovs-bridge.c \ libnm-core/nm-setting-ovs-interface.c \ libnm-core/nm-setting-ovs-patch.c \ - libnm-core/nm-setting-ovs-port.c libnm-core/nm-setting-ppp.c \ - libnm-core/nm-setting-pppoe.c libnm-core/nm-setting-proxy.c \ + libnm-core/nm-setting-ovs-port.c \ + libnm-core/nm-setting-ppp.c \ + libnm-core/nm-setting-pppoe.c \ + libnm-core/nm-setting-proxy.c \ libnm-core/nm-setting-serial.c \ libnm-core/nm-setting-tc-config.c \ - libnm-core/nm-setting-team-port.c libnm-core/nm-setting-team.c \ - libnm-core/nm-setting-tun.c libnm-core/nm-setting-user.c \ - libnm-core/nm-setting-vlan.c libnm-core/nm-setting-vpn.c \ - libnm-core/nm-setting-vxlan.c libnm-core/nm-setting-wimax.c \ + libnm-core/nm-setting-team-port.c \ + libnm-core/nm-setting-team.c \ + libnm-core/nm-setting-tun.c \ + libnm-core/nm-setting-user.c \ + libnm-core/nm-setting-vlan.c \ + libnm-core/nm-setting-vpn.c \ + libnm-core/nm-setting-vxlan.c \ + libnm-core/nm-setting-wimax.c \ libnm-core/nm-setting-wired.c \ libnm-core/nm-setting-wireless-security.c \ - libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ + libnm-core/nm-setting-wireless.c + +libnm_core_lib_c_real = $(libnm_core_lib_c_settings_real) \ + shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \ + shared/nm-utils/nm-enum-utils.c \ + shared/nm-utils/nm-hash-utils.c \ + shared/nm-utils/nm-shared-utils.c \ + shared/nm-utils/nm-random-utils.c \ + shared/nm-utils/nm-udev-utils.c shared/nm-meta-setting.c \ + libnm-core/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_7) \ @@ -4367,19 +4435,16 @@ libnm_core_lib_c_mkenums = \ dflt_cppflags_libnm_core = -I$(srcdir)/shared -I$(builddir)/shared \ -I$(srcdir)/libnm-core -I$(builddir)/libnm-core \ $(CODE_COVERAGE_CFLAGS) $(GLIB_CFLAGS) $(LIBUDEV_CFLAGS) \ - $(am__append_8) $(am__append_9) $(am__append_10) + $(SANITIZER_LIB_CFLAGS) $(am__append_8) $(am__append_9) nm_core_enum_types_sources = $(libnm_core_lib_h_pub_real) nm_core_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' -libnm_core_libnm_core_la_CPPFLAGS = \ - $(dflt_cppflags_libnm_core) \ +libnm_core_libnm_core_la_CPPFLAGS = $(dflt_cppflags_libnm_core) \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DLOCALEDIR=\"$(datadir)/locale\" \ - -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLIBDIR=\"$(nmlibdir)\" \ - -DNMPLUGINDIR=\"$(pkglibdir)\" \ - -DLIBEXECDIR=\"$(libexecdir)\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB - + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" -DNMCONFDIR=\"$(nmconfdir)\" \ + -DNMLIBDIR=\"$(nmlibdir)\" -DNMVPNDIR=\"$(pkglibdir)\" \ + -DNMPLUGINDIR=\"$(plugindir)\" -DLIBEXECDIR=\"$(libexecdir)\" \ + $(NULL) $(am__append_10) libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_h_pub_real) \ $(libnm_core_lib_h_priv) \ @@ -4389,17 +4454,22 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_h_pub_mkenums) \ $(libnm_core_lib_c_mkenums) -libnm_core_libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) \ - $(LIBUDEV_LIBS) $(am__append_12) $(am__append_14) +libnm_core_libnm_core_la_LIBADD = shared/libcsiphash.la $(GLIB_LIBS) \ + $(UUID_LIBS) $(LIBUDEV_LIBS) $(NULL) $(am__append_12) \ + $(am__append_14) libnm_core_libnm_core_la_LDFLAGS = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) nm_core_tests_enum_types_sources = libnm-core/tests/test-general-enums.h libnm_core_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm-core/tests \ -I$(builddir)/libnm-core/tests \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ + $(NULL) libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags) libnm_core_tests_test_crypto_CPPFLAGS = $(libnm_core_tests_cppflags) @@ -4420,6 +4490,9 @@ libnm_core_tests_ldadd = \ libnm-core/libnm-core.la \ $(GLIB_LIBS) +libnm_core_tests_ldflags = \ + $(SANITIZER_LIB_LDFLAGS) + libnm_core_tests_test_compare_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_crypto_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_general_LDADD = $(libnm_core_tests_ldadd) @@ -4427,6 +4500,13 @@ libnm_core_tests_test_keyfile_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_secrets_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_setting_LDADD = $(libnm_core_tests_ldadd) libnm_core_tests_test_settings_defaults_LDADD = $(libnm_core_tests_ldadd) +libnm_core_tests_test_compare_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_crypto_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_general_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_keyfile_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_secrets_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_setting_LDFLAGS = $(libnm_core_tests_ldflags) +libnm_core_tests_test_settings_defaults_LDFLAGS = $(libnm_core_tests_ldflags) ############################################################################### libnm_lib_h_pub_real = \ @@ -4434,6 +4514,8 @@ libnm_lib_h_pub_real = \ libnm/NetworkManager.h \ libnm/nm-access-point.h \ libnm/nm-active-connection.h \ + libnm/nm-autoptr.h \ + libnm/nm-checkpoint.h \ libnm/nm-client.h \ libnm/nm-device-adsl.h \ libnm/nm-device-bond.h \ @@ -4463,15 +4545,13 @@ libnm_lib_h_pub_real = \ libnm/nm-ip-config.h \ libnm/nm-object.h \ libnm/nm-remote-connection.h \ + libnm/nm-secret-agent-old.h \ libnm/nm-types.h \ libnm/nm-vpn-connection.h \ libnm/nm-vpn-editor.h \ - libnm/nm-wimax-nsp.h - -libnm_lib_h_pub_nointrospect = \ - libnm/nm-secret-agent-old.h \ libnm/nm-vpn-plugin-old.h \ - libnm/nm-vpn-service-plugin.h + libnm/nm-vpn-service-plugin.h \ + libnm/nm-wimax-nsp.h libnm_lib_h_pub_mkenums = \ libnm/nm-enum-types.h @@ -4493,6 +4573,7 @@ libnm_lib_h_priv = \ libnm_lib_c_real = \ libnm/nm-access-point.c \ libnm/nm-active-connection.c \ + libnm/nm-checkpoint.c \ libnm/nm-client.c \ libnm/nm-dbus-helpers.c \ libnm/nm-device-adsl.c \ @@ -4545,10 +4626,11 @@ libnm_lib_cppflags = \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DNMRUNDIR=\"$(nmrundir)\" + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + $(NULL) libnm_libnm_utils_la_CPPFLAGS = \ + $(INTROSPECTION_CFLAGS) \ $(libnm_lib_cppflags) libnm_libnm_utils_la_SOURCES = \ @@ -4561,18 +4643,17 @@ libnm_libnm_utils_la_LIBADD = \ nm_enum_types_sources = \ $(libnm_lib_h_pub_mkenums) \ - $(libnm_lib_h_pub_real) \ - $(libnm_lib_h_pub_nointrospect) + $(libnm_lib_h_pub_real) nm_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include \n' nm_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' libnm_libnm_la_CPPFLAGS = \ $(libnm_lib_cppflags) \ - $(LIBUDEV_CFLAGS) + $(LIBUDEV_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) libnm_libnm_la_SOURCES = \ $(libnm_lib_h_pub_real) \ - $(libnm_lib_h_pub_nointrospect) \ $(libnm_lib_h_priv) \ $(libnm_lib_c_real) @@ -4593,8 +4674,10 @@ libnm_libnm_la_LIBADD = \ libnm_libnm_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/libnm/libnm.ver" \ $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_LIB_LDFLAGS) \ -version-info "1:0:1" +libnm_NM_1_0_typelib = $(am__append_15) @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_INCLUDES = Gio-2.0 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_PACKAGES = gio-2.0 @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_EXPORT_PACKAGES = libnm @@ -4607,11 +4690,13 @@ libnm_libnm_la_LDFLAGS = \ @HAVE_INTROSPECTION_TRUE@ $(libnm_core_lib_c_real) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_h_pub_mkenums) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_h_pub_real) \ -@HAVE_INTROSPECTION_TRUE@ $(libnm_lib_h_pub_nointrospect) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_c_mkenums) \ @HAVE_INTROSPECTION_TRUE@ $(libnm_lib_c_real) @HAVE_INTROSPECTION_TRUE@libnm_NM_1_0_gir_SCANNERFLAGS = --warn-all --identifier-prefix=NM --symbol-prefix=nm +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@nodist_libnm_libnm_utils_la_SOURCES = \ +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ libnm/fake-typelib/typelibs.c + @HAVE_INTROSPECTION_TRUE@libnm_noinst_data = \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-property-docs.xml \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-settings-docs-overrides.xml \ @@ -4619,11 +4704,13 @@ libnm_libnm_la_LDFLAGS = \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-settings-keyfile-docs.xml \ @HAVE_INTROSPECTION_TRUE@ libnm/nm-settings-ifcfg-rh-docs.xml -@HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_real) +@HAVE_INTROSPECTION_TRUE@libnm_docs_sources = $(libnm_core_lib_c_settings_real) ############################################################################### libnm_tests_programs = \ - libnm/tests/test-general \ + libnm/tests/test-general + +libnm_tests_programs_req_introspection = \ libnm/tests/test-nm-client \ libnm/tests/test-remote-settings-client \ libnm/tests/test-secret-agent @@ -4632,18 +4719,24 @@ libnm_tests_cppflags = \ $(dflt_cppflags_libnm_core) \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \ - -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \ + $(NULL) libnm_tests_ldadd = \ libnm/libnm.la \ $(GLIB_LIBS) +libnm_tests_ldflags = \ + $(SANITIZER_LIB_LDFLAGS) + libnm_tests_test_general_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_nm_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_remote_settings_client_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_secret_agent_CPPFLAGS = $(libnm_tests_cppflags) libnm_tests_test_general_SOURCES = \ + shared/nm-utils/nm-compat.c \ libnm/tests/test-general.c libnm_tests_test_nm_client_SOURCES = \ @@ -4668,6 +4761,10 @@ libnm_tests_test_general_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) +libnm_tests_test_general_LDFLAGS = $(libnm_tests_ldflags) +libnm_tests_test_nm_client_LDFLAGS = $(libnm_tests_ldflags) +libnm_tests_test_remote_settings_client_LDFLAGS = $(libnm_tests_ldflags) +libnm_tests_test_secret_agent_LDFLAGS = $(libnm_tests_ldflags) libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \ shared/nm-utils/nm-vpn-plugin-utils.c \ shared/nm-utils/nm-vpn-plugin-utils.h @@ -4679,7 +4776,10 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm \ -I$(builddir)/libnm \ - $(GLIB_CFLAGS) + $(GLIB_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \ $(GLIB_LIBS) @@ -4694,8 +4794,7 @@ src_cppflags = \ -I$(builddir)/src \ \ -DPREFIX=\"$(prefix)\" \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ @@ -4707,8 +4806,8 @@ src_cppflags = \ -DRUNDIR=\"$(rundir)\" \ \ -DNMCONFDIR=\"$(nmconfdir)\" \ - -DNMLOCALEDIR=\"$(datadir)/locale\" \ - -DNMPLUGINDIR=\"$(pkglibdir)\" \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" \ + -DNMPLUGINDIR=\"$(plugindir)\" \ -DNMRUNDIR=\"$(nmrundir)\" \ -DNMSTATEDIR=\"$(nmstatedir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ @@ -4718,7 +4817,6 @@ src_cppflags = \ -DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \ \ $(LIBUDEV_CFLAGS) \ - $(LIBNL_CFLAGS) \ $(LIBNDP_CFLAGS) \ $(LIBPSL_CFLAGS) \ $(LIBCURL_CFLAGS) \ @@ -4726,10 +4824,32 @@ src_cppflags = \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ $(SYSTEMD_JOURNAL_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ \ $(NULL) src_ldflags = $(CODE_COVERAGE_LDFLAGS) +shared_libcsiphash_la_CPPFLAGS = \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + $(NULL) + +shared_libcsiphash_la_SOURCES = \ + shared/c-siphash/src/c-siphash.c \ + shared/c-siphash/src/c-siphash.h + +shared_libnacd_la_CFLAGS = -std=gnu99 +shared_libnacd_la_CPPFLAGS = \ + $(CODE_COVERAGE_CFLAGS) \ + $(SANITIZER_LIB_CFLAGS) \ + -I$(srcdir)/shared/c-list/src \ + -I$(srcdir)/shared/c-siphash/src \ + $(NULL) + +shared_libnacd_la_SOURCES = \ + shared/n-acd/src/n-acd.c \ + shared/n-acd/src/n-acd.h + ############################################################################### src_libsystemd_nm_la_cppflags = \ @@ -4739,12 +4859,12 @@ src_libsystemd_nm_la_cppflags = \ -I$(builddir)/libnm-core \ -I$(srcdir)/src \ -I$(srcdir)/src/systemd/sd-adapt \ - -I$(srcdir)/shared/nm-utils \ -I$(srcdir)/src/systemd/src/systemd \ -I$(srcdir)/src/systemd/src/basic \ -I$(srcdir)/src/systemd/src/shared \ -I$(srcdir)/src/systemd/src/libsystemd-network \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \ + $(LIBSYSTEMD_NM_CFLAGS) \ $(GLIB_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) @@ -4763,24 +4883,32 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/sd-adapt/cgroup-util.h \ src/systemd/sd-adapt/condition.h \ src/systemd/sd-adapt/conf-parser.h \ + src/systemd/sd-adapt/copy.h \ src/systemd/sd-adapt/def.h \ + src/systemd/sd-adapt/device-nodes.h \ src/systemd/sd-adapt/dirent-util.h \ src/systemd/sd-adapt/env-util.h \ + src/systemd/sd-adapt/errno-list.h \ src/systemd/sd-adapt/format-util.h \ + src/systemd/sd-adapt/glob-util.h \ src/systemd/sd-adapt/gunicode.h \ src/systemd/sd-adapt/ioprio.h \ src/systemd/sd-adapt/khash.h \ src/systemd/sd-adapt/libudev.h \ + src/systemd/sd-adapt/locale-util.h \ + src/systemd/sd-adapt/memfd-util.h \ src/systemd/sd-adapt/missing.h \ src/systemd/sd-adapt/mkdir.h \ + src/systemd/sd-adapt/procfs-util.h \ src/systemd/sd-adapt/raw-clone.h \ src/systemd/sd-adapt/sd-daemon.h \ src/systemd/sd-adapt/stat-util.h \ + src/systemd/sd-adapt/terminal-util.h \ src/systemd/sd-adapt/udev-util.h \ src/systemd/sd-adapt/udev.h \ + src/systemd/sd-adapt/unaligned.h \ src/systemd/sd-adapt/user-util.h \ src/systemd/sd-adapt/virt.h \ - src/systemd/sd-adapt/glob-util.h \ src/systemd/src/basic/alloc-util.c \ src/systemd/src/basic/alloc-util.h \ src/systemd/src/basic/async.h \ @@ -4826,9 +4954,12 @@ src_libsystemd_nm_la_SOURCES = \ src/systemd/src/basic/refcnt.h \ src/systemd/src/basic/set.h \ src/systemd/src/basic/signal-util.h \ + src/systemd/src/basic/siphash24.h \ src/systemd/src/basic/socket-util.c \ src/systemd/src/basic/socket-util.h \ src/systemd/src/basic/sparse-endian.h \ + src/systemd/src/basic/stat-util.c \ + src/systemd/src/basic/stat-util.h \ src/systemd/src/basic/stdio-util.h \ src/systemd/src/basic/string-table.c \ src/systemd/src/basic/string-table.h \ @@ -4898,6 +5029,7 @@ src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags) src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/nm-core-utils.h src/nm-logging.c src/nm-logging.h \ src/NetworkManagerUtils.c src/NetworkManagerUtils.h \ + src/platform/nm-netlink.c src/platform/nm-netlink.h \ src/platform/nmp-netns.c src/platform/nmp-netns.h \ src/platform/nmp-object.c src/platform/nmp-object.h \ src/platform/nm-platform-utils.c \ @@ -4911,17 +5043,17 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ src/platform/wifi/wifi-utils.c src/platform/wifi/wifi-utils.h \ src/ndisc/nm-lndp-ndisc.c src/ndisc/nm-lndp-ndisc.h \ src/ndisc/nm-ndisc.c src/ndisc/nm-ndisc.h \ - src/ndisc/nm-ndisc-private.h src/nm-exported-object.c \ - src/nm-exported-object.h src/nm-ip4-config.c \ - src/nm-ip4-config.h src/nm-ip6-config.c src/nm-ip6-config.h \ - src/dhcp/nm-dhcp-client.c src/dhcp/nm-dhcp-client.h \ - src/dhcp/nm-dhcp-client-logging.h src/dhcp/nm-dhcp-utils.c \ - src/dhcp/nm-dhcp-utils.h src/dhcp/nm-dhcp-systemd.c \ - src/dhcp/nm-dhcp-manager.c src/dhcp/nm-dhcp-manager.h \ - src/main-utils.c src/main-utils.h $(NULL) $(am__append_18) + src/ndisc/nm-ndisc-private.h src/nm-dbus-utils.c \ + src/nm-dbus-utils.h src/nm-dbus-object.c src/nm-dbus-object.h \ + src/nm-ip4-config.c src/nm-ip4-config.h src/nm-ip6-config.c \ + src/nm-ip6-config.h src/dhcp/nm-dhcp-client.c \ + src/dhcp/nm-dhcp-client.h src/dhcp/nm-dhcp-client-logging.h \ + src/dhcp/nm-dhcp-utils.c src/dhcp/nm-dhcp-utils.h \ + src/dhcp/nm-dhcp-systemd.c src/dhcp/nm-dhcp-manager.c \ + src/dhcp/nm-dhcp-manager.h src/main-utils.c src/main-utils.h \ + $(NULL) $(am__append_22) src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ - introspection/libnmdbus.la \ $(GLIB_LIBS) \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBUDEV_LIBS) \ @@ -4930,12 +5062,19 @@ src_libNetworkManagerBase_la_LIBADD = \ ############################################################################### src_libNetworkManager_la_CPPFLAGS = $(src_cppflags) -src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ - src/nm-checkpoint-manager.h src/nm-checkpoint.c \ - src/nm-checkpoint.h src/devices/nm-device.c \ - src/devices/nm-device.h src/devices/nm-lldp-listener.c \ - src/devices/nm-lldp-listener.h src/devices/nm-arping-manager.c \ - src/devices/nm-arping-manager.h \ +src_libNetworkManager_la_SOURCES = \ + \ + src/nm-checkpoint.c \ + src/nm-checkpoint.h \ + src/nm-checkpoint-manager.c \ + src/nm-checkpoint-manager.h \ + \ + src/devices/nm-device.c \ + src/devices/nm-device.h \ + src/devices/nm-lldp-listener.c \ + src/devices/nm-lldp-listener.h \ + src/devices/nm-acd-manager.c \ + src/devices/nm-acd-manager.h \ src/devices/nm-device-ethernet-utils.c \ src/devices/nm-device-ethernet-utils.h \ src/devices/nm-device-factory.c \ @@ -4943,45 +5082,79 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ src/devices/nm-device-generic.c \ src/devices/nm-device-generic.h \ src/devices/nm-device-logging.h \ - src/devices/nm-device-private.h src/devices/nm-device-bond.c \ - src/devices/nm-device-bond.h src/devices/nm-device-bridge.c \ - src/devices/nm-device-bridge.h src/devices/nm-device-dummy.c \ - src/devices/nm-device-dummy.h src/devices/nm-device-ethernet.c \ + src/devices/nm-device-private.h \ + \ + src/devices/nm-device-bond.c \ + src/devices/nm-device-bond.h \ + src/devices/nm-device-bridge.c \ + src/devices/nm-device-bridge.h \ + src/devices/nm-device-dummy.c \ + src/devices/nm-device-dummy.h \ + src/devices/nm-device-ethernet.c \ src/devices/nm-device-ethernet.h \ src/devices/nm-device-infiniband.c \ src/devices/nm-device-infiniband.h \ src/devices/nm-device-ip-tunnel.c \ src/devices/nm-device-ip-tunnel.h \ - src/devices/nm-device-macsec.c src/devices/nm-device-macsec.h \ + src/devices/nm-device-macsec.c \ + src/devices/nm-device-macsec.h \ src/devices/nm-device-macvlan.c \ - src/devices/nm-device-macvlan.h src/devices/nm-device-ppp.c \ - src/devices/nm-device-ppp.h src/devices/nm-device-tun.c \ - src/devices/nm-device-tun.h src/devices/nm-device-veth.c \ - src/devices/nm-device-veth.h src/devices/nm-device-vlan.c \ - src/devices/nm-device-vlan.h src/devices/nm-device-vxlan.c \ - src/devices/nm-device-vxlan.h src/dhcp/nm-dhcp-dhcpcanon.c \ - src/dhcp/nm-dhcp-dhclient.c src/dhcp/nm-dhcp-dhcpcd.c \ - src/dhcp/nm-dhcp-helper-api.h src/dhcp/nm-dhcp-listener.c \ - src/dhcp/nm-dhcp-listener.h src/dhcp/nm-dhcp-dhclient-utils.c \ - src/dhcp/nm-dhcp-dhclient-utils.h src/dns/nm-dns-dnsmasq.c \ - src/dns/nm-dns-dnsmasq.h src/dns/nm-dns-systemd-resolved.c \ - src/dns/nm-dns-systemd-resolved.h src/dns/nm-dns-unbound.c \ - src/dns/nm-dns-unbound.h src/dns/nm-dns-manager.c \ - src/dns/nm-dns-manager.h src/dns/nm-dns-plugin.c \ - src/dns/nm-dns-plugin.h src/dnsmasq/nm-dnsmasq-manager.c \ + src/devices/nm-device-macvlan.h \ + src/devices/nm-device-ppp.c \ + src/devices/nm-device-ppp.h \ + src/devices/nm-device-tun.c \ + src/devices/nm-device-tun.h \ + src/devices/nm-device-veth.c \ + src/devices/nm-device-veth.h \ + src/devices/nm-device-vlan.c \ + src/devices/nm-device-vlan.h \ + src/devices/nm-device-vxlan.c \ + src/devices/nm-device-vxlan.h \ + \ + src/dhcp/nm-dhcp-dhcpcanon.c \ + src/dhcp/nm-dhcp-dhclient.c \ + src/dhcp/nm-dhcp-dhcpcd.c \ + src/dhcp/nm-dhcp-helper-api.h \ + src/dhcp/nm-dhcp-listener.c \ + src/dhcp/nm-dhcp-listener.h \ + src/dhcp/nm-dhcp-dhclient-utils.c \ + src/dhcp/nm-dhcp-dhclient-utils.h \ + \ + src/dns/nm-dns-manager.c \ + src/dns/nm-dns-manager.h \ + src/dns/nm-dns-plugin.c \ + src/dns/nm-dns-plugin.h \ + src/dns/nm-dns-dnsmasq.c \ + src/dns/nm-dns-dnsmasq.h \ + src/dns/nm-dns-systemd-resolved.c \ + src/dns/nm-dns-systemd-resolved.h \ + src/dns/nm-dns-unbound.c \ + src/dns/nm-dns-unbound.h \ + \ + src/dnsmasq/nm-dnsmasq-manager.c \ src/dnsmasq/nm-dnsmasq-manager.h \ - src/dnsmasq/nm-dnsmasq-utils.c src/dnsmasq/nm-dnsmasq-utils.h \ - src/ppp/nm-ppp-manager-call.c src/ppp/nm-ppp-manager-call.h \ - src/ppp/nm-ppp-manager.h src/ppp/nm-ppp-status.h \ - src/nm-hostname-manager.c src/nm-hostname-manager.h \ + src/dnsmasq/nm-dnsmasq-utils.c \ + src/dnsmasq/nm-dnsmasq-utils.h \ + \ + src/ppp/nm-ppp-manager-call.c \ + src/ppp/nm-ppp-manager-call.h \ + src/ppp/nm-ppp-manager.h \ + src/ppp/nm-ppp-status.h \ + \ + src/nm-hostname-manager.c \ + src/nm-hostname-manager.h \ + \ src/settings/nm-agent-manager.c \ - src/settings/nm-agent-manager.h src/settings/nm-secret-agent.c \ + src/settings/nm-agent-manager.h \ + src/settings/nm-secret-agent.c \ src/settings/nm-secret-agent.h \ src/settings/nm-settings-connection.c \ src/settings/nm-settings-connection.h \ src/settings/nm-settings-plugin.c \ - src/settings/nm-settings-plugin.h src/settings/nm-settings.c \ + src/settings/nm-settings-plugin.h \ + src/settings/nm-settings.c \ src/settings/nm-settings.h \ + \ src/settings/plugins/keyfile/nms-keyfile-connection.c \ src/settings/plugins/keyfile/nms-keyfile-connection.h \ src/settings/plugins/keyfile/nms-keyfile-plugin.c \ @@ -4992,6 +5165,7 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ src/settings/plugins/keyfile/nms-keyfile-utils.h \ src/settings/plugins/keyfile/nms-keyfile-writer.c \ src/settings/plugins/keyfile/nms-keyfile-writer.h \ + \ src/supplicant/nm-supplicant-config.c \ src/supplicant/nm-supplicant-config.h \ src/supplicant/nm-supplicant-interface.c \ @@ -5001,34 +5175,68 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ src/supplicant/nm-supplicant-settings-verify.c \ src/supplicant/nm-supplicant-settings-verify.h \ src/supplicant/nm-supplicant-types.h \ - src/vpn/nm-vpn-connection.c src/vpn/nm-vpn-connection.h \ - src/vpn/nm-vpn-manager.c src/vpn/nm-vpn-manager.h \ - src/nm-act-request.c src/nm-act-request.h \ - src/nm-active-connection.c src/nm-active-connection.h \ - src/nm-audit-manager.c src/nm-audit-manager.h \ - src/nm-bus-manager.c src/nm-bus-manager.h src/nm-config.c \ - src/nm-config.h src/nm-config-data.c src/nm-config-data.h \ - src/nm-connectivity.h src/nm-dcb.c src/nm-dcb.h src/nm-netns.c \ - src/nm-netns.h src/nm-dhcp4-config.c src/nm-dhcp4-config.h \ - src/nm-dhcp6-config.c src/nm-dhcp6-config.h \ - src/nm-dispatcher.c src/nm-dispatcher.h \ - src/nm-firewall-manager.c src/nm-firewall-manager.h \ - src/nm-proxy-config.c src/nm-proxy-config.h \ - src/nm-auth-manager.c src/nm-auth-manager.h \ - src/nm-auth-subject.c src/nm-auth-subject.h \ - src/nm-auth-utils.c src/nm-auth-utils.h src/nm-manager.c \ - src/nm-manager.h src/nm-pacrunner-manager.c \ - src/nm-pacrunner-manager.h src/nm-policy.c src/nm-policy.h \ - src/nm-rfkill-manager.c src/nm-rfkill-manager.h \ - src/nm-session-monitor.h src/nm-session-monitor.c \ - src/nm-sleep-monitor.c src/nm-sleep-monitor.h src/nm-types.h \ - $(NULL) $(am__append_19) + \ + src/vpn/nm-vpn-connection.c \ + src/vpn/nm-vpn-connection.h \ + src/vpn/nm-vpn-manager.c \ + src/vpn/nm-vpn-manager.h \ + \ + src/nm-act-request.c \ + src/nm-act-request.h \ + src/nm-active-connection.c \ + src/nm-active-connection.h \ + src/nm-audit-manager.c \ + src/nm-audit-manager.h \ + src/nm-dbus-manager.c \ + src/nm-dbus-manager.h \ + src/nm-config.c \ + src/nm-config.h \ + src/nm-config-data.c \ + src/nm-config-data.h \ + src/nm-connectivity.c \ + src/nm-connectivity.h \ + src/nm-dcb.c \ + src/nm-dcb.h \ + src/nm-netns.c \ + src/nm-netns.h \ + src/nm-dhcp4-config.c \ + src/nm-dhcp4-config.h \ + src/nm-dhcp6-config.c \ + src/nm-dhcp6-config.h \ + src/nm-dispatcher.c \ + src/nm-dispatcher.h \ + src/nm-firewall-manager.c \ + src/nm-firewall-manager.h \ + src/nm-proxy-config.c \ + src/nm-proxy-config.h \ + src/nm-auth-manager.c \ + src/nm-auth-manager.h \ + src/nm-auth-subject.c \ + src/nm-auth-subject.h \ + src/nm-auth-utils.c \ + src/nm-auth-utils.h \ + src/nm-manager.c \ + src/nm-manager.h \ + src/nm-pacrunner-manager.c \ + src/nm-pacrunner-manager.h \ + src/nm-policy.c \ + src/nm-policy.h \ + src/nm-rfkill-manager.c \ + src/nm-rfkill-manager.h \ + src/nm-session-monitor.h \ + src/nm-session-monitor.c \ + src/nm-sleep-monitor.c \ + src/nm-sleep-monitor.h \ + src/nm-types.h \ + \ + $(NULL) + src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ + shared/libnacd.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) \ @@ -5037,7 +5245,8 @@ src_libNetworkManager_la_LIBADD = \ $(LIBPSL_LIBS) \ $(LIBCURL_LIBS) -src_tests_cppflags = $(src_cppflags) $(am__append_20) +src_tests_cppflags = $(src_cppflags) $(SANITIZER_EXEC_CFLAGS) \ + -DNETWORKMANAGER_COMPILATION_TEST $(am__append_23) src_tests_cppflags_fake = $(src_tests_cppflags) -DSETUP=nm_fake_platform_setup src_tests_cppflags_linux = $(src_tests_cppflags) -DSETUP=nm_linux_platform_setup src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags) @@ -5053,8 +5262,7 @@ src_libNetworkManagerTest_la_LIBADD = \ src/libNetworkManager.la \ $(CODE_COVERAGE_LDFLAGS) \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) + $(LIBUDEV_LIBS) EXTRA_src_NetworkManager_DEPENDENCIES = \ src/NetworkManager.ver @@ -5068,7 +5276,8 @@ src_NetworkManager_LDADD = \ src_NetworkManager_LDFLAGS = \ -rdynamic \ - -Wl,--version-script="src/NetworkManager.ver" + -Wl,--version-script="src/NetworkManager.ver" \ + $(SANITIZER_EXEC_LDFLAGS) ############################################################################### @@ -5081,20 +5290,19 @@ src_nm_iface_helper_LDADD = \ src/libsystemd-nm.la \ $(GLIB_LIBS) \ $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) \ $(LIBNDP_LIBS) \ $(DL_LIBS) src_nm_iface_helper_LDFLAGS = \ - -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ + $(SANITIZER_EXEC_LDFLAGS) src_dhcp_nm_dhcp_helper_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(srcdir)/shared \ -I$(builddir)/shared \ - -I$(srcdir)/libnm-core \ - -I$(builddir)/libnm-core \ -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ -DNMRUNDIR=\"$(nmrundir)\" src_dhcp_nm_dhcp_helper_SOURCES = \ @@ -5112,7 +5320,8 @@ src_dhcp_nm_dhcp_helper_LDADD = $(GLIB_LIBS) ############################################################################### src_dhcp_tests_cppflags = \ $(src_tests_cppflags) \ - -DTESTDIR="\"$(abs_srcdir)/src/dhcp/tests\"" + $(nm_build_cflags) \ + $(NULL) src_dhcp_tests_ldadd = \ src/libNetworkManagerTest.la @@ -5121,14 +5330,14 @@ src_dhcp_tests_test_dhcp_dhclient_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_utils_CPPFLAGS = $(src_dhcp_tests_cppflags) src_dhcp_tests_test_dhcp_dhclient_LDADD = $(src_dhcp_tests_ldadd) src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) +src_dhcp_tests_test_dhcp_dhclient_LDFLAGS = $(src_tests_ldflags) +src_dhcp_tests_test_dhcp_utils_LDFLAGS = $(src_tests_ldflags) @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_CPPFLAGS = \ @WITH_PPP_TRUE@ -I$(srcdir)/shared \ @WITH_PPP_TRUE@ -I$(builddir)/shared \ @WITH_PPP_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_PPP_TRUE@ -I$(srcdir)/src \ -@WITH_PPP_TRUE@ -I$(builddir)/libnm-core \ @WITH_PPP_TRUE@ -DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \ -@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \ @WITH_PPP_TRUE@ $(GLIB_CFLAGS) @WITH_PPP_TRUE@src_ppp_nm_pppd_plugin_la_SOURCES = \ @@ -5161,8 +5370,7 @@ src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) @WITH_PPP_TRUE@ -I$(builddir)/libnm-core \ @WITH_PPP_TRUE@ -I$(srcdir)/libnm-core \ @WITH_PPP_TRUE@ -DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \ -@WITH_PPP_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_PPP_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @WITH_PPP_TRUE@ $(GLIB_CFLAGS) @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LDFLAGS = \ @@ -5170,17 +5378,17 @@ src_dhcp_tests_test_dhcp_utils_LDADD = $(src_dhcp_tests_ldadd) @WITH_PPP_TRUE@ -Wl,--version-script="$(srcdir)/src/ppp/nm-ppp-plugin.ver" @WITH_PPP_TRUE@src_ppp_libnm_ppp_plugin_la_LIBADD = \ -@WITH_PPP_TRUE@ introspection/libnmdbus.la \ @WITH_PPP_TRUE@ $(GLIB_LIBS) src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \ - -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\" + $(nm_build_cflags) \ + $(NULL) src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \ $(GLIB_LIBS) \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ src/libNetworkManagerTest.la @@ -5191,9 +5399,8 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(builddir)/shared \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(builddir)/libnm-core \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IBFT_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @CONFIG_PLUGIN_IBFT_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ @CONFIG_PLUGIN_IBFT_TRUE@ -DSBINDIR=\"$(sbindir)\" @@ -5224,14 +5431,15 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(builddir)/libnm-core \ @CONFIG_PLUGIN_IBFT_TRUE@ -I$(srcdir)/src \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \ -@CONFIG_PLUGIN_IBFT_TRUE@ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\" +@CONFIG_PLUGIN_IBFT_TRUE@ $(nm_build_cflags) \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ +@CONFIG_PLUGIN_IBFT_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IBFT_TRUE@ $(NULL) @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \ @CONFIG_PLUGIN_IBFT_TRUE@ $(GLIB_LIBS) \ -@CONFIG_PLUGIN_IBFT_TRUE@ $(CODE_COVERAGE_LDFLAGS) +@CONFIG_PLUGIN_IBFT_TRUE@ $(CODE_COVERAGE_LDFLAGS) \ +@CONFIG_PLUGIN_IBFT_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @CONFIG_PLUGIN_IBFT_TRUE@src_settings_plugins_ibft_tests_test_ibft_LDADD = \ @CONFIG_PLUGIN_IBFT_TRUE@ src/settings/plugins/ibft/libnms-ibft-core.la \ @@ -5244,10 +5452,10 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -I$(builddir)/shared \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -I$(builddir)/libnm-core \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(GLIB_CFLAGS) \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(NSS_CFLAGS) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DSBINDIR=\"$(sbindir)\" @@ -5285,23 +5493,24 @@ src_settings_plugins_keyfile_tests_test_keyfile_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ -module -avoid-version \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LIBADD = \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(src_tests_cppflags) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\" +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(nm_build_cflags) \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(NULL) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(GLIB_LIBS) \ -@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(CODE_COVERAGE_LDFLAGS) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(CODE_COVERAGE_LDFLAGS) \ +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @CONFIG_PLUGIN_IFCFG_RH_TRUE@src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD = \ @CONFIG_PLUGIN_IFCFG_RH_TRUE@ src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la \ @@ -5329,8 +5538,7 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(builddir)/shared \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(builddir)/libnm-core \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_CFLAGS) \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(LIBUDEV_CFLAGS) \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" @@ -5366,78 +5574,21 @@ src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/libnm-core \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(builddir)/libnm-core \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ -I$(srcdir)/src \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DTEST_ENI_DIR=\"$(abs_srcdir)/src/settings/plugins/ifupdown/tests\" +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(nm_build_cflags) \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(NULL) @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(GLIB_LDFLAGS) \ -@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(CODE_COVERAGE_LDFLAGS) +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(CODE_COVERAGE_LDFLAGS) \ +@CONFIG_PLUGIN_IFUPDOWN_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @CONFIG_PLUGIN_IFUPDOWN_TRUE@src_settings_plugins_ifupdown_tests_test_ifupdown_LDADD = \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/settings/plugins/ifupdown/libnms-ifupdown-core.la \ @CONFIG_PLUGIN_IFUPDOWN_TRUE@ src/libNetworkManagerTest.la -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_cppflags = \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/src \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/shared \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/shared \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/libnm-core \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/libnm-core \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -@CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DSBINDIR=\"$(sbindir)\" - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_SOURCES = \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-parser.c\ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-parser.h\ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection-parser.c \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection-parser.h \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-utils.h\ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-net-utils.c\ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-wpa-parser.h\ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_SOURCES = \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection.c \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-connection.h \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-plugin.c \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/nms-ifnet-plugin.h - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS = $(src_settings_plugins_ifnet_cppflags) -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LDFLAGS = \ -@CONFIG_PLUGIN_IFNET_TRUE@ -module -avoid-version \ -@CONFIG_PLUGIN_IFNET_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-settings.ver" - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD = \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/libnms-ifnet-core.la - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/shared \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/shared \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/libnm-core \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(builddir)/libnm-core \ -@CONFIG_PLUGIN_IFNET_TRUE@ -I$(srcdir)/src \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -@CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_CFLAGS) \ -@CONFIG_PLUGIN_IFNET_TRUE@ $(CODE_COVERAGE_CFLAGS) \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DTEST_IFNET_DIR=\"$(abs_srcdir)/src/settings/plugins/ifnet/tests\" \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifnet/tests/\" \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DTEST_WPA_SUPPLICANT_CONF='"$(srcdir)/src/settings/plugins/ifnet/tests/wpa_supplicant.conf"' \ -@CONFIG_PLUGIN_IFNET_TRUE@ -DSYSCONFDIR=\"nonexistent\" - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_LDFLAGS = \ -@CONFIG_PLUGIN_IFNET_TRUE@ $(GLIB_LDFLAGS) - -@CONFIG_PLUGIN_IFNET_TRUE@src_settings_plugins_ifnet_tests_test_ifnet_LDADD = \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/settings/plugins/ifnet/libnms-ifnet-core.la \ -@CONFIG_PLUGIN_IFNET_TRUE@ src/libNetworkManagerTest.la - src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \ src/devices/adsl/nm-atm-manager.c \ src/devices/adsl/nm-device-adsl.c \ @@ -5450,8 +5601,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \ -I$(builddir)/shared \ -I$(builddir)/libnm-core \ -I$(srcdir)/libnm-core \ - -DG_LOG_DOMAIN=\""NetworkManager"\" \ - -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ $(GLIB_CFLAGS) \ $(LIBUDEV_CFLAGS) @@ -5460,7 +5610,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ - introspection/libnmdbus.la \ $(LIBUDEV_LIBS) @@ -5474,8 +5623,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/shared \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/libnm-core \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/libnm-core \ -@WITH_MODEM_MANAGER_1_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) \ @WITH_MODEM_MANAGER_1_TRUE@ $(LIBSYSTEMD_CFLAGS) \ @WITH_MODEM_MANAGER_1_TRUE@ $(MM_GLIB_CFLAGS) @@ -5486,7 +5634,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem-manager.h \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/nm-modem.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_43) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_44) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_CPPFLAGS = $(src_devices_wwan_cppflags) @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_wwan_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -avoid-version \ @@ -5511,7 +5659,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_MODEM_MANAGER_1_TRUE@src_devices_wwan_libnm_device_plugin_wwan_la_LIBADD = \ -@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ @WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) @@ -5529,25 +5676,23 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-bt-error.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.c \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/bluetooth/nm-device-bt.h \ -@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_46) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_47) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/src -I$(builddir)/src \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/shared \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/shared \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(builddir)/libnm-core \ @WITH_MODEM_MANAGER_1_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_MODEM_MANAGER_1_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_45) +@WITH_MODEM_MANAGER_1_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_46) @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \ @WITH_MODEM_MANAGER_1_TRUE@ -module -avoid-version \ @WITH_MODEM_MANAGER_1_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_MODEM_MANAGER_1_TRUE@src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LIBADD = \ -@WITH_MODEM_MANAGER_1_TRUE@ introspection/libnmdbus.la \ @WITH_MODEM_MANAGER_1_TRUE@ src/devices/wwan/libnm-wwan.la \ -@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_47) -@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_48) +@WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-factory.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-wifi.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-wifi.h \ @@ -5555,9 +5700,11 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-ap.h \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-utils.c \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-utils.h \ +@WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-common.c \ +@WITH_WIFI_TRUE@ src/devices/wifi/nm-wifi-common.h \ @WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.c \ -@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.h - +@WITH_WIFI_TRUE@ src/devices/wifi/nm-device-olpc-mesh.h \ +@WITH_WIFI_TRUE@ $(am__append_50) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \ @WITH_WIFI_TRUE@ -I$(srcdir)/src \ @WITH_WIFI_TRUE@ -I$(builddir)/src \ @@ -5565,8 +5712,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ -I$(builddir)/shared \ @WITH_WIFI_TRUE@ -I$(builddir)/libnm-core \ @WITH_WIFI_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_WIFI_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @WITH_WIFI_TRUE@ $(GLIB_CFLAGS) @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \ @@ -5574,7 +5720,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_WIFI_TRUE@src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \ -@WITH_WIFI_TRUE@ introspection/libnmdbus.la \ @WITH_WIFI_TRUE@ $(GLIB_LIBS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_SOURCES = \ @@ -5591,11 +5736,12 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_WIFI_TRUE@ -I$(builddir)/libnm-core \ @WITH_WIFI_TRUE@ -I$(srcdir)/src \ @WITH_WIFI_TRUE@ -I$(builddir)/src \ -@WITH_WIFI_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ +@WITH_WIFI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @WITH_WIFI_TRUE@ $(GLIB_CFLAGS) @WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la +@WITH_WIFI_TRUE@src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS) @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_SOURCES = \ @WITH_TEAMDCTL_TRUE@ src/devices/team/nm-team-factory.c \ @WITH_TEAMDCTL_TRUE@ src/devices/team/nm-device-team.c \ @@ -5608,8 +5754,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@ -I$(builddir)/shared \ @WITH_TEAMDCTL_TRUE@ -I$(builddir)/libnm-core \ @WITH_TEAMDCTL_TRUE@ -I$(srcdir)/libnm-core \ -@WITH_TEAMDCTL_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_TEAMDCTL_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_TEAMDCTL_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @WITH_TEAMDCTL_TRUE@ $(LIBTEAMDCTL_CFLAGS) \ @WITH_TEAMDCTL_TRUE@ $(JANSSON_CFLAGS) \ @WITH_TEAMDCTL_TRUE@ $(GLIB_CFLAGS) @@ -5619,7 +5764,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_TEAMDCTL_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_TEAMDCTL_TRUE@src_devices_team_libnm_device_plugin_team_la_LIBADD = \ -@WITH_TEAMDCTL_TRUE@ introspection/libnmdbus.la \ @WITH_TEAMDCTL_TRUE@ $(LIBTEAMDCTL_LIBS) \ @WITH_TEAMDCTL_TRUE@ $(JANSSON_LIBS) \ @WITH_TEAMDCTL_TRUE@ $(GLIB_LIBS) @@ -5651,8 +5795,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_OPENVSWITCH_TRUE@ -I$(builddir)/libnm-core \ @WITH_OPENVSWITCH_TRUE@ -I$(srcdir)/libnm-core \ @WITH_OPENVSWITCH_TRUE@ \ -@WITH_OPENVSWITCH_TRUE@ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -@WITH_OPENVSWITCH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ +@WITH_OPENVSWITCH_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \ @WITH_OPENVSWITCH_TRUE@ -DRUNSTATEDIR=\"$(runstatedir)\" \ @WITH_OPENVSWITCH_TRUE@ \ @WITH_OPENVSWITCH_TRUE@ $(JANSSON_CFLAGS) \ @@ -5663,29 +5806,31 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @WITH_OPENVSWITCH_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-devices.ver" @WITH_OPENVSWITCH_TRUE@src_devices_ovs_libnm_device_plugin_ovs_la_LIBADD = \ -@WITH_OPENVSWITCH_TRUE@ introspection/libnmdbus.la \ @WITH_OPENVSWITCH_TRUE@ $(JANSSON_LIBS) \ @WITH_OPENVSWITCH_TRUE@ $(GLIB_LIBS) src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTESTDIR="\"$(abs_srcdir)\"" + $(NULL) src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \ src/libNetworkManagerTest.la +src_dnsmasq_tests_test_dnsmasq_utils_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + ############################################################################### # src/platform/tests ############################################################################### src_platform_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_platform_tests_libadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) \ - $(LIBUDEV_LIBS) \ - $(LIBNL_LIBS) + $(LIBUDEV_LIBS) src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags) src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags) @@ -5733,16 +5878,17 @@ src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la # src/devices/tests ############################################################################### src_devices_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags) src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags) src_devices_tests_test_lldp_LDADD = \ src/libNetworkManagerTest.la -src_devices_tests_test_arping_CPPFLAGS = $(src_tests_cppflags) -src_devices_tests_test_arping_LDFLAGS = $(src_devices_tests_ldflags) -src_devices_tests_test_arping_LDADD = \ +src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags) +src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags) +src_devices_tests_test_acd_LDADD = \ src/libNetworkManagerTest.la @@ -5750,25 +5896,30 @@ src_devices_tests_test_arping_LDADD = \ # src/ndisc/tests ############################################################################### src_ndisc_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_ndisc_tests_ldadd = \ src/libNetworkManagerTest.la \ $(GLIB_LIBS) src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_flags) +src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags) src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd) src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags) -src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_flags) +src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags) src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd) src_supplicant_tests_test_supplicant_config_CPPFLAGS = \ $(src_tests_cppflags) \ - -DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant/tests/certs\" + $(nm_build_cflags) \ + $(NULL) src_supplicant_tests_test_supplicant_config_LDADD = \ src/libNetworkManagerTest.la +src_supplicant_tests_test_supplicant_config_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + src_tests_config_test_config_SOURCES = \ src/tests/config/nm-test-device.c \ src/tests/config/nm-test-device.h \ @@ -5776,18 +5927,22 @@ src_tests_config_test_config_SOURCES = \ src_tests_config_test_config_CPPFLAGS = \ $(src_tests_cppflags) \ - -DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \ - -DBUILDDIR=\""$(abs_builddir)/src/tests/config"\" + $(nm_build_cflags) \ + $(NULL) src_tests_config_test_config_LDADD = \ src/libNetworkManagerTest.la +src_tests_config_test_config_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) + ############################################################################### # src/tests ############################################################################### src_tests_ldflags = \ - $(CODE_COVERAGE_LDFLAGS) + $(CODE_COVERAGE_LDFLAGS) \ + $(SANITIZER_EXEC_LDFLAGS) src_tests_ldadd = \ src/libNetworkManagerTest.la @@ -5801,9 +5956,6 @@ src_tests_test_ip6_config_LDADD = $(src_tests_ldadd) src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags) src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags) src_tests_test_dcb_LDADD = $(src_tests_ldadd) -src_tests_test_resolvconf_capture_CPPFLAGS = $(src_tests_cppflags) -src_tests_test_resolvconf_capture_LDFLAGS = $(src_tests_ldflags) -src_tests_test_resolvconf_capture_LDADD = $(src_tests_ldadd) src_tests_test_general_CPPFLAGS = $(src_tests_cppflags) src_tests_test_general_LDFLAGS = $(src_tests_ldflags) src_tests_test_general_LDADD = $(src_tests_ldadd) @@ -5816,23 +5968,31 @@ src_tests_test_wired_defname_LDADD = $(src_tests_ldadd) src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags) src_tests_test_utils_LDFLAGS = $(src_tests_ldflags) src_tests_test_utils_LDADD = $(src_tests_ldadd) -src_tests_test_systemd_CPPFLAGS = $(src_libsystemd_nm_la_cppflags) +src_tests_test_systemd_CPPFLAGS = \ + $(src_libsystemd_nm_la_cppflags) \ + -DNETWORKMANAGER_COMPILATION_TEST + src_tests_test_systemd_SOURCES = \ - shared/nm-utils/siphash24.c \ src/tests/test-systemd.c src_tests_test_systemd_LDADD = \ src/libsystemd-nm.la \ - $(src_libsystemd_nm_la_libadd) + shared/libcsiphash.la \ + $(src_libsystemd_nm_la_libadd) \ + $(NULL) dispatcher_cppflags = \ -I$(srcdir)/shared \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ $(GLIB_CFLAGS) \ + -DG_LOG_DOMAIN=\""nm-dispatcher"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" @@ -5871,10 +6031,19 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \ -I$(builddir)/shared \ -I$(srcdir)/libnm-core \ -I$(builddir)/libnm-core \ + -I$(srcdir)/libnm \ + -I$(builddir)/libnm \ -I$(srcdir)/dispatcher \ -I$(builddir)/dispatcher \ - -DSRCDIR=\"$(abs_srcdir)/dispatcher/tests\" \ - $(GLIB_CFLAGS) + $(nm_build_cflags) \ + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(GLIB_CFLAGS) \ + $(SANITIZER_EXEC_CFLAGS) \ + $(NULL) + +dispatcher_tests_test_dispatcher_envp_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) dispatcher_tests_test_dispatcher_envp_LDADD = \ libnm/libnm.la \ @@ -5890,7 +6059,8 @@ clients_nm_online_CPPFLAGS = \ -I$(builddir)/libnm \ $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\""nm-online"\" \ - -DNMLOCALEDIR=\"$(datadir)/locale\" + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + -DNMLOCALEDIR=\"$(nmlocaledir)\" clients_nm_online_LDFLAGS = \ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @@ -5913,7 +6083,8 @@ clients_cppflags = \ -I$(srcdir)/clients/common \ -I$(builddir)/clients/common \ $(GLIB_CFLAGS) \ - -DNMLOCALEDIR=\"$(datadir)/locale\" + -DNMLOCALEDIR=\"$(nmlocaledir)\" \ + $(NULL) clients_common_libnmc_base_la_SOURCES = \ shared/nm-utils/nm-enum-utils.c \ @@ -5924,8 +6095,6 @@ clients_common_libnmc_base_la_SOURCES = \ shared/nm-utils/nm-random-utils.h \ shared/nm-utils/nm-shared-utils.c \ shared/nm-utils/nm-shared-utils.h \ - shared/nm-utils/siphash24.c \ - shared/nm-utils/siphash24.h \ \ clients/common/nm-secret-agent-simple.c \ clients/common/nm-secret-agent-simple.h \ @@ -5936,13 +6105,16 @@ clients_common_libnmc_base_la_SOURCES = \ clients_common_libnmc_base_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" + -DG_LOG_DOMAIN=\""libnmc"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT clients_common_libnmc_base_la_LIBADD = \ libnm/libnm.la \ - $(GLIB_LIBS) + shared/libcsiphash.la \ + $(GLIB_LIBS) \ + $(NULL) -clients_common_settings_doc_c = clients/common/settings-docs.c +clients_common_settings_doc_h = clients/common/settings-docs.h clients_common_libnmc_la_SOURCES = \ shared/nm-meta-setting.c \ shared/nm-meta-setting.h \ @@ -5955,7 +6127,8 @@ clients_common_libnmc_la_SOURCES = \ clients_common_libnmc_la_CPPFLAGS = \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" + -DG_LOG_DOMAIN=\""libnmc"\" \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT clients_common_libnmc_la_LIBADD = \ libnm/libnm.la \ @@ -5965,7 +6138,12 @@ clients_common_libnmc_la_LIBADD = \ clients_common_tests_test_general_CPPFLAGS = \ -I$(srcdir)/clients/common/tests \ $(clients_cppflags) \ - -DG_LOG_DOMAIN=\""libnmc"\" + -DNETWORKMANAGER_COMPILATION_TEST \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ + $(SANITIZER_EXEC_CFLAGS) + +clients_common_tests_test_general_LDFLAGS = \ + $(SANITIZER_EXEC_LDFLAGS) clients_common_tests_test_general_LDADD = \ libnm/libnm.la \ @@ -5986,18 +6164,22 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMCLI_TRUE@ clients/cli/nmcli.h \ @BUILD_NMCLI_TRUE@ clients/cli/polkit-agent.c \ @BUILD_NMCLI_TRUE@ clients/cli/polkit-agent.h $(NULL) \ -@BUILD_NMCLI_TRUE@ $(am__append_62) +@BUILD_NMCLI_TRUE@ $(am__append_64) @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = \ @BUILD_NMCLI_TRUE@ -I$(srcdir)/clients/cli $(clients_cppflags) \ +@BUILD_NMCLI_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ +@BUILD_NMCLI_TRUE@ -DSYSCONFDIR=\"$(sysconfdir)\" \ @BUILD_NMCLI_TRUE@ -DG_LOG_DOMAIN=\""nmcli"\" \ -@BUILD_NMCLI_TRUE@ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ -@BUILD_NMCLI_TRUE@ $(am__append_61) +@BUILD_NMCLI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ +@BUILD_NMCLI_TRUE@ -DNMLOCALEDIR=\"$(nmlocaledir)\" \ +@BUILD_NMCLI_TRUE@ $(am__append_63) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDADD = libnm/libnm.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc-base.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc.la $(GLIB_LIBS) \ -@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_63) +@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_65) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \ -@BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" +@BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ +@BUILD_NMCLI_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @BUILD_NMTUI_TRUE@clients_tui_newt_libnmt_newt_a_SOURCES = \ @BUILD_NMTUI_TRUE@ clients/tui/newt/nmt-newt.h \ @@ -6049,9 +6231,13 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMTUI_TRUE@ -I$(builddir)/shared \ @BUILD_NMTUI_TRUE@ -I$(srcdir)/libnm-core \ @BUILD_NMTUI_TRUE@ -I$(builddir)/libnm-core \ +@BUILD_NMTUI_TRUE@ -I$(srcdir)/libnm \ +@BUILD_NMTUI_TRUE@ -I$(builddir)/libnm \ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ +@BUILD_NMTUI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ @BUILD_NMTUI_TRUE@ $(GLIB_CFLAGS) \ @BUILD_NMTUI_TRUE@ $(NEWT_CFLAGS) \ +@BUILD_NMTUI_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ @BUILD_NMTUI_TRUE@ $(NULL) @BUILD_NMTUI_TRUE@clients_tui_nmtui_SOURCES = \ @@ -6144,10 +6330,12 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMTUI_TRUE@ $(clients_cppflags) \ @BUILD_NMTUI_TRUE@ $(NEWT_CFLAGS) \ @BUILD_NMTUI_TRUE@ -DG_LOG_DOMAIN=\""nmtui"\" \ -@BUILD_NMTUI_TRUE@ -DLOCALEDIR=\""$(localedir)"\" +@BUILD_NMTUI_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \ +@BUILD_NMTUI_TRUE@ -DNMLOCALEDIR=\""$(nmlocaledir)"\" @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDFLAGS = \ -@BUILD_NMTUI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" +@BUILD_NMTUI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" \ +@BUILD_NMTUI_TRUE@ $(SANITIZER_EXEC_LDFLAGS) @BUILD_NMTUI_TRUE@clients_tui_nmtui_LDADD = \ @BUILD_NMTUI_TRUE@ libnm/libnm.la \ @@ -6158,6 +6346,363 @@ clients_common_tests_test_general_LDADD = \ @BUILD_NMTUI_TRUE@ $(NULL) @BUILD_NMTUI_TRUE@nmtui_links = nmtui-edit nmtui-connect nmtui-hostname +clients_tests_expected_files = \ + clients/tests/test-client.check-on-disk/test_001-001.expected \ + clients/tests/test-client.check-on-disk/test_001-002.expected \ + clients/tests/test-client.check-on-disk/test_001-003.expected \ + clients/tests/test-client.check-on-disk/test_001-004.expected \ + clients/tests/test-client.check-on-disk/test_001-005.expected \ + clients/tests/test-client.check-on-disk/test_001-006.expected \ + clients/tests/test-client.check-on-disk/test_001-007.expected \ + clients/tests/test-client.check-on-disk/test_001-008.expected \ + clients/tests/test-client.check-on-disk/test_001-009.expected \ + clients/tests/test-client.check-on-disk/test_001-010.expected \ + clients/tests/test-client.check-on-disk/test_001-011.expected \ + clients/tests/test-client.check-on-disk/test_001-012.expected \ + clients/tests/test-client.check-on-disk/test_001-013.expected \ + clients/tests/test-client.check-on-disk/test_001-014.expected \ + clients/tests/test-client.check-on-disk/test_001-015.expected \ + clients/tests/test-client.check-on-disk/test_001-016.expected \ + clients/tests/test-client.check-on-disk/test_001-017.expected \ + clients/tests/test-client.check-on-disk/test_001-018.expected \ + clients/tests/test-client.check-on-disk/test_001-019.expected \ + clients/tests/test-client.check-on-disk/test_001-020.expected \ + clients/tests/test-client.check-on-disk/test_001-021.expected \ + clients/tests/test-client.check-on-disk/test_001-022.expected \ + clients/tests/test-client.check-on-disk/test_001-023.expected \ + clients/tests/test-client.check-on-disk/test_001-024.expected \ + clients/tests/test-client.check-on-disk/test_001-025.expected \ + clients/tests/test-client.check-on-disk/test_001-026.expected \ + clients/tests/test-client.check-on-disk/test_002-001.expected \ + clients/tests/test-client.check-on-disk/test_002-002.expected \ + clients/tests/test-client.check-on-disk/test_002-003.expected \ + clients/tests/test-client.check-on-disk/test_002-004.expected \ + clients/tests/test-client.check-on-disk/test_002-005.expected \ + clients/tests/test-client.check-on-disk/test_002-006.expected \ + clients/tests/test-client.check-on-disk/test_002-007.expected \ + clients/tests/test-client.check-on-disk/test_002-008.expected \ + clients/tests/test-client.check-on-disk/test_002-009.expected \ + clients/tests/test-client.check-on-disk/test_002-010.expected \ + clients/tests/test-client.check-on-disk/test_002-011.expected \ + clients/tests/test-client.check-on-disk/test_002-012.expected \ + clients/tests/test-client.check-on-disk/test_002-013.expected \ + clients/tests/test-client.check-on-disk/test_002-014.expected \ + clients/tests/test-client.check-on-disk/test_002-015.expected \ + clients/tests/test-client.check-on-disk/test_002-016.expected \ + clients/tests/test-client.check-on-disk/test_002-017.expected \ + clients/tests/test-client.check-on-disk/test_002-018.expected \ + clients/tests/test-client.check-on-disk/test_002-019.expected \ + clients/tests/test-client.check-on-disk/test_002-020.expected \ + clients/tests/test-client.check-on-disk/test_002-021.expected \ + clients/tests/test-client.check-on-disk/test_002-022.expected \ + clients/tests/test-client.check-on-disk/test_002-023.expected \ + clients/tests/test-client.check-on-disk/test_002-024.expected \ + clients/tests/test-client.check-on-disk/test_003-001.expected \ + clients/tests/test-client.check-on-disk/test_003-002.expected \ + clients/tests/test-client.check-on-disk/test_003-003.expected \ + clients/tests/test-client.check-on-disk/test_003-004.expected \ + clients/tests/test-client.check-on-disk/test_003-005.expected \ + clients/tests/test-client.check-on-disk/test_003-006.expected \ + clients/tests/test-client.check-on-disk/test_003-007.expected \ + clients/tests/test-client.check-on-disk/test_003-008.expected \ + clients/tests/test-client.check-on-disk/test_003-009.expected \ + clients/tests/test-client.check-on-disk/test_003-010.expected \ + clients/tests/test-client.check-on-disk/test_003-011.expected \ + clients/tests/test-client.check-on-disk/test_003-012.expected \ + clients/tests/test-client.check-on-disk/test_003-013.expected \ + clients/tests/test-client.check-on-disk/test_003-014.expected \ + clients/tests/test-client.check-on-disk/test_003-015.expected \ + clients/tests/test-client.check-on-disk/test_003-016.expected \ + clients/tests/test-client.check-on-disk/test_003-017.expected \ + clients/tests/test-client.check-on-disk/test_003-018.expected \ + clients/tests/test-client.check-on-disk/test_003-019.expected \ + clients/tests/test-client.check-on-disk/test_003-020.expected \ + clients/tests/test-client.check-on-disk/test_003-021.expected \ + clients/tests/test-client.check-on-disk/test_003-022.expected \ + clients/tests/test-client.check-on-disk/test_003-023.expected \ + clients/tests/test-client.check-on-disk/test_003-024.expected \ + clients/tests/test-client.check-on-disk/test_003-025.expected \ + clients/tests/test-client.check-on-disk/test_003-026.expected \ + clients/tests/test-client.check-on-disk/test_003-027.expected \ + clients/tests/test-client.check-on-disk/test_003-028.expected \ + clients/tests/test-client.check-on-disk/test_003-029.expected \ + clients/tests/test-client.check-on-disk/test_003-030.expected \ + clients/tests/test-client.check-on-disk/test_003-031.expected \ + clients/tests/test-client.check-on-disk/test_003-032.expected \ + clients/tests/test-client.check-on-disk/test_003-033.expected \ + clients/tests/test-client.check-on-disk/test_003-034.expected \ + clients/tests/test-client.check-on-disk/test_003-035.expected \ + clients/tests/test-client.check-on-disk/test_003-036.expected \ + clients/tests/test-client.check-on-disk/test_003-037.expected \ + clients/tests/test-client.check-on-disk/test_003-038.expected \ + clients/tests/test-client.check-on-disk/test_003-039.expected \ + clients/tests/test-client.check-on-disk/test_003-040.expected \ + clients/tests/test-client.check-on-disk/test_003-041.expected \ + clients/tests/test-client.check-on-disk/test_003-042.expected \ + clients/tests/test-client.check-on-disk/test_003-043.expected \ + clients/tests/test-client.check-on-disk/test_003-044.expected \ + clients/tests/test-client.check-on-disk/test_003-045.expected \ + clients/tests/test-client.check-on-disk/test_003-046.expected \ + clients/tests/test-client.check-on-disk/test_003-047.expected \ + clients/tests/test-client.check-on-disk/test_003-048.expected \ + clients/tests/test-client.check-on-disk/test_003-049.expected \ + clients/tests/test-client.check-on-disk/test_003-050.expected \ + clients/tests/test-client.check-on-disk/test_003-051.expected \ + clients/tests/test-client.check-on-disk/test_003-052.expected \ + clients/tests/test-client.check-on-disk/test_003-053.expected \ + clients/tests/test-client.check-on-disk/test_003-054.expected \ + clients/tests/test-client.check-on-disk/test_003-055.expected \ + clients/tests/test-client.check-on-disk/test_003-056.expected \ + clients/tests/test-client.check-on-disk/test_003-057.expected \ + clients/tests/test-client.check-on-disk/test_003-058.expected \ + clients/tests/test-client.check-on-disk/test_003-059.expected \ + clients/tests/test-client.check-on-disk/test_003-060.expected \ + clients/tests/test-client.check-on-disk/test_003-061.expected \ + clients/tests/test-client.check-on-disk/test_003-062.expected \ + clients/tests/test-client.check-on-disk/test_003-063.expected \ + clients/tests/test-client.check-on-disk/test_003-064.expected \ + clients/tests/test-client.check-on-disk/test_003-065.expected \ + clients/tests/test-client.check-on-disk/test_003-066.expected \ + clients/tests/test-client.check-on-disk/test_003-067.expected \ + clients/tests/test-client.check-on-disk/test_003-068.expected \ + clients/tests/test-client.check-on-disk/test_003-069.expected \ + clients/tests/test-client.check-on-disk/test_003-070.expected \ + clients/tests/test-client.check-on-disk/test_003-071.expected \ + clients/tests/test-client.check-on-disk/test_003-072.expected \ + clients/tests/test-client.check-on-disk/test_003-073.expected \ + clients/tests/test-client.check-on-disk/test_003-074.expected \ + clients/tests/test-client.check-on-disk/test_003-075.expected \ + clients/tests/test-client.check-on-disk/test_003-076.expected \ + clients/tests/test-client.check-on-disk/test_003-077.expected \ + clients/tests/test-client.check-on-disk/test_003-078.expected \ + clients/tests/test-client.check-on-disk/test_003-079.expected \ + clients/tests/test-client.check-on-disk/test_003-080.expected \ + clients/tests/test-client.check-on-disk/test_003-081.expected \ + clients/tests/test-client.check-on-disk/test_003-082.expected \ + clients/tests/test-client.check-on-disk/test_003-083.expected \ + clients/tests/test-client.check-on-disk/test_003-084.expected \ + clients/tests/test-client.check-on-disk/test_003-085.expected \ + clients/tests/test-client.check-on-disk/test_003-086.expected \ + clients/tests/test-client.check-on-disk/test_003-087.expected \ + clients/tests/test-client.check-on-disk/test_003-088.expected \ + clients/tests/test-client.check-on-disk/test_003-089.expected \ + clients/tests/test-client.check-on-disk/test_003-090.expected \ + clients/tests/test-client.check-on-disk/test_003-091.expected \ + clients/tests/test-client.check-on-disk/test_003-092.expected \ + clients/tests/test-client.check-on-disk/test_003-093.expected \ + clients/tests/test-client.check-on-disk/test_003-094.expected \ + clients/tests/test-client.check-on-disk/test_003-095.expected \ + clients/tests/test-client.check-on-disk/test_003-096.expected \ + clients/tests/test-client.check-on-disk/test_003-097.expected \ + clients/tests/test-client.check-on-disk/test_003-098.expected \ + clients/tests/test-client.check-on-disk/test_003-099.expected \ + clients/tests/test-client.check-on-disk/test_003-100.expected \ + clients/tests/test-client.check-on-disk/test_004-001.expected \ + clients/tests/test-client.check-on-disk/test_004-002.expected \ + clients/tests/test-client.check-on-disk/test_004-003.expected \ + clients/tests/test-client.check-on-disk/test_004-004.expected \ + clients/tests/test-client.check-on-disk/test_004-005.expected \ + clients/tests/test-client.check-on-disk/test_004-006.expected \ + clients/tests/test-client.check-on-disk/test_004-007.expected \ + clients/tests/test-client.check-on-disk/test_004-008.expected \ + clients/tests/test-client.check-on-disk/test_004-009.expected \ + clients/tests/test-client.check-on-disk/test_004-010.expected \ + clients/tests/test-client.check-on-disk/test_004-011.expected \ + clients/tests/test-client.check-on-disk/test_004-012.expected \ + clients/tests/test-client.check-on-disk/test_004-013.expected \ + clients/tests/test-client.check-on-disk/test_004-014.expected \ + clients/tests/test-client.check-on-disk/test_004-015.expected \ + clients/tests/test-client.check-on-disk/test_004-016.expected \ + clients/tests/test-client.check-on-disk/test_004-017.expected \ + clients/tests/test-client.check-on-disk/test_004-018.expected \ + clients/tests/test-client.check-on-disk/test_004-019.expected \ + clients/tests/test-client.check-on-disk/test_004-020.expected \ + clients/tests/test-client.check-on-disk/test_004-021.expected \ + clients/tests/test-client.check-on-disk/test_004-022.expected \ + clients/tests/test-client.check-on-disk/test_004-023.expected \ + clients/tests/test-client.check-on-disk/test_004-024.expected \ + clients/tests/test-client.check-on-disk/test_004-025.expected \ + clients/tests/test-client.check-on-disk/test_004-026.expected \ + clients/tests/test-client.check-on-disk/test_004-027.expected \ + clients/tests/test-client.check-on-disk/test_004-028.expected \ + clients/tests/test-client.check-on-disk/test_004-029.expected \ + clients/tests/test-client.check-on-disk/test_004-030.expected \ + clients/tests/test-client.check-on-disk/test_004-031.expected \ + clients/tests/test-client.check-on-disk/test_004-032.expected \ + clients/tests/test-client.check-on-disk/test_004-033.expected \ + clients/tests/test-client.check-on-disk/test_004-034.expected \ + clients/tests/test-client.check-on-disk/test_004-035.expected \ + clients/tests/test-client.check-on-disk/test_004-036.expected \ + clients/tests/test-client.check-on-disk/test_004-037.expected \ + clients/tests/test-client.check-on-disk/test_004-038.expected \ + clients/tests/test-client.check-on-disk/test_004-039.expected \ + clients/tests/test-client.check-on-disk/test_004-040.expected \ + clients/tests/test-client.check-on-disk/test_004-041.expected \ + clients/tests/test-client.check-on-disk/test_004-042.expected \ + clients/tests/test-client.check-on-disk/test_004-043.expected \ + clients/tests/test-client.check-on-disk/test_004-044.expected \ + clients/tests/test-client.check-on-disk/test_004-045.expected \ + clients/tests/test-client.check-on-disk/test_004-046.expected \ + clients/tests/test-client.check-on-disk/test_004-047.expected \ + clients/tests/test-client.check-on-disk/test_004-048.expected \ + clients/tests/test-client.check-on-disk/test_004-049.expected \ + clients/tests/test-client.check-on-disk/test_004-050.expected \ + clients/tests/test-client.check-on-disk/test_004-051.expected \ + clients/tests/test-client.check-on-disk/test_004-052.expected \ + clients/tests/test-client.check-on-disk/test_004-053.expected \ + clients/tests/test-client.check-on-disk/test_004-054.expected \ + clients/tests/test-client.check-on-disk/test_004-055.expected \ + clients/tests/test-client.check-on-disk/test_004-056.expected \ + clients/tests/test-client.check-on-disk/test_004-057.expected \ + clients/tests/test-client.check-on-disk/test_004-058.expected \ + clients/tests/test-client.check-on-disk/test_004-059.expected \ + clients/tests/test-client.check-on-disk/test_004-060.expected \ + clients/tests/test-client.check-on-disk/test_004-061.expected \ + clients/tests/test-client.check-on-disk/test_004-062.expected \ + clients/tests/test-client.check-on-disk/test_004-063.expected \ + clients/tests/test-client.check-on-disk/test_004-064.expected \ + clients/tests/test-client.check-on-disk/test_004-065.expected \ + clients/tests/test-client.check-on-disk/test_004-066.expected \ + clients/tests/test-client.check-on-disk/test_004-067.expected \ + clients/tests/test-client.check-on-disk/test_004-068.expected \ + clients/tests/test-client.check-on-disk/test_004-069.expected \ + clients/tests/test-client.check-on-disk/test_004-070.expected \ + clients/tests/test-client.check-on-disk/test_004-071.expected \ + clients/tests/test-client.check-on-disk/test_004-072.expected \ + clients/tests/test-client.check-on-disk/test_004-073.expected \ + clients/tests/test-client.check-on-disk/test_004-074.expected \ + clients/tests/test-client.check-on-disk/test_004-075.expected \ + clients/tests/test-client.check-on-disk/test_004-076.expected \ + clients/tests/test-client.check-on-disk/test_004-077.expected \ + clients/tests/test-client.check-on-disk/test_004-078.expected \ + clients/tests/test-client.check-on-disk/test_004-079.expected \ + clients/tests/test-client.check-on-disk/test_004-080.expected \ + clients/tests/test-client.check-on-disk/test_004-081.expected \ + clients/tests/test-client.check-on-disk/test_004-082.expected \ + clients/tests/test-client.check-on-disk/test_004-083.expected \ + clients/tests/test-client.check-on-disk/test_004-084.expected \ + clients/tests/test-client.check-on-disk/test_004-085.expected \ + clients/tests/test-client.check-on-disk/test_004-086.expected \ + clients/tests/test-client.check-on-disk/test_004-087.expected \ + clients/tests/test-client.check-on-disk/test_004-088.expected \ + clients/tests/test-client.check-on-disk/test_004-089.expected \ + clients/tests/test-client.check-on-disk/test_004-090.expected \ + clients/tests/test-client.check-on-disk/test_004-091.expected \ + clients/tests/test-client.check-on-disk/test_004-092.expected \ + clients/tests/test-client.check-on-disk/test_004-093.expected \ + clients/tests/test-client.check-on-disk/test_004-094.expected \ + clients/tests/test-client.check-on-disk/test_004-095.expected \ + clients/tests/test-client.check-on-disk/test_004-096.expected \ + clients/tests/test-client.check-on-disk/test_004-097.expected \ + clients/tests/test-client.check-on-disk/test_004-098.expected \ + clients/tests/test-client.check-on-disk/test_004-099.expected \ + clients/tests/test-client.check-on-disk/test_004-100.expected \ + clients/tests/test-client.check-on-disk/test_004-101.expected \ + clients/tests/test-client.check-on-disk/test_004-102.expected \ + clients/tests/test-client.check-on-disk/test_004-103.expected \ + clients/tests/test-client.check-on-disk/test_004-104.expected \ + clients/tests/test-client.check-on-disk/test_004-105.expected \ + clients/tests/test-client.check-on-disk/test_004-106.expected \ + clients/tests/test-client.check-on-disk/test_004-107.expected \ + clients/tests/test-client.check-on-disk/test_004-108.expected \ + clients/tests/test-client.check-on-disk/test_004-109.expected \ + clients/tests/test-client.check-on-disk/test_004-110.expected \ + clients/tests/test-client.check-on-disk/test_004-111.expected \ + clients/tests/test-client.check-on-disk/test_004-112.expected \ + clients/tests/test-client.check-on-disk/test_004-113.expected \ + clients/tests/test-client.check-on-disk/test_004-114.expected \ + clients/tests/test-client.check-on-disk/test_004-115.expected \ + clients/tests/test-client.check-on-disk/test_004-116.expected \ + clients/tests/test-client.check-on-disk/test_004-117.expected \ + clients/tests/test-client.check-on-disk/test_004-118.expected \ + clients/tests/test-client.check-on-disk/test_004-119.expected \ + clients/tests/test-client.check-on-disk/test_004-120.expected \ + clients/tests/test-client.check-on-disk/test_004-121.expected \ + clients/tests/test-client.check-on-disk/test_004-122.expected \ + clients/tests/test-client.check-on-disk/test_004-123.expected \ + clients/tests/test-client.check-on-disk/test_004-124.expected \ + clients/tests/test-client.check-on-disk/test_004-125.expected \ + clients/tests/test-client.check-on-disk/test_004-126.expected \ + clients/tests/test-client.check-on-disk/test_004-127.expected \ + clients/tests/test-client.check-on-disk/test_004-128.expected \ + clients/tests/test-client.check-on-disk/test_004-129.expected \ + clients/tests/test-client.check-on-disk/test_004-130.expected \ + clients/tests/test-client.check-on-disk/test_004-131.expected \ + clients/tests/test-client.check-on-disk/test_004-132.expected \ + clients/tests/test-client.check-on-disk/test_004-133.expected \ + clients/tests/test-client.check-on-disk/test_004-134.expected \ + clients/tests/test-client.check-on-disk/test_004-135.expected \ + clients/tests/test-client.check-on-disk/test_004-136.expected \ + clients/tests/test-client.check-on-disk/test_004-137.expected \ + clients/tests/test-client.check-on-disk/test_004-138.expected \ + clients/tests/test-client.check-on-disk/test_004-139.expected \ + clients/tests/test-client.check-on-disk/test_004-140.expected \ + clients/tests/test-client.check-on-disk/test_004-141.expected \ + clients/tests/test-client.check-on-disk/test_004-142.expected \ + clients/tests/test-client.check-on-disk/test_004-143.expected \ + clients/tests/test-client.check-on-disk/test_004-144.expected \ + clients/tests/test-client.check-on-disk/test_004-145.expected \ + clients/tests/test-client.check-on-disk/test_004-146.expected \ + clients/tests/test-client.check-on-disk/test_004-147.expected \ + clients/tests/test-client.check-on-disk/test_004-148.expected \ + clients/tests/test-client.check-on-disk/test_004-149.expected \ + clients/tests/test-client.check-on-disk/test_004-150.expected \ + clients/tests/test-client.check-on-disk/test_004-151.expected \ + clients/tests/test-client.check-on-disk/test_004-152.expected \ + clients/tests/test-client.check-on-disk/test_004-153.expected \ + clients/tests/test-client.check-on-disk/test_004-154.expected \ + clients/tests/test-client.check-on-disk/test_004-155.expected \ + clients/tests/test-client.check-on-disk/test_004-156.expected \ + clients/tests/test-client.check-on-disk/test_004-157.expected \ + clients/tests/test-client.check-on-disk/test_004-158.expected \ + clients/tests/test-client.check-on-disk/test_004-159.expected \ + clients/tests/test-client.check-on-disk/test_004-160.expected \ + clients/tests/test-client.check-on-disk/test_004-161.expected \ + clients/tests/test-client.check-on-disk/test_004-162.expected \ + clients/tests/test-client.check-on-disk/test_004-163.expected \ + clients/tests/test-client.check-on-disk/test_004-164.expected \ + clients/tests/test-client.check-on-disk/test_004-165.expected \ + clients/tests/test-client.check-on-disk/test_004-166.expected \ + clients/tests/test-client.check-on-disk/test_004-167.expected \ + clients/tests/test-client.check-on-disk/test_004-168.expected \ + clients/tests/test-client.check-on-disk/test_004-169.expected \ + clients/tests/test-client.check-on-disk/test_004-170.expected \ + clients/tests/test-client.check-on-disk/test_004-171.expected \ + clients/tests/test-client.check-on-disk/test_004-172.expected \ + clients/tests/test-client.check-on-disk/test_004-173.expected \ + clients/tests/test-client.check-on-disk/test_004-174.expected \ + clients/tests/test-client.check-on-disk/test_004-175.expected \ + clients/tests/test-client.check-on-disk/test_004-176.expected \ + clients/tests/test-client.check-on-disk/test_004-177.expected \ + clients/tests/test-client.check-on-disk/test_004-178.expected \ + clients/tests/test-client.check-on-disk/test_004-179.expected \ + clients/tests/test-client.check-on-disk/test_004-180.expected \ + clients/tests/test-client.check-on-disk/test_004-181.expected \ + clients/tests/test-client.check-on-disk/test_004-182.expected \ + clients/tests/test-client.check-on-disk/test_004-183.expected \ + clients/tests/test-client.check-on-disk/test_004-184.expected \ + clients/tests/test-client.check-on-disk/test_004-185.expected \ + clients/tests/test-client.check-on-disk/test_004-186.expected \ + clients/tests/test-client.check-on-disk/test_004-187.expected \ + clients/tests/test-client.check-on-disk/test_004-188.expected \ + clients/tests/test-client.check-on-disk/test_004-189.expected \ + clients/tests/test-client.check-on-disk/test_004-190.expected \ + clients/tests/test-client.check-on-disk/test_004-191.expected \ + clients/tests/test-client.check-on-disk/test_004-192.expected \ + clients/tests/test-client.check-on-disk/test_004-193.expected \ + clients/tests/test-client.check-on-disk/test_004-194.expected \ + clients/tests/test-client.check-on-disk/test_004-195.expected \ + clients/tests/test-client.check-on-disk/test_004-196.expected \ + clients/tests/test-client.check-on-disk/test_004-197.expected \ + clients/tests/test-client.check-on-disk/test_004-198.expected \ + clients/tests/test-client.check-on-disk/test_004-199.expected \ + clients/tests/test-client.check-on-disk/test_004-200.expected \ + clients/tests/test-client.check-on-disk/test_004-201.expected \ + clients/tests/test-client.check-on-disk/test_004-202.expected \ + clients/tests/test-client.check-on-disk/test_004-203.expected \ + clients/tests/test-client.check-on-disk/test_004-204.expected \ + $(NULL) + ############################################################################### # data @@ -6185,7 +6730,8 @@ data_edit = sed \ @WITH_UDEV_DIR_TRUE@udevrulesdir = $(UDEV_DIR)/rules.d @WITH_UDEV_DIR_TRUE@udevrules_DATA = \ @WITH_UDEV_DIR_TRUE@ data/84-nm-drivers.rules \ -@WITH_UDEV_DIR_TRUE@ data/85-nm-unmanaged.rules +@WITH_UDEV_DIR_TRUE@ data/85-nm-unmanaged.rules \ +@WITH_UDEV_DIR_TRUE@ data/90-nm-thunderbolt.rules @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_includedir = $(includedir)/NetworkManager @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_cppflags = \ @@ -6194,11 +6740,11 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/shared \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/shared \ @WITH_LEGACY_LIBRARIES_TRUE@ -DG_LOG_DOMAIN=\""libnm-util"\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DLOCALEDIR=\"$(datadir)/locale\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNMLOCALEDIR=\"$(nmlocaledir)\" \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_73) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_75) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_78) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_h_pub_real = \ @WITH_LEGACY_LIBRARIES_TRUE@ shared/nm-version-macros.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/NetworkManager.h \ @@ -6286,7 +6832,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-setting-vpn.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-value-transforms.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) $(am__append_77) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) $(am__append_79) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c @@ -6303,19 +6849,19 @@ data_edit = sed \ @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 = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(DBUS_LIBS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_75) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_78) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_77) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_80) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_LDFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ -Wl,--version-script=$(srcdir)/libnm-util/libnm-util.ver \ @WITH_LEGACY_LIBRARIES_TRUE@ -version-info "9:0:7" @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_SOURCES = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto.c \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_81) $(am__append_83) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_83) $(am__append_85) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_CPPFLAGS = $(libnm_util_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_LIBADD = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_82) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_84) +@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_84) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_86) @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_PACKAGES = gobject-2.0 dbus-glib-1 @HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_NetworkManager_1_0_gir_EXPORT_PACKAGES = libnm-util @@ -6345,35 +6891,48 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DBUILD_DIR=\"$(abs_builddir)/libnm-util/tests\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DTEST_CERT_DIR=\"$(abs_srcdir)/libnm-core/tests/certs\" +@WITH_LEGACY_LIBRARIES_TRUE@ $(nm_build_cflags) \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(SANITIZER_EXEC_CFLAGS) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(NULL) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldadd = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_LIBS) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_ldflags = \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(SANITIZER_EXEC_LDFLAGS) + @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDADD = $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_settings_defaults_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libtest-crypto.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_crypto_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDADD = $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_secrets_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_DEPENDENCIES = libnm-util/tests/test-libnm-linking @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDADD = $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_general_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDADD = $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_8021x_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDADD = $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_setting_dcb_LDFLAGS = $(libnm_util_tests_ldflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_CPPFLAGS = $(libnm_util_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDADD = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm/libnm.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_util_tests_ldadd) +@WITH_LEGACY_LIBRARIES_TRUE@libnm_util_tests_test_libnm_linking_LDFLAGS = $(libnm_util_tests_ldflags) ############################################################################### # libnm-glib @@ -6386,7 +6945,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/libnm-glib \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/libnm-glib \ @WITH_LEGACY_LIBRARIES_TRUE@ -DG_LOG_DOMAIN=\""libnm-glib"\" \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ @WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) @@ -6519,7 +7078,7 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_CPPFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(libnm_glib_cppflags) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(LIBUDEV_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNMRUNDIR=\"$(nmrundir)\" +@WITH_LEGACY_LIBRARIES_TRUE@ $(NULL) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_libnm_glib_la_LDFLAGS = \ @WITH_LEGACY_LIBRARIES_TRUE@ -Wl,--version-script=$(srcdir)/libnm-glib/libnm-glib.ver \ @@ -6597,10 +7156,12 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(builddir)/libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ -I$(srcdir)/libnm-glib \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ -@WITH_LEGACY_LIBRARIES_TRUE@ -DTEST_NM_SERVICE=\"$(abs_srcdir)/tools/test-networkmanager-service.py\" \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(nm_build_cflags) \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION_TEST \ +@WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) +@WITH_LEGACY_LIBRARIES_TRUE@ $(DBUS_CFLAGS) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(NULL) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags) @WITH_LEGACY_LIBRARIES_TRUE@libnm_glib_tests_test_nm_client_SOURCES = \ @@ -6666,8 +7227,7 @@ examples_C_glib_cppflags = \ -I$(top_builddir)/libnm-core \ -I$(top_srcdir)/libnm \ -I$(top_builddir)/libnm \ - $(GLIB_CFLAGS) \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE + $(GLIB_CFLAGS) examples_C_glib_cppflags_gdbus = $(examples_C_glib_cppflags) examples_C_glib_cppflags_libnm = $(examples_C_glib_cppflags) @@ -6749,7 +7309,7 @@ all: $(BUILT_SOURCES) config.h .SUFFIXES: .c .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs am--refresh: Makefile @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.vapigen $(srcdir)/Makefile.examples $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Makefile.vapigen $(srcdir)/clients/tests/test-client.check-on-disk/Makefile.am $(srcdir)/Makefile.examples $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -6771,7 +7331,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; -$(srcdir)/Makefile.vapigen $(srcdir)/Makefile.examples $(am__empty): +$(srcdir)/Makefile.vapigen $(srcdir)/clients/tests/test-client.check-on-disk/Makefile.am $(srcdir)/Makefile.examples $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -6942,33 +7502,33 @@ clean-noinstLTLIBRARIES: rm -f $${locs}; \ } -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) +install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ + echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } -uninstall-pkglibLTLIBRARIES: +uninstall-pluginLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ + @list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$f"; \ done -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; \ +clean-pluginLTLIBRARIES: + -test -z "$(plugin_LTLIBRARIES)" || rm -f $(plugin_LTLIBRARIES) + @list='$(plugin_LTLIBRARIES)'; \ locs=`for p in $$list; do echo $$p; done | \ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ sort -u`; \ @@ -7029,9 +7589,6 @@ shared/nm-utils/clients_common_libnmc_base_la-nm-random-utils.lo: \ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: \ shared/nm-utils/$(am__dirstamp) \ shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) clients/common/$(am__dirstamp): @$(MKDIR_P) clients/common @: > clients/common/$(am__dirstamp) @@ -7214,62 +7771,12 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plug introspection/libnmdbus.la: $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_DEPENDENCIES) $(EXTRA_introspection_libnmdbus_la_DEPENDENCIES) introspection/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(introspection_libnmdbus_la_OBJECTS) $(introspection_libnmdbus_la_LIBADD) $(LIBS) -shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo: \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -shared/libnm_core_libnm_core_la-nm-meta-setting.lo: \ - shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm-core/$(am__dirstamp): @$(MKDIR_P) libnm-core @: > libnm-core/$(am__dirstamp) libnm-core/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) libnm-core/$(DEPDIR) @: > libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-crypto.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-connection.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-errors.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) -libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: \ - libnm-core/$(am__dirstamp) \ - libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -7390,6 +7897,50 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless-security.lo: \ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo: \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) +shared/libnm_core_libnm_core_la-nm-meta-setting.lo: \ + shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-crypto.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-connection.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-errors.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-nm-setting.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -7683,6 +8234,15 @@ libnm/$(DEPDIR)/$(am__dirstamp): @: > libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_utils_la-nm-libnm-utils.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) +libnm/fake-typelib/$(am__dirstamp): + @$(MKDIR_P) libnm/fake-typelib + @: > libnm/fake-typelib/$(am__dirstamp) +libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) libnm/fake-typelib/$(DEPDIR) + @: > libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp) +libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo: \ + libnm/fake-typelib/$(am__dirstamp) \ + libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp) libnm/libnm-utils.la: $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_DEPENDENCIES) $(EXTRA_libnm_libnm_utils_la_DEPENDENCIES) libnm/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(libnm_libnm_utils_la_OBJECTS) $(libnm_libnm_utils_la_LIBADD) $(LIBS) @@ -7690,6 +8250,8 @@ libnm/libnm_libnm_la-nm-access-point.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-active-connection.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) +libnm/libnm_libnm_la-nm-checkpoint.lo: libnm/$(am__dirstamp) \ + libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-client.lo: libnm/$(am__dirstamp) \ libnm/$(DEPDIR)/$(am__dirstamp) libnm/libnm_libnm_la-nm-dbus-helpers.lo: libnm/$(am__dirstamp) \ @@ -7790,6 +8352,30 @@ libnm/tests/$(am__dirstamp): libnm/tests/libnm-vpn-plugin-utils-test.la: $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) $(EXTRA_libnm_tests_libnm_vpn_plugin_utils_test_la_DEPENDENCIES) libnm/tests/$(am__dirstamp) $(AM_V_CCLD)$(libnm_tests_libnm_vpn_plugin_utils_test_la_LINK) $(am_libnm_tests_libnm_vpn_plugin_utils_test_la_rpath) $(libnm_tests_libnm_vpn_plugin_utils_test_la_OBJECTS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD) $(LIBS) +shared/c-siphash/src/$(am__dirstamp): + @$(MKDIR_P) shared/c-siphash/src + @: > shared/c-siphash/src/$(am__dirstamp) +shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/c-siphash/src/$(DEPDIR) + @: > shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp) +shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo: \ + shared/c-siphash/src/$(am__dirstamp) \ + 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) +shared/n-acd/src/$(am__dirstamp): + @$(MKDIR_P) shared/n-acd/src + @: > shared/n-acd/src/$(am__dirstamp) +shared/n-acd/src/$(DEPDIR)/$(am__dirstamp): + @$(MKDIR_P) shared/n-acd/src/$(DEPDIR) + @: > shared/n-acd/src/$(DEPDIR)/$(am__dirstamp) +shared/n-acd/src/shared_libnacd_la-n-acd.lo: \ + shared/n-acd/src/$(am__dirstamp) \ + shared/n-acd/src/$(DEPDIR)/$(am__dirstamp) + +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) src/devices/adsl/$(am__dirstamp): @$(MKDIR_P) src/devices/adsl @: > src/devices/adsl/$(am__dirstamp) @@ -7804,7 +8390,7 @@ src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-device-adsl.lo: src/devices/adsl/$(DEPDIR)/$(am__dirstamp) src/devices/adsl/libnm-device-plugin-adsl.la: $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES) $(EXTRA_src_devices_adsl_libnm_device_plugin_adsl_la_DEPENDENCIES) src/devices/adsl/$(am__dirstamp) - $(AM_V_CCLD)$(src_devices_adsl_libnm_device_plugin_adsl_la_LINK) -rpath $(pkglibdir) $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(src_devices_adsl_libnm_device_plugin_adsl_la_LINK) -rpath $(plugindir) $(src_devices_adsl_libnm_device_plugin_adsl_la_OBJECTS) $(src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD) $(LIBS) src/devices/bluetooth/$(am__dirstamp): @$(MKDIR_P) src/devices/bluetooth @: > src/devices/bluetooth/$(am__dirstamp) @@ -7895,9 +8481,18 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.lo: \ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo: \ src/devices/wifi/$(am__dirstamp) \ src/devices/wifi/$(DEPDIR)/$(am__dirstamp) +src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo: \ + src/devices/wifi/$(am__dirstamp) \ + src/devices/wifi/$(DEPDIR)/$(am__dirstamp) src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: \ src/devices/wifi/$(am__dirstamp) \ src/devices/wifi/$(DEPDIR)/$(am__dirstamp) +src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo: \ + src/devices/wifi/$(am__dirstamp) \ + src/devices/wifi/$(DEPDIR)/$(am__dirstamp) +src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo: \ + src/devices/wifi/$(am__dirstamp) \ + src/devices/wifi/$(DEPDIR)/$(am__dirstamp) src/devices/wifi/libnm-device-plugin-wifi.la: $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) $(EXTRA_src_devices_wifi_libnm_device_plugin_wifi_la_DEPENDENCIES) src/devices/wifi/$(am__dirstamp) $(AM_V_CCLD)$(src_devices_wifi_libnm_device_plugin_wifi_la_LINK) $(am_src_devices_wifi_libnm_device_plugin_wifi_la_rpath) $(src_devices_wifi_libnm_device_plugin_wifi_la_OBJECTS) $(src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD) $(LIBS) @@ -7937,10 +8532,10 @@ src/$(am__dirstamp): src/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/$(DEPDIR) @: > src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-checkpoint-manager.lo: \ - src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-checkpoint.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManager_la-nm-checkpoint-manager.lo: \ + src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/devices/$(am__dirstamp): @$(MKDIR_P) src/devices @: > src/devices/$(am__dirstamp) @@ -7953,7 +8548,7 @@ src/devices/src_libNetworkManager_la-nm-device.lo: \ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo: \ src/devices/$(am__dirstamp) \ src/devices/$(DEPDIR)/$(am__dirstamp) -src/devices/src_libNetworkManager_la-nm-arping-manager.lo: \ +src/devices/src_libNetworkManager_la-nm-acd-manager.lo: \ src/devices/$(am__dirstamp) \ src/devices/$(DEPDIR)/$(am__dirstamp) src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo: \ @@ -8026,16 +8621,16 @@ src/dns/$(am__dirstamp): src/dns/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/dns/$(DEPDIR) @: > src/dns/$(DEPDIR)/$(am__dirstamp) +src/dns/src_libNetworkManager_la-nm-dns-manager.lo: \ + src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) +src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: \ + src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo: \ src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dns/src_libNetworkManager_la-nm-dns-systemd-resolved.lo: \ src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dns/src_libNetworkManager_la-nm-dns-unbound.lo: \ src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) -src/dns/src_libNetworkManager_la-nm-dns-manager.lo: \ - src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) -src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: \ - src/dns/$(am__dirstamp) src/dns/$(DEPDIR)/$(am__dirstamp) src/dnsmasq/$(am__dirstamp): @$(MKDIR_P) src/dnsmasq @: > src/dnsmasq/$(am__dirstamp) @@ -8134,12 +8729,14 @@ src/src_libNetworkManager_la-nm-active-connection.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-audit-manager.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-bus-manager.lo: src/$(am__dirstamp) \ +src/src_libNetworkManager_la-nm-dbus-manager.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-config.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-config-data.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \ + src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-dcb.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-netns.lo: src/$(am__dirstamp) \ @@ -8172,8 +8769,6 @@ src/src_libNetworkManager_la-nm-session-monitor.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManager_la-nm-connectivity.lo: src/$(am__dirstamp) \ - src/$(DEPDIR)/$(am__dirstamp) src/libNetworkManager.la: $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_DEPENDENCIES) $(EXTRA_src_libNetworkManager_la_DEPENDENCIES) src/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(src_libNetworkManager_la_OBJECTS) $(src_libNetworkManager_la_LIBADD) $(LIBS) @@ -8189,6 +8784,9 @@ src/platform/$(am__dirstamp): src/platform/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/platform/$(DEPDIR) @: > src/platform/$(DEPDIR)/$(am__dirstamp) +src/platform/src_libNetworkManagerBase_la-nm-netlink.lo: \ + src/platform/$(am__dirstamp) \ + src/platform/$(DEPDIR)/$(am__dirstamp) src/platform/src_libNetworkManagerBase_la-nmp-netns.lo: \ src/platform/$(am__dirstamp) \ src/platform/$(DEPDIR)/$(am__dirstamp) @@ -8226,7 +8824,9 @@ src/ndisc/src_libNetworkManagerBase_la-nm-lndp-ndisc.lo: \ src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp) src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo: \ src/ndisc/$(am__dirstamp) src/ndisc/$(DEPDIR)/$(am__dirstamp) -src/src_libNetworkManagerBase_la-nm-exported-object.lo: \ +src/src_libNetworkManagerBase_la-nm-dbus-utils.lo: \ + src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) +src/src_libNetworkManagerBase_la-nm-dbus-object.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) src/src_libNetworkManagerBase_la-nm-ip4-config.lo: \ src/$(am__dirstamp) src/$(DEPDIR)/$(am__dirstamp) @@ -8349,6 +8949,9 @@ src/systemd/src/basic/src_libsystemd_nm_la-random-util.lo: \ src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo: \ src/systemd/src/basic/$(am__dirstamp) \ src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp) +src/systemd/src/basic/src_libsystemd_nm_la-stat-util.lo: \ + src/systemd/src/basic/$(am__dirstamp) \ + src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp) src/systemd/src/basic/src_libsystemd_nm_la-string-table.lo: \ src/systemd/src/basic/$(am__dirstamp) \ src/systemd/src/basic/$(DEPDIR)/$(am__dirstamp) @@ -8527,36 +9130,6 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la: $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_DEPENDENCIES) src/settings/plugins/ifcfg-rh/$(am__dirstamp) $(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_rpath) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS) $(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_LIBADD) $(LIBS) -src/settings/plugins/ifnet/$(am__dirstamp): - @$(MKDIR_P) src/settings/plugins/ifnet - @: > src/settings/plugins/ifnet/$(am__dirstamp) -src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) src/settings/plugins/ifnet/$(DEPDIR) - @: > src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo: \ - src/settings/plugins/ifnet/$(am__dirstamp) \ - src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo: \ - src/settings/plugins/ifnet/$(am__dirstamp) \ - src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) - -src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la: $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_DEPENDENCIES) src/settings/plugins/ifnet/$(am__dirstamp) - $(AM_V_CCLD)$(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LINK) $(am_src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_rpath) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_OBJECTS) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_LIBADD) $(LIBS) -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo: \ - src/settings/plugins/ifnet/$(am__dirstamp) \ - src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo: \ - src/settings/plugins/ifnet/$(am__dirstamp) \ - src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo: \ - src/settings/plugins/ifnet/$(am__dirstamp) \ - src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo: \ - src/settings/plugins/ifnet/$(am__dirstamp) \ - src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) - -src/settings/plugins/ifnet/libnms-ifnet-core.la: $(src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_libnms_ifnet_core_la_DEPENDENCIES) src/settings/plugins/ifnet/$(am__dirstamp) - $(AM_V_CCLD)$(LINK) $(am_src_settings_plugins_ifnet_libnms_ifnet_core_la_rpath) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_OBJECTS) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_LIBADD) $(LIBS) src/settings/plugins/ifupdown/$(am__dirstamp): @$(MKDIR_P) src/settings/plugins/ifupdown @: > src/settings/plugins/ifupdown/$(am__dirstamp) @@ -8798,7 +9371,7 @@ clients/common/tests/clients_common_tests_test_general-test-general.$(OBJEXT): clients/common/tests/test-general$(EXEEXT): $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_DEPENDENCIES) $(EXTRA_clients_common_tests_test_general_DEPENDENCIES) clients/common/tests/$(am__dirstamp) @rm -f clients/common/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(clients_common_tests_test_general_LINK) $(clients_common_tests_test_general_OBJECTS) $(clients_common_tests_test_general_LDADD) $(LIBS) clients/$(am__dirstamp): @$(MKDIR_P) clients @: > clients/$(am__dirstamp) @@ -8963,7 +9536,7 @@ dispatcher/tests/dispatcher_tests_test_dispatcher_envp-test-dispatcher-envp.$(OB dispatcher/tests/test-dispatcher-envp$(EXEEXT): $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) $(EXTRA_dispatcher_tests_test_dispatcher_envp_DEPENDENCIES) dispatcher/tests/$(am__dirstamp) @rm -f dispatcher/tests/test-dispatcher-envp$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_LDADD) $(LIBS) + $(AM_V_CCLD)$(dispatcher_tests_test_dispatcher_envp_LINK) $(dispatcher_tests_test_dispatcher_envp_OBJECTS) $(dispatcher_tests_test_dispatcher_envp_LDADD) $(LIBS) examples/C/glib/$(am__dirstamp): @$(MKDIR_P) examples/C/glib @: > examples/C/glib/$(am__dirstamp) @@ -9072,14 +9645,14 @@ libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT): \ libnm-core/tests/test-compare$(EXEEXT): $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_compare_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-compare$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_compare_LINK) $(libnm_core_tests_test_compare_OBJECTS) $(libnm_core_tests_test_compare_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_crypto-test-crypto.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-crypto$(EXEEXT): $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_crypto_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-crypto$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_crypto_LINK) $(libnm_core_tests_test_crypto_OBJECTS) $(libnm_core_tests_test_crypto_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_general-test-general.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) @@ -9089,35 +9662,35 @@ libnm-core/tests/libnm_core_tests_test_general-nm-core-tests-enum-types.$(OBJEXT libnm-core/tests/test-general$(EXEEXT): $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_general_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_general_LINK) $(libnm_core_tests_test_general_OBJECTS) $(libnm_core_tests_test_general_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_keyfile-test-keyfile.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-keyfile$(EXEEXT): $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_keyfile_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-keyfile$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_keyfile_LINK) $(libnm_core_tests_test_keyfile_OBJECTS) $(libnm_core_tests_test_keyfile_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_secrets-test-secrets.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-secrets$(EXEEXT): $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_secrets_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-secrets$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_secrets_LINK) $(libnm_core_tests_test_secrets_OBJECTS) $(libnm_core_tests_test_secrets_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_setting-test-setting.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-setting$(EXEEXT): $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_setting_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-setting$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_setting_LINK) $(libnm_core_tests_test_setting_OBJECTS) $(libnm_core_tests_test_setting_LDADD) $(LIBS) libnm-core/tests/libnm_core_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT): \ libnm-core/tests/$(am__dirstamp) \ libnm-core/tests/$(DEPDIR)/$(am__dirstamp) libnm-core/tests/test-settings-defaults$(EXEEXT): $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_core_tests_test_settings_defaults_DEPENDENCIES) libnm-core/tests/$(am__dirstamp) @rm -f libnm-core/tests/test-settings-defaults$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_core_tests_test_settings_defaults_LINK) $(libnm_core_tests_test_settings_defaults_OBJECTS) $(libnm_core_tests_test_settings_defaults_LDADD) $(LIBS) libnm-glib/libnm_glib_libnm_glib_test-libnm-glib-test.$(OBJEXT): \ libnm-glib/$(am__dirstamp) \ libnm-glib/$(DEPDIR)/$(am__dirstamp) @@ -9161,49 +9734,52 @@ libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT): \ libnm-util/tests/test-crypto$(EXEEXT): $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_crypto_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-crypto$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_crypto_LINK) $(libnm_util_tests_test_crypto_OBJECTS) $(libnm_util_tests_test_crypto_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_general-test-general.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-general$(EXEEXT): $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_general_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_general_LINK) $(libnm_util_tests_test_general_OBJECTS) $(libnm_util_tests_test_general_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_libnm_linking-test-libnm-linking.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-libnm-linking$(EXEEXT): $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_libnm_linking_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-libnm-linking$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_libnm_linking_LINK) $(libnm_util_tests_test_libnm_linking_OBJECTS) $(libnm_util_tests_test_libnm_linking_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_secrets-test-secrets.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-secrets$(EXEEXT): $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_secrets_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-secrets$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_secrets_LINK) $(libnm_util_tests_test_secrets_OBJECTS) $(libnm_util_tests_test_secrets_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_setting_8021x-test-setting-8021x.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-setting-8021x$(EXEEXT): $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_8021x_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-setting-8021x$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_setting_8021x_LINK) $(libnm_util_tests_test_setting_8021x_OBJECTS) $(libnm_util_tests_test_setting_8021x_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_setting_dcb-test-setting-dcb.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-setting-dcb$(EXEEXT): $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_setting_dcb_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-setting-dcb$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_setting_dcb_LINK) $(libnm_util_tests_test_setting_dcb_OBJECTS) $(libnm_util_tests_test_setting_dcb_LDADD) $(LIBS) libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.$(OBJEXT): \ libnm-util/tests/$(am__dirstamp) \ libnm-util/tests/$(DEPDIR)/$(am__dirstamp) libnm-util/tests/test-settings-defaults$(EXEEXT): $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_DEPENDENCIES) $(EXTRA_libnm_util_tests_test_settings_defaults_DEPENDENCIES) libnm-util/tests/$(am__dirstamp) @rm -f libnm-util/tests/test-settings-defaults$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_util_tests_test_settings_defaults_LINK) $(libnm_util_tests_test_settings_defaults_OBJECTS) $(libnm_util_tests_test_settings_defaults_LDADD) $(LIBS) +shared/nm-utils/libnm_tests_test_general-nm-compat.$(OBJEXT): \ + shared/nm-utils/$(am__dirstamp) \ + shared/nm-utils/$(DEPDIR)/$(am__dirstamp) libnm/tests/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) libnm/tests/$(DEPDIR) @: > libnm/tests/$(DEPDIR)/$(am__dirstamp) @@ -9213,7 +9789,7 @@ libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT): \ libnm/tests/test-general$(EXEEXT): $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_DEPENDENCIES) $(EXTRA_libnm_tests_test_general_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_tests_test_general_LINK) $(libnm_tests_test_general_OBJECTS) $(libnm_tests_test_general_LDADD) $(LIBS) shared/libnm_tests_test_nm_client-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT): \ @@ -9222,7 +9798,7 @@ libnm/tests/libnm_tests_test_nm_client-test-nm-client.$(OBJEXT): \ libnm/tests/test-nm-client$(EXEEXT): $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_DEPENDENCIES) $(EXTRA_libnm_tests_test_nm_client_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-nm-client$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_tests_test_nm_client_LINK) $(libnm_tests_test_nm_client_OBJECTS) $(libnm_tests_test_nm_client_LDADD) $(LIBS) shared/libnm_tests_test_remote_settings_client-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client.$(OBJEXT): \ @@ -9231,7 +9807,7 @@ libnm/tests/libnm_tests_test_remote_settings_client-test-remote-settings-client. libnm/tests/test-remote-settings-client$(EXEEXT): $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_DEPENDENCIES) $(EXTRA_libnm_tests_test_remote_settings_client_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-remote-settings-client$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_tests_test_remote_settings_client_LINK) $(libnm_tests_test_remote_settings_client_OBJECTS) $(libnm_tests_test_remote_settings_client_LDADD) $(LIBS) shared/libnm_tests_test_secret_agent-nm-test-utils-impl.$(OBJEXT): \ shared/$(am__dirstamp) shared/$(DEPDIR)/$(am__dirstamp) libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT): \ @@ -9240,7 +9816,7 @@ libnm/tests/libnm_tests_test_secret_agent-test-secret-agent.$(OBJEXT): \ libnm/tests/test-secret-agent$(EXEEXT): $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_DEPENDENCIES) $(EXTRA_libnm_tests_test_secret_agent_DEPENDENCIES) libnm/tests/$(am__dirstamp) @rm -f libnm/tests/test-secret-agent$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS) + $(AM_V_CCLD)$(libnm_tests_test_secret_agent_LINK) $(libnm_tests_test_secret_agent_OBJECTS) $(libnm_tests_test_secret_agent_LDADD) $(LIBS) src/src_NetworkManager-main.$(OBJEXT): src/$(am__dirstamp) \ src/$(DEPDIR)/$(am__dirstamp) @@ -9253,13 +9829,13 @@ src/devices/tests/$(am__dirstamp): src/devices/tests/$(DEPDIR)/$(am__dirstamp): @$(MKDIR_P) src/devices/tests/$(DEPDIR) @: > src/devices/tests/$(DEPDIR)/$(am__dirstamp) -src/devices/tests/src_devices_tests_test_arping-test-arping.$(OBJEXT): \ +src/devices/tests/src_devices_tests_test_acd-test-acd.$(OBJEXT): \ src/devices/tests/$(am__dirstamp) \ src/devices/tests/$(DEPDIR)/$(am__dirstamp) -src/devices/tests/test-arping$(EXEEXT): $(src_devices_tests_test_arping_OBJECTS) $(src_devices_tests_test_arping_DEPENDENCIES) $(EXTRA_src_devices_tests_test_arping_DEPENDENCIES) src/devices/tests/$(am__dirstamp) - @rm -f src/devices/tests/test-arping$(EXEEXT) - $(AM_V_CCLD)$(src_devices_tests_test_arping_LINK) $(src_devices_tests_test_arping_OBJECTS) $(src_devices_tests_test_arping_LDADD) $(LIBS) +src/devices/tests/test-acd$(EXEEXT): $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_DEPENDENCIES) $(EXTRA_src_devices_tests_test_acd_DEPENDENCIES) src/devices/tests/$(am__dirstamp) + @rm -f src/devices/tests/test-acd$(EXEEXT) + $(AM_V_CCLD)$(src_devices_tests_test_acd_LINK) $(src_devices_tests_test_acd_OBJECTS) $(src_devices_tests_test_acd_LDADD) $(LIBS) src/devices/tests/src_devices_tests_test_lldp-test-lldp.$(OBJEXT): \ src/devices/tests/$(am__dirstamp) \ src/devices/tests/$(DEPDIR)/$(am__dirstamp) @@ -9285,7 +9861,7 @@ src/devices/wifi/src_devices_wifi_tests_test_general-nm-wifi-utils.$(OBJEXT): \ src/devices/wifi/tests/test-general$(EXEEXT): $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_DEPENDENCIES) $(EXTRA_src_devices_wifi_tests_test_general_DEPENDENCIES) src/devices/wifi/tests/$(am__dirstamp) @rm -f src/devices/wifi/tests/test-general$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_devices_wifi_tests_test_general_LINK) $(src_devices_wifi_tests_test_general_OBJECTS) $(src_devices_wifi_tests_test_general_LDADD) $(LIBS) src/dhcp/src_dhcp_nm_dhcp_helper-nm-dhcp-helper.$(OBJEXT): \ src/dhcp/$(am__dirstamp) src/dhcp/$(DEPDIR)/$(am__dirstamp) @@ -9304,14 +9880,14 @@ src/dhcp/tests/src_dhcp_tests_test_dhcp_dhclient-test-dhcp-dhclient.$(OBJEXT): src/dhcp/tests/test-dhcp-dhclient$(EXEEXT): $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_dhclient_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp) @rm -f src/dhcp/tests/test-dhcp-dhclient$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_dhclient_LINK) $(src_dhcp_tests_test_dhcp_dhclient_OBJECTS) $(src_dhcp_tests_test_dhcp_dhclient_LDADD) $(LIBS) src/dhcp/tests/src_dhcp_tests_test_dhcp_utils-test-dhcp-utils.$(OBJEXT): \ src/dhcp/tests/$(am__dirstamp) \ src/dhcp/tests/$(DEPDIR)/$(am__dirstamp) src/dhcp/tests/test-dhcp-utils$(EXEEXT): $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) $(EXTRA_src_dhcp_tests_test_dhcp_utils_DEPENDENCIES) src/dhcp/tests/$(am__dirstamp) @rm -f src/dhcp/tests/test-dhcp-utils$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_dhcp_tests_test_dhcp_utils_LINK) $(src_dhcp_tests_test_dhcp_utils_OBJECTS) $(src_dhcp_tests_test_dhcp_utils_LDADD) $(LIBS) src/dnsmasq/tests/$(am__dirstamp): @$(MKDIR_P) src/dnsmasq/tests @: > src/dnsmasq/tests/$(am__dirstamp) @@ -9324,7 +9900,7 @@ src/dnsmasq/tests/src_dnsmasq_tests_test_dnsmasq_utils-test-dnsmasq-utils.$(OBJE src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT): $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) $(EXTRA_src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES) src/dnsmasq/tests/$(am__dirstamp) @rm -f src/dnsmasq/tests/test-dnsmasq-utils$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_dnsmasq_tests_test_dnsmasq_utils_LINK) $(src_dnsmasq_tests_test_dnsmasq_utils_OBJECTS) $(src_dnsmasq_tests_test_dnsmasq_utils_LDADD) $(LIBS) src/ndisc/tests/$(am__dirstamp): @$(MKDIR_P) src/ndisc/tests @: > src/ndisc/tests/$(am__dirstamp) @@ -9454,19 +10030,6 @@ src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifc src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT): $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_DEPENDENCIES) src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp) @rm -f src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh$(EXEEXT) $(AM_V_CCLD)$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LINK) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDADD) $(LIBS) -src/settings/plugins/ifnet/tests/$(am__dirstamp): - @$(MKDIR_P) src/settings/plugins/ifnet/tests - @: > src/settings/plugins/ifnet/tests/$(am__dirstamp) -src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp): - @$(MKDIR_P) src/settings/plugins/ifnet/tests/$(DEPDIR) - @: > src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp) -src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.$(OBJEXT): \ - src/settings/plugins/ifnet/tests/$(am__dirstamp) \ - src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp) - -src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT): $(src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS) $(src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES) $(EXTRA_src_settings_plugins_ifnet_tests_test_ifnet_DEPENDENCIES) src/settings/plugins/ifnet/tests/$(am__dirstamp) - @rm -f src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT) - $(AM_V_CCLD)$(src_settings_plugins_ifnet_tests_test_ifnet_LINK) $(src_settings_plugins_ifnet_tests_test_ifnet_OBJECTS) $(src_settings_plugins_ifnet_tests_test_ifnet_LDADD) $(LIBS) src/settings/plugins/ifupdown/tests/$(am__dirstamp): @$(MKDIR_P) src/settings/plugins/ifupdown/tests @: > src/settings/plugins/ifupdown/tests/$(am__dirstamp) @@ -9505,7 +10068,7 @@ src/supplicant/tests/src_supplicant_tests_test_supplicant_config-test-supplicant src/supplicant/tests/test-supplicant-config$(EXEEXT): $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_DEPENDENCIES) $(EXTRA_src_supplicant_tests_test_supplicant_config_DEPENDENCIES) src/supplicant/tests/$(am__dirstamp) @rm -f src/supplicant/tests/test-supplicant-config$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_supplicant_tests_test_supplicant_config_LINK) $(src_supplicant_tests_test_supplicant_config_OBJECTS) $(src_supplicant_tests_test_supplicant_config_LDADD) $(LIBS) src/tests/config/$(am__dirstamp): @$(MKDIR_P) src/tests/config @: > src/tests/config/$(am__dirstamp) @@ -9521,7 +10084,7 @@ src/tests/config/src_tests_config_test_config-test-config.$(OBJEXT): \ src/tests/config/test-config$(EXEEXT): $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_DEPENDENCIES) $(EXTRA_src_tests_config_test_config_DEPENDENCIES) src/tests/config/$(am__dirstamp) @rm -f src/tests/config/test-config$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS) + $(AM_V_CCLD)$(src_tests_config_test_config_LINK) $(src_tests_config_test_config_OBJECTS) $(src_tests_config_test_config_LDADD) $(LIBS) src/tests/$(am__dirstamp): @$(MKDIR_P) src/tests @: > src/tests/$(am__dirstamp) @@ -9558,15 +10121,6 @@ src/tests/src_tests_test_ip6_config-test-ip6-config.$(OBJEXT): \ src/tests/test-ip6-config$(EXEEXT): $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_DEPENDENCIES) $(EXTRA_src_tests_test_ip6_config_DEPENDENCIES) src/tests/$(am__dirstamp) @rm -f src/tests/test-ip6-config$(EXEEXT) $(AM_V_CCLD)$(src_tests_test_ip6_config_LINK) $(src_tests_test_ip6_config_OBJECTS) $(src_tests_test_ip6_config_LDADD) $(LIBS) -src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.$(OBJEXT): \ - src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp) - -src/tests/test-resolvconf-capture$(EXEEXT): $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_DEPENDENCIES) $(EXTRA_src_tests_test_resolvconf_capture_DEPENDENCIES) src/tests/$(am__dirstamp) - @rm -f src/tests/test-resolvconf-capture$(EXEEXT) - $(AM_V_CCLD)$(src_tests_test_resolvconf_capture_LINK) $(src_tests_test_resolvconf_capture_OBJECTS) $(src_tests_test_resolvconf_capture_LDADD) $(LIBS) -shared/nm-utils/src_tests_test_systemd-siphash24.$(OBJEXT): \ - shared/nm-utils/$(am__dirstamp) \ - shared/nm-utils/$(DEPDIR)/$(am__dirstamp) src/tests/src_tests_test_systemd-test-systemd.$(OBJEXT): \ src/tests/$(am__dirstamp) src/tests/$(DEPDIR)/$(am__dirstamp) @@ -9585,6 +10139,41 @@ src/tests/src_tests_test_wired_defname-test-wired-defname.$(OBJEXT): \ src/tests/test-wired-defname$(EXEEXT): $(src_tests_test_wired_defname_OBJECTS) $(src_tests_test_wired_defname_DEPENDENCIES) $(EXTRA_src_tests_test_wired_defname_DEPENDENCIES) src/tests/$(am__dirstamp) @rm -f src/tests/test-wired-defname$(EXEEXT) $(AM_V_CCLD)$(src_tests_test_wired_defname_LINK) $(src_tests_test_wired_defname_OBJECTS) $(src_tests_test_wired_defname_LDADD) $(LIBS) +install-dist_libexecSCRIPTS: $(dist_libexec_SCRIPTS) + @$(NORMAL_INSTALL) + @list='$(dist_libexec_SCRIPTS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-dist_libexecSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(dist_libexec_SCRIPTS)'; test -n "$(libexecdir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + dir='$(DESTDIR)$(libexecdir)'; $(am__uninstall_files_from_dir) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -9613,9 +10202,15 @@ mostlyclean-compile: -rm -f libnm-util/tests/*.$(OBJEXT) -rm -f libnm/*.$(OBJEXT) -rm -f libnm/*.lo + -rm -f libnm/fake-typelib/*.$(OBJEXT) + -rm -f libnm/fake-typelib/*.lo -rm -f libnm/tests/*.$(OBJEXT) -rm -f shared/*.$(OBJEXT) -rm -f shared/*.lo + -rm -f shared/c-siphash/src/*.$(OBJEXT) + -rm -f shared/c-siphash/src/*.lo + -rm -f shared/n-acd/src/*.$(OBJEXT) + -rm -f shared/n-acd/src/*.lo -rm -f shared/nm-utils/*.$(OBJEXT) -rm -f shared/nm-utils/*.lo -rm -f src/*.$(OBJEXT) @@ -9663,9 +10258,6 @@ mostlyclean-compile: -rm -f src/settings/plugins/ifcfg-rh/*.$(OBJEXT) -rm -f src/settings/plugins/ifcfg-rh/*.lo -rm -f src/settings/plugins/ifcfg-rh/tests/*.$(OBJEXT) - -rm -f src/settings/plugins/ifnet/*.$(OBJEXT) - -rm -f src/settings/plugins/ifnet/*.lo - -rm -f src/settings/plugins/ifnet/tests/*.$(OBJEXT) -rm -f src/settings/plugins/ifupdown/*.$(OBJEXT) -rm -f src/settings/plugins/ifupdown/*.lo -rm -f src/settings/plugins/ifupdown/tests/*.$(OBJEXT) @@ -9840,9 +10432,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-json.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-adsl.Plo@am__quote@ @@ -9983,6 +10574,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm-util/tests/$(DEPDIR)/libnm_util_tests_test_settings_defaults-test-settings-defaults.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-active-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-dbus-helpers.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-device-adsl.Plo@am__quote@ @@ -10028,6 +10620,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-vpn-service-plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_la-nm-wimax-nsp.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/$(DEPDIR)/libnm_libnm_utils_la-nm-libnm-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_nm_client-test-nm-client.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@libnm/tests/$(DEPDIR)/libnm_tests_test_remote_settings_client-test-remote-settings-client.Po@am__quote@ @@ -10039,11 +10632,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_nm_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_remote_settings_client-nm-test-utils-impl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/$(DEPDIR)/libnm_tests_test_secret_agent-nm-test-utils-impl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-enum-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-hash-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-random-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-nm-shared-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Plo@am__quote@ @@ -10051,16 +10645,16 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_glib_libnm_glib_la-nm-udev-utils.Plo@am__quote@ @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@ +@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/libnm_util_libnm_util_la-nm-shared-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_NetworkManager-main.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-NetworkManagerUtils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-main-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip6-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-logging.Plo@am__quote@ @@ -10070,12 +10664,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-subject.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-auth-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config-data.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp4-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-dhcp6-config.Plo@am__quote@ @@ -10091,7 +10685,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-session-monitor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_libNetworkManager_la-nm-sleep-monitor.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/$(DEPDIR)/src_nm_iface_helper-nm-iface-helper.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bond.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-bridge.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-dummy.Plo@am__quote@ @@ -10127,11 +10721,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/devices/ovs/$(DEPDIR)/src_devices_ovs_libnm_device_plugin_ovs_la-nm-ovsdb.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-device-team.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/team/$(DEPDIR)/src_devices_team_libnm_device_plugin_team_la-nm-team-factory.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/tests/$(DEPDIR)/src_devices_tests_test_lldp-test-lldp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-wifi.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-ap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-factory.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/devices/wifi/$(DEPDIR)/src_devices_wifi_tests_test_general-nm-wifi-ap.Po@am__quote@ @@ -10169,6 +10766,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/src_ndisc_tests_test_ndisc_fake-test-ndisc-fake.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/ndisc/tests/$(DEPDIR)/src_ndisc_tests_test_ndisc_linux-test-ndisc-linux.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-linux-platform.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-platform-utils.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-platform.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Plo@am__quote@ @@ -10210,13 +10808,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/$(DEPDIR)/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-shvar.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh-test-ifcfg-rh.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-plugin.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnms_ifupdown_core_la-nms-ifupdown-interface-parser.Plo@am__quote@ @@ -10255,6 +10846,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-process-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-random-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-socket-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-stat-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-table.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-util.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-strv.Plo@am__quote@ @@ -10287,7 +10879,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_general_with_expect-test-general-with-expect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip4_config-test-ip4-config.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_ip6_config-test-ip6-config.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_utils-test-utils.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/tests/$(DEPDIR)/src_tests_test_wired_defname-test-wired-defname.Po@am__quote@ @@ -10628,13 +11219,6 @@ shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo: shared/nm-util @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_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c -shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo: shared/nm-utils/siphash24.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_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/clients_common_libnmc_base_la-siphash24.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/clients_common_libnmc_base_la-siphash24.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_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/clients_common_libnmc_base_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c - clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo: clients/common/nm-secret-agent-simple.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_base_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo -MD -MP -MF clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo -c -o clients/common/clients_common_libnmc_base_la-nm-secret-agent-simple.lo `test -f 'clients/common/nm-secret-agent-simple.c' || echo '$(srcdir)/'`clients/common/nm-secret-agent-simple.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Tpo clients/common/$(DEPDIR)/clients_common_libnmc_base_la-nm-secret-agent-simple.Plo @@ -10956,146 +11540,27 @@ introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.Connection.c - -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo: introspection/org.freedesktop.NetworkManager.Settings.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c - -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo: introspection/org.freedesktop.NetworkManager.VPN.Connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c - -introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo: introspection/org.freedesktop.NetworkManager.VPN.Plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c - -shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-utils.c - -shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo: shared/nm-utils/siphash24.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/nm-utils/libnm_core_libnm_core_la-siphash24.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-siphash24.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/libnm_core_libnm_core_la-siphash24.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/nm-utils/libnm_core_libnm_core_la-siphash24.lo `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.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 -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.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-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c - -libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.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 libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/crypto.c' object='libnm-core/libnm_core_libnm_core_la-crypto.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 libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c - -libnm-core/libnm_core_libnm_core_la-nm-connection.lo: libnm-core/nm-connection.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 libnm-core/libnm_core_libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_libnm_core_la-nm-connection.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 libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c - -libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: libnm-core/nm-dbus-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 libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-dbus-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 libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c - -libnm-core/libnm_core_libnm_core_la-nm-errors.lo: libnm-core/nm-errors.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 libnm-core/libnm_core_libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_libnm_core_la-nm-errors.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 libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c - -libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo: libnm-core/nm-keyfile-reader.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo `test -f 'libnm-core/nm-keyfile-reader.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-reader.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-reader.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-reader.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-reader.lo `test -f 'libnm-core/nm-keyfile-reader.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-reader.c - -libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo' libtool=yes @AMDEPBACKSLASH@ + +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo: introspection/org.freedesktop.NetworkManager.Settings.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.Settings.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.Settings.lo `test -f 'introspection/org.freedesktop.NetworkManager.Settings.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.Settings.c -libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo: libnm-core/nm-keyfile-writer.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo `test -f 'libnm-core/nm-keyfile-writer.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-writer.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-writer.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-writer.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo' libtool=yes @AMDEPBACKSLASH@ +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo: introspection/org.freedesktop.NetworkManager.VPN.Connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Connection.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-writer.lo `test -f 'libnm-core/nm-keyfile-writer.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-writer.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Connection.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Connection.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Connection.c -libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.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 libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo' libtool=yes @AMDEPBACKSLASH@ +introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo: introspection/org.freedesktop.NetworkManager.VPN.Plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo -MD -MP -MF introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Tpo introspection/$(DEPDIR)/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' object='introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.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 libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.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) $(introspection_libnmdbus_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o introspection/introspection_libnmdbus_la-org.freedesktop.NetworkManager.VPN.Plugin.lo `test -f 'introspection/org.freedesktop.NetworkManager.VPN.Plugin.c' || echo '$(srcdir)/'`introspection/org.freedesktop.NetworkManager.VPN.Plugin.c libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo: libnm-core/nm-setting-8021x.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 libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting-8021x.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting-8021x.lo `test -f 'libnm-core/nm-setting-8021x.c' || echo '$(srcdir)/'`libnm-core/nm-setting-8021x.c @@ -11377,6 +11842,111 @@ libnm-core/libnm_core_libnm_core_la-nm-setting-wireless.lo: libnm-core/nm-settin @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_libnm_core_la-nm-setting-wireless.lo `test -f 'libnm-core/nm-setting-wireless.c' || echo '$(srcdir)/'`libnm-core/nm-setting-wireless.c +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-c-list-util.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-c-list-util.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-c-list-util.lo `test -f 'shared/nm-utils/c-list-util.c' || echo '$(srcdir)/'`shared/nm-utils/c-list-util.c + +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-dedup-multi.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-dedup-multi.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-dedup-multi.lo `test -f 'shared/nm-utils/nm-dedup-multi.c' || echo '$(srcdir)/'`shared/nm-utils/nm-dedup-multi.c + +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-enum-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-enum-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-enum-utils.lo `test -f 'shared/nm-utils/nm-enum-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-enum-utils.c + +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-hash-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-hash-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-hash-utils.lo `test -f 'shared/nm-utils/nm-hash-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-hash-utils.c + +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-shared-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-shared-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-shared-utils.lo `test -f 'shared/nm-utils/nm-shared-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-shared-utils.c + +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-random-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-random-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-random-utils.lo `test -f 'shared/nm-utils/nm-random-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-random-utils.c + +shared/nm-utils/libnm_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_la-nm-udev-utils.Tpo -c -o shared/nm-utils/libnm_core_libnm_core_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_core_libnm_core_la-nm-udev-utils.Tpo shared/nm-utils/$(DEPDIR)/libnm_core_libnm_core_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_core_libnm_core_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) $(libnm_core_libnm_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_core_libnm_core_la-nm-udev-utils.lo `test -f 'shared/nm-utils/nm-udev-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-udev-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 +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-meta-setting.c' object='shared/libnm_core_libnm_core_la-nm-meta-setting.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-meta-setting.lo `test -f 'shared/nm-meta-setting.c' || echo '$(srcdir)/'`shared/nm-meta-setting.c + +libnm-core/libnm_core_libnm_core_la-crypto.lo: libnm-core/crypto.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 libnm-core/libnm_core_libnm_core_la-crypto.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/crypto.c' object='libnm-core/libnm_core_libnm_core_la-crypto.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 libnm-core/libnm_core_libnm_core_la-crypto.lo `test -f 'libnm-core/crypto.c' || echo '$(srcdir)/'`libnm-core/crypto.c + +libnm-core/libnm_core_libnm_core_la-nm-connection.lo: libnm-core/nm-connection.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 libnm-core/libnm_core_libnm_core_la-nm-connection.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-connection.c' object='libnm-core/libnm_core_libnm_core_la-nm-connection.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 libnm-core/libnm_core_libnm_core_la-nm-connection.lo `test -f 'libnm-core/nm-connection.c' || echo '$(srcdir)/'`libnm-core/nm-connection.c + +libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo: libnm-core/nm-dbus-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 libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-dbus-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-dbus-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-dbus-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 libnm-core/libnm_core_libnm_core_la-nm-dbus-utils.lo `test -f 'libnm-core/nm-dbus-utils.c' || echo '$(srcdir)/'`libnm-core/nm-dbus-utils.c + +libnm-core/libnm_core_libnm_core_la-nm-errors.lo: libnm-core/nm-errors.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 libnm-core/libnm_core_libnm_core_la-nm-errors.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-errors.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-errors.c' object='libnm-core/libnm_core_libnm_core_la-nm-errors.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 libnm-core/libnm_core_libnm_core_la-nm-errors.lo `test -f 'libnm-core/nm-errors.c' || echo '$(srcdir)/'`libnm-core/nm-errors.c + +libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo: libnm-core/nm-keyfile.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile.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 libnm-core/libnm_core_libnm_core_la-nm-keyfile.lo `test -f 'libnm-core/nm-keyfile.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile.c + +libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo: libnm-core/nm-keyfile-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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-keyfile-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-keyfile-utils.c' object='libnm-core/libnm_core_libnm_core_la-nm-keyfile-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 libnm-core/libnm_core_libnm_core_la-nm-keyfile-utils.lo `test -f 'libnm-core/nm-keyfile-utils.c' || echo '$(srcdir)/'`libnm-core/nm-keyfile-utils.c + +libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo: libnm-core/nm-property-compare.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 libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-property-compare.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-property-compare.c' object='libnm-core/libnm_core_libnm_core_la-nm-property-compare.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 libnm-core/libnm_core_libnm_core_la-nm-property-compare.lo `test -f 'libnm-core/nm-property-compare.c' || echo '$(srcdir)/'`libnm-core/nm-property-compare.c + libnm-core/libnm_core_libnm_core_la-nm-setting.lo: libnm-core/nm-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 libnm-core/libnm_core_libnm_core_la-nm-setting.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-setting.lo `test -f 'libnm-core/nm-setting.c' || echo '$(srcdir)/'`libnm-core/nm-setting.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-setting.Plo @@ -11979,6 +12549,13 @@ libnm/libnm_libnm_utils_la-nm-libnm-utils.lo: libnm/nm-libnm-utils.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_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_utils_la-nm-libnm-utils.lo `test -f 'libnm/nm-libnm-utils.c' || echo '$(srcdir)/'`libnm/nm-libnm-utils.c +libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo: libnm/fake-typelib/typelibs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo -MD -MP -MF libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Tpo -c -o libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Tpo libnm/fake-typelib/$(DEPDIR)/libnm_libnm_utils_la-typelibs.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm/fake-typelib/typelibs.c' object='libnm/fake-typelib/libnm_libnm_utils_la-typelibs.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_libnm_utils_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/fake-typelib/libnm_libnm_utils_la-typelibs.lo `test -f 'libnm/fake-typelib/typelibs.c' || echo '$(srcdir)/'`libnm/fake-typelib/typelibs.c + libnm/libnm_libnm_la-nm-access-point.lo: libnm/nm-access-point.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-access-point.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Tpo -c -o libnm/libnm_libnm_la-nm-access-point.lo `test -f 'libnm/nm-access-point.c' || echo '$(srcdir)/'`libnm/nm-access-point.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-access-point.Plo @@ -11993,6 +12570,13 @@ libnm/libnm_libnm_la-nm-active-connection.lo: libnm/nm-active-connection.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_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-active-connection.lo `test -f 'libnm/nm-active-connection.c' || echo '$(srcdir)/'`libnm/nm-active-connection.c +libnm/libnm_libnm_la-nm-checkpoint.lo: libnm/nm-checkpoint.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-checkpoint.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Tpo -c -o libnm/libnm_libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-checkpoint.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm/nm-checkpoint.c' object='libnm/libnm_libnm_la-nm-checkpoint.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_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm/libnm_libnm_la-nm-checkpoint.lo `test -f 'libnm/nm-checkpoint.c' || echo '$(srcdir)/'`libnm/nm-checkpoint.c + libnm/libnm_libnm_la-nm-client.lo: libnm/nm-client.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_libnm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/libnm_libnm_la-nm-client.lo -MD -MP -MF libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Tpo -c -o libnm/libnm_libnm_la-nm-client.lo `test -f 'libnm/nm-client.c' || echo '$(srcdir)/'`libnm/nm-client.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Tpo libnm/$(DEPDIR)/libnm_libnm_la-nm-client.Plo @@ -12308,6 +12892,20 @@ shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.l @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) $(AM_CPPFLAGS) $(CPPFLAGS) $(libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_libnm_vpn_plugin_utils_test_la-nm-vpn-plugin-utils.lo `test -f 'shared/nm-utils/nm-vpn-plugin-utils.c' || echo '$(srcdir)/'`shared/nm-utils/nm-vpn-plugin-utils.c +shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo: shared/c-siphash/src/c-siphash.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo -MD -MP -MF shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Tpo -c -o shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Tpo shared/c-siphash/src/$(DEPDIR)/shared_libcsiphash_la-c-siphash.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/c-siphash/src/c-siphash.c' object='shared/c-siphash/src/shared_libcsiphash_la-c-siphash.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_libcsiphash_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/c-siphash/src/shared_libcsiphash_la-c-siphash.lo `test -f 'shared/c-siphash/src/c-siphash.c' || echo '$(srcdir)/'`shared/c-siphash/src/c-siphash.c + +shared/n-acd/src/shared_libnacd_la-n-acd.lo: shared/n-acd/src/n-acd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(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) -MT shared/n-acd/src/shared_libnacd_la-n-acd.lo -MD -MP -MF shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Tpo -c -o shared/n-acd/src/shared_libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Tpo shared/n-acd/src/$(DEPDIR)/shared_libnacd_la-n-acd.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/n-acd/src/n-acd.c' object='shared/n-acd/src/shared_libnacd_la-n-acd.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_libnacd_la_CPPFLAGS) $(CPPFLAGS) $(shared_libnacd_la_CFLAGS) $(CFLAGS) -c -o shared/n-acd/src/shared_libnacd_la-n-acd.lo `test -f 'shared/n-acd/src/n-acd.c' || echo '$(srcdir)/'`shared/n-acd/src/n-acd.c + src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo: src/devices/adsl/nm-atm-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_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo -MD -MP -MF src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Tpo -c -o src/devices/adsl/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.lo `test -f 'src/devices/adsl/nm-atm-manager.c' || echo '$(srcdir)/'`src/devices/adsl/nm-atm-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Tpo src/devices/adsl/$(DEPDIR)/src_devices_adsl_libnm_device_plugin_adsl_la-nm-atm-manager.Plo @@ -12455,6 +13053,13 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo: @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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-utils.lo `test -f 'src/devices/wifi/nm-wifi-utils.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-utils.c +src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo: src/devices/wifi/nm-wifi-common.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/wifi/nm-wifi-common.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-wifi-common.lo `test -f 'src/devices/wifi/nm-wifi-common.c' || echo '$(srcdir)/'`src/devices/wifi/nm-wifi-common.c + src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo: src/devices/wifi/nm-device-olpc-mesh.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.Plo @@ -12462,6 +13067,20 @@ src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mes @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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-olpc-mesh.lo `test -f 'src/devices/wifi/nm-device-olpc-mesh.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-olpc-mesh.c +src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo: src/devices/wifi/nm-device-iwd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/wifi/nm-device-iwd.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-device-iwd.lo `test -f 'src/devices/wifi/nm-device-iwd.c' || echo '$(srcdir)/'`src/devices/wifi/nm-device-iwd.c + +src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo: src/devices/wifi/nm-iwd-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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo -MD -MP -MF src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Tpo src/devices/wifi/$(DEPDIR)/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/wifi/nm-iwd-manager.c' object='src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-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_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wifi/src_devices_wifi_libnm_device_plugin_wifi_la-nm-iwd-manager.lo `test -f 'src/devices/wifi/nm-iwd-manager.c' || echo '$(srcdir)/'`src/devices/wifi/nm-iwd-manager.c + src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo: src/devices/wwan/nm-wwan-factory.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_wwan_libnm_device_plugin_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo -MD -MP -MF src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo -c -o src/devices/wwan/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.lo `test -f 'src/devices/wwan/nm-wwan-factory.c' || echo '$(srcdir)/'`src/devices/wwan/nm-wwan-factory.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Tpo src/devices/wwan/$(DEPDIR)/src_devices_wwan_libnm_device_plugin_wwan_la-nm-wwan-factory.Plo @@ -12504,13 +13123,6 @@ src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo: src/devices/w @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_devices_wwan_libnm_wwan_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo `test -f 'src/devices/wwan/nm-modem-ofono.c' || echo '$(srcdir)/'`src/devices/wwan/nm-modem-ofono.c -src/src_libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-checkpoint-manager.c' object='src/src_libNetworkManager_la-nm-checkpoint-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c - src/src_libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint.Plo @@ -12518,6 +13130,13 @@ src/src_libNetworkManager_la-nm-checkpoint.lo: src/nm-checkpoint.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint.lo `test -f 'src/nm-checkpoint.c' || echo '$(srcdir)/'`src/nm-checkpoint.c +src/src_libNetworkManager_la-nm-checkpoint-manager.lo: src/nm-checkpoint-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-checkpoint-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-checkpoint-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-checkpoint-manager.c' object='src/src_libNetworkManager_la-nm-checkpoint-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-checkpoint-manager.lo `test -f 'src/nm-checkpoint-manager.c' || echo '$(srcdir)/'`src/nm-checkpoint-manager.c + src/devices/src_libNetworkManager_la-nm-device.lo: src/devices/nm-device.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device.lo `test -f 'src/devices/nm-device.c' || echo '$(srcdir)/'`src/devices/nm-device.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device.Plo @@ -12532,12 +13151,12 @@ src/devices/src_libNetworkManager_la-nm-lldp-listener.lo: src/devices/nm-lldp-li @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-lldp-listener.lo `test -f 'src/devices/nm-lldp-listener.c' || echo '$(srcdir)/'`src/devices/nm-lldp-listener.c -src/devices/src_libNetworkManager_la-nm-arping-manager.lo: src/devices/nm-arping-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-arping-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Tpo -c -o src/devices/src_libNetworkManager_la-nm-arping-manager.lo `test -f 'src/devices/nm-arping-manager.c' || echo '$(srcdir)/'`src/devices/nm-arping-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-arping-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/nm-arping-manager.c' object='src/devices/src_libNetworkManager_la-nm-arping-manager.lo' libtool=yes @AMDEPBACKSLASH@ +src/devices/src_libNetworkManager_la-nm-acd-manager.lo: src/devices/nm-acd-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-acd-manager.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Tpo -c -o src/devices/src_libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Tpo src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-acd-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/nm-acd-manager.c' object='src/devices/src_libNetworkManager_la-nm-acd-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-arping-manager.lo `test -f 'src/devices/nm-arping-manager.c' || echo '$(srcdir)/'`src/devices/nm-arping-manager.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/src_libNetworkManager_la-nm-acd-manager.lo `test -f 'src/devices/nm-acd-manager.c' || echo '$(srcdir)/'`src/devices/nm-acd-manager.c src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo: src/devices/nm-device-ethernet-utils.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo -MD -MP -MF src/devices/$(DEPDIR)/src_libNetworkManager_la-nm-device-ethernet-utils.Tpo -c -o src/devices/src_libNetworkManager_la-nm-device-ethernet-utils.lo `test -f 'src/devices/nm-device-ethernet-utils.c' || echo '$(srcdir)/'`src/devices/nm-device-ethernet-utils.c @@ -12686,6 +13305,20 @@ src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo: src/dhcp/nm-dhcp-dh @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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dhcp/src_libNetworkManager_la-nm-dhcp-dhclient-utils.lo `test -f 'src/dhcp/nm-dhcp-dhclient-utils.c' || echo '$(srcdir)/'`src/dhcp/nm-dhcp-dhclient-utils.c +src/dns/src_libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/src_libNetworkManager_la-nm-dns-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c + +src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/src_libNetworkManager_la-nm-dns-plugin.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c + src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo: src/dns/nm-dns-dnsmasq.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-dnsmasq.lo `test -f 'src/dns/nm-dns-dnsmasq.c' || echo '$(srcdir)/'`src/dns/nm-dns-dnsmasq.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-dnsmasq.Plo @@ -12707,20 +13340,6 @@ src/dns/src_libNetworkManager_la-nm-dns-unbound.lo: src/dns/nm-dns-unbound.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-unbound.lo `test -f 'src/dns/nm-dns-unbound.c' || echo '$(srcdir)/'`src/dns/nm-dns-unbound.c -src/dns/src_libNetworkManager_la-nm-dns-manager.lo: src/dns/nm-dns-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-manager.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-manager.c' object='src/dns/src_libNetworkManager_la-nm-dns-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-manager.lo `test -f 'src/dns/nm-dns-manager.c' || echo '$(srcdir)/'`src/dns/nm-dns-manager.c - -src/dns/src_libNetworkManager_la-nm-dns-plugin.lo: src/dns/nm-dns-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dns/src_libNetworkManager_la-nm-dns-plugin.lo -MD -MP -MF src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Tpo src/dns/$(DEPDIR)/src_libNetworkManager_la-nm-dns-plugin.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/dns/nm-dns-plugin.c' object='src/dns/src_libNetworkManager_la-nm-dns-plugin.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/dns/src_libNetworkManager_la-nm-dns-plugin.lo `test -f 'src/dns/nm-dns-plugin.c' || echo '$(srcdir)/'`src/dns/nm-dns-plugin.c - src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo: src/dnsmasq/nm-dnsmasq-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo -MD -MP -MF src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Tpo -c -o src/dnsmasq/src_libNetworkManager_la-nm-dnsmasq-manager.lo `test -f 'src/dnsmasq/nm-dnsmasq-manager.c' || echo '$(srcdir)/'`src/dnsmasq/nm-dnsmasq-manager.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Tpo src/dnsmasq/$(DEPDIR)/src_libNetworkManager_la-nm-dnsmasq-manager.Plo @@ -12882,12 +13501,12 @@ src/src_libNetworkManager_la-nm-audit-manager.lo: src/nm-audit-manager.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-audit-manager.lo `test -f 'src/nm-audit-manager.c' || echo '$(srcdir)/'`src/nm-audit-manager.c -src/src_libNetworkManager_la-nm-bus-manager.lo: src/nm-bus-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-bus-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Tpo -c -o src/src_libNetworkManager_la-nm-bus-manager.lo `test -f 'src/nm-bus-manager.c' || echo '$(srcdir)/'`src/nm-bus-manager.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-bus-manager.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-bus-manager.c' object='src/src_libNetworkManager_la-nm-bus-manager.lo' libtool=yes @AMDEPBACKSLASH@ +src/src_libNetworkManager_la-nm-dbus-manager.lo: src/nm-dbus-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-dbus-manager.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Tpo -c -o src/src_libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dbus-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-dbus-manager.c' object='src/src_libNetworkManager_la-nm-dbus-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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-bus-manager.lo `test -f 'src/nm-bus-manager.c' || echo '$(srcdir)/'`src/nm-bus-manager.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-dbus-manager.lo `test -f 'src/nm-dbus-manager.c' || echo '$(srcdir)/'`src/nm-dbus-manager.c src/src_libNetworkManager_la-nm-config.lo: src/nm-config.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-config.Tpo -c -o src/src_libNetworkManager_la-nm-config.lo `test -f 'src/nm-config.c' || echo '$(srcdir)/'`src/nm-config.c @@ -12903,6 +13522,13 @@ src/src_libNetworkManager_la-nm-config-data.lo: src/nm-config-data.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-config-data.lo `test -f 'src/nm-config-data.c' || echo '$(srcdir)/'`src/nm-config-data.c +src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c + src/src_libNetworkManager_la-nm-dcb.lo: src/nm-dcb.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-dcb.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo -c -o src/src_libNetworkManager_la-nm-dcb.lo `test -f 'src/nm-dcb.c' || echo '$(srcdir)/'`src/nm-dcb.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-dcb.Plo @@ -13015,13 +13641,6 @@ src/src_libNetworkManager_la-nm-sleep-monitor.lo: src/nm-sleep-monitor.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) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-sleep-monitor.lo `test -f 'src/nm-sleep-monitor.c' || echo '$(srcdir)/'`src/nm-sleep-monitor.c -src/src_libNetworkManager_la-nm-connectivity.lo: src/nm-connectivity.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManager_la-nm-connectivity.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Tpo src/$(DEPDIR)/src_libNetworkManager_la-nm-connectivity.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-connectivity.c' object='src/src_libNetworkManager_la-nm-connectivity.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_libNetworkManager_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManager_la-nm-connectivity.lo `test -f 'src/nm-connectivity.c' || echo '$(srcdir)/'`src/nm-connectivity.c - src/src_libNetworkManagerBase_la-nm-core-utils.lo: src/nm-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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_libNetworkManagerBase_la-nm-core-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-core-utils.lo `test -f 'src/nm-core-utils.c' || echo '$(srcdir)/'`src/nm-core-utils.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-core-utils.Plo @@ -13043,6 +13662,13 @@ src/src_libNetworkManagerBase_la-NetworkManagerUtils.lo: src/NetworkManagerUtils @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/src_libNetworkManagerBase_la-NetworkManagerUtils.lo `test -f 'src/NetworkManagerUtils.c' || echo '$(srcdir)/'`src/NetworkManagerUtils.c +src/platform/src_libNetworkManagerBase_la-nm-netlink.lo: src/platform/nm-netlink.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/src_libNetworkManagerBase_la-nm-netlink.lo -MD -MP -MF src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Tpo -c -o src/platform/src_libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Tpo src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nm-netlink.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/platform/nm-netlink.c' object='src/platform/src_libNetworkManagerBase_la-nm-netlink.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/src_libNetworkManagerBase_la-nm-netlink.lo `test -f 'src/platform/nm-netlink.c' || echo '$(srcdir)/'`src/platform/nm-netlink.c + src/platform/src_libNetworkManagerBase_la-nmp-netns.lo: src/platform/nmp-netns.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/src_libNetworkManagerBase_la-nmp-netns.lo -MD -MP -MF src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Tpo -c -o src/platform/src_libNetworkManagerBase_la-nmp-netns.lo `test -f 'src/platform/nmp-netns.c' || echo '$(srcdir)/'`src/platform/nmp-netns.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Tpo src/platform/$(DEPDIR)/src_libNetworkManagerBase_la-nmp-netns.Plo @@ -13106,12 +13732,19 @@ src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo: src/ndisc/nm-ndisc.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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/ndisc/src_libNetworkManagerBase_la-nm-ndisc.lo `test -f 'src/ndisc/nm-ndisc.c' || echo '$(srcdir)/'`src/ndisc/nm-ndisc.c -src/src_libNetworkManagerBase_la-nm-exported-object.lo: src/nm-exported-object.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/src_libNetworkManagerBase_la-nm-exported-object.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Tpo -c -o src/src_libNetworkManagerBase_la-nm-exported-object.lo `test -f 'src/nm-exported-object.c' || echo '$(srcdir)/'`src/nm-exported-object.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-exported-object.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-exported-object.c' object='src/src_libNetworkManagerBase_la-nm-exported-object.lo' libtool=yes @AMDEPBACKSLASH@ +src/src_libNetworkManagerBase_la-nm-dbus-utils.lo: src/nm-dbus-utils.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/src_libNetworkManagerBase_la-nm-dbus-utils.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Tpo -c -o src/src_libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-dbus-utils.c' object='src/src_libNetworkManagerBase_la-nm-dbus-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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-dbus-utils.lo `test -f 'src/nm-dbus-utils.c' || echo '$(srcdir)/'`src/nm-dbus-utils.c + +src/src_libNetworkManagerBase_la-nm-dbus-object.lo: src/nm-dbus-object.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/src_libNetworkManagerBase_la-nm-dbus-object.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Tpo -c -o src/src_libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Tpo src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-dbus-object.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/nm-dbus-object.c' object='src/src_libNetworkManagerBase_la-nm-dbus-object.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/src_libNetworkManagerBase_la-nm-exported-object.lo `test -f 'src/nm-exported-object.c' || echo '$(srcdir)/'`src/nm-exported-object.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) $(src_libNetworkManagerBase_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_libNetworkManagerBase_la-nm-dbus-object.lo `test -f 'src/nm-dbus-object.c' || echo '$(srcdir)/'`src/nm-dbus-object.c src/src_libNetworkManagerBase_la-nm-ip4-config.lo: src/nm-ip4-config.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/src_libNetworkManagerBase_la-nm-ip4-config.lo -MD -MP -MF src/$(DEPDIR)/src_libNetworkManagerBase_la-nm-ip4-config.Tpo -c -o src/src_libNetworkManagerBase_la-nm-ip4-config.lo `test -f 'src/nm-ip4-config.c' || echo '$(srcdir)/'`src/nm-ip4-config.c @@ -13344,6 +13977,13 @@ src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo: src/systemd/src/basic @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_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-socket-util.lo `test -f 'src/systemd/src/basic/socket-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/socket-util.c +src/systemd/src/basic/src_libsystemd_nm_la-stat-util.lo: src/systemd/src/basic/stat-util.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-stat-util.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-stat-util.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-stat-util.lo `test -f 'src/systemd/src/basic/stat-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/stat-util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-stat-util.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-stat-util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/systemd/src/basic/stat-util.c' object='src/systemd/src/basic/src_libsystemd_nm_la-stat-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) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/systemd/src/basic/src_libsystemd_nm_la-stat-util.lo `test -f 'src/systemd/src/basic/stat-util.c' || echo '$(srcdir)/'`src/systemd/src/basic/stat-util.c + src/systemd/src/basic/src_libsystemd_nm_la-string-table.lo: src/systemd/src/basic/string-table.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_libsystemd_nm_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/systemd/src/basic/src_libsystemd_nm_la-string-table.lo -MD -MP -MF src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-table.Tpo -c -o src/systemd/src/basic/src_libsystemd_nm_la-string-table.lo `test -f 'src/systemd/src/basic/string-table.c' || echo '$(srcdir)/'`src/systemd/src/basic/string-table.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-table.Tpo src/systemd/src/basic/$(DEPDIR)/src_libsystemd_nm_la-string-table.Plo @@ -13624,48 +14264,6 @@ src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core @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_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la-nms-ifcfg-rh-writer.lo `test -f 'src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c' || echo '$(srcdir)/'`src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo: src/settings/plugins/ifnet/nms-ifnet-connection.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-connection.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.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_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-connection.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection.c - -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo: src/settings/plugins/ifnet/nms-ifnet-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-plugin.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-plugin.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.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_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnm_settings_plugin_ifnet_la-nms-ifnet-plugin.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-plugin.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-plugin.c - -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo: src/settings/plugins/ifnet/nms-ifnet-net-parser.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-parser.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-net-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-parser.c - -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo: src/settings/plugins/ifnet/nms-ifnet-connection-parser.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection-parser.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-connection-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-connection-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-connection-parser.c - -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo: src/settings/plugins/ifnet/nms-ifnet-net-utils.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-utils.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-net-utils.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-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) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-net-utils.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-net-utils.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-net-utils.c - -src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo: src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo -MD -MP -MF src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Tpo -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Tpo src/settings/plugins/ifnet/$(DEPDIR)/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' object='src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.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_settings_plugins_ifnet_libnms_ifnet_core_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/src_settings_plugins_ifnet_libnms_ifnet_core_la-nms-ifnet-wpa-parser.lo `test -f 'src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c - src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo: src/settings/plugins/ifupdown/nms-ifupdown-connection.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo -MD -MP -MF src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo -c -o src/settings/plugins/ifupdown/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.lo `test -f 'src/settings/plugins/ifupdown/nms-ifupdown-connection.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/nms-ifupdown-connection.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Tpo src/settings/plugins/ifupdown/$(DEPDIR)/src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la-nms-ifupdown-connection.Plo @@ -14856,6 +15454,20 @@ libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults. @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_util_tests_test_settings_defaults_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnm-util/tests/libnm_util_tests_test_settings_defaults-test-settings-defaults.obj `if test -f 'libnm-util/tests/test-settings-defaults.c'; then $(CYGPATH_W) 'libnm-util/tests/test-settings-defaults.c'; else $(CYGPATH_W) '$(srcdir)/libnm-util/tests/test-settings-defaults.c'; fi` +shared/nm-utils/libnm_tests_test_general-nm-compat.o: shared/nm-utils/nm-compat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.o `test -f 'shared/nm-utils/nm-compat.c' || echo '$(srcdir)/'`shared/nm-utils/nm-compat.c + +shared/nm-utils/libnm_tests_test_general-nm-compat.obj: shared/nm-utils/nm-compat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/libnm_tests_test_general-nm-compat.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Tpo shared/nm-utils/$(DEPDIR)/libnm_tests_test_general-nm-compat.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/nm-compat.c' object='shared/nm-utils/libnm_tests_test_general-nm-compat.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/libnm_tests_test_general-nm-compat.obj `if test -f 'shared/nm-utils/nm-compat.c'; then $(CYGPATH_W) 'shared/nm-utils/nm-compat.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/nm-compat.c'; fi` + libnm/tests/libnm_tests_test_general-test-general.o: libnm/tests/test-general.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnm_tests_test_general_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnm/tests/libnm_tests_test_general-test-general.o -MD -MP -MF libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo -c -o libnm/tests/libnm_tests_test_general-test-general.o `test -f 'libnm/tests/test-general.c' || echo '$(srcdir)/'`libnm/tests/test-general.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Tpo libnm/tests/$(DEPDIR)/libnm_tests_test_general-test-general.Po @@ -14968,19 +15580,19 @@ src/src_NetworkManager-main.obj: src/main.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_NetworkManager_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/src_NetworkManager-main.obj `if test -f 'src/main.c'; then $(CYGPATH_W) 'src/main.c'; else $(CYGPATH_W) '$(srcdir)/src/main.c'; fi` -src/devices/tests/src_devices_tests_test_arping-test-arping.o: src/devices/tests/test-arping.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_arping-test-arping.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.o `test -f 'src/devices/tests/test-arping.c' || echo '$(srcdir)/'`src/devices/tests/test-arping.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-arping.c' object='src/devices/tests/src_devices_tests_test_arping-test-arping.o' libtool=no @AMDEPBACKSLASH@ +src/devices/tests/src_devices_tests_test_acd-test-acd.o: src/devices/tests/test-acd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_acd-test-acd.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/src_devices_tests_test_acd-test-acd.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.o `test -f 'src/devices/tests/test-arping.c' || echo '$(srcdir)/'`src/devices/tests/test-arping.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.o `test -f 'src/devices/tests/test-acd.c' || echo '$(srcdir)/'`src/devices/tests/test-acd.c -src/devices/tests/src_devices_tests_test_arping-test-arping.obj: src/devices/tests/test-arping.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_arping-test-arping.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.obj `if test -f 'src/devices/tests/test-arping.c'; then $(CYGPATH_W) 'src/devices/tests/test-arping.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-arping.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_arping-test-arping.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-arping.c' object='src/devices/tests/src_devices_tests_test_arping-test-arping.obj' libtool=no @AMDEPBACKSLASH@ +src/devices/tests/src_devices_tests_test_acd-test-acd.obj: src/devices/tests/test-acd.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_acd-test-acd.obj -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Tpo src/devices/tests/$(DEPDIR)/src_devices_tests_test_acd-test-acd.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/devices/tests/test-acd.c' object='src/devices/tests/src_devices_tests_test_acd-test-acd.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_arping_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_arping-test-arping.obj `if test -f 'src/devices/tests/test-arping.c'; then $(CYGPATH_W) 'src/devices/tests/test-arping.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-arping.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_acd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/devices/tests/src_devices_tests_test_acd-test-acd.obj `if test -f 'src/devices/tests/test-acd.c'; then $(CYGPATH_W) 'src/devices/tests/test-acd.c'; else $(CYGPATH_W) '$(srcdir)/src/devices/tests/test-acd.c'; fi` src/devices/tests/src_devices_tests_test_lldp-test-lldp.o: src/devices/tests/test-lldp.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_devices_tests_test_lldp_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/devices/tests/src_devices_tests_test_lldp-test-lldp.o -MD -MP -MF src/devices/tests/$(DEPDIR)/src_devices_tests_test_lldp-test-lldp.Tpo -c -o src/devices/tests/src_devices_tests_test_lldp-test-lldp.o `test -f 'src/devices/tests/test-lldp.c' || echo '$(srcdir)/'`src/devices/tests/test-lldp.c @@ -15318,20 +15930,6 @@ src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifc @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifcfg-rh/tests/src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh-test-ifcfg-rh.obj `if test -f 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; then $(CYGPATH_W) 'src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c'; fi` -src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o: src/settings/plugins/ifnet/tests/test-ifnet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o -MD -MP -MF src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o `test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/tests/test-ifnet.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/tests/test-ifnet.c' object='src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.o `test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c' || echo '$(srcdir)/'`src/settings/plugins/ifnet/tests/test-ifnet.c - -src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj: src/settings/plugins/ifnet/tests/test-ifnet.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj -MD -MP -MF src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj `if test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c'; then $(CYGPATH_W) 'src/settings/plugins/ifnet/tests/test-ifnet.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifnet/tests/test-ifnet.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Tpo src/settings/plugins/ifnet/tests/$(DEPDIR)/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/settings/plugins/ifnet/tests/test-ifnet.c' object='src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/settings/plugins/ifnet/tests/src_settings_plugins_ifnet_tests_test_ifnet-test-ifnet.obj `if test -f 'src/settings/plugins/ifnet/tests/test-ifnet.c'; then $(CYGPATH_W) 'src/settings/plugins/ifnet/tests/test-ifnet.c'; else $(CYGPATH_W) '$(srcdir)/src/settings/plugins/ifnet/tests/test-ifnet.c'; fi` - src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o: src/settings/plugins/ifupdown/tests/test-ifupdown.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o -MD -MP -MF src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Tpo -c -o src/settings/plugins/ifupdown/tests/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.o `test -f 'src/settings/plugins/ifupdown/tests/test-ifupdown.c' || echo '$(srcdir)/'`src/settings/plugins/ifupdown/tests/test-ifupdown.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Tpo src/settings/plugins/ifupdown/tests/$(DEPDIR)/src_settings_plugins_ifupdown_tests_test_ifupdown-test-ifupdown.Po @@ -15472,34 +16070,6 @@ src/tests/src_tests_test_ip6_config-test-ip6-config.obj: src/tests/test-ip6-conf @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_ip6_config_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_ip6_config-test-ip6-config.obj `if test -f 'src/tests/test-ip6-config.c'; then $(CYGPATH_W) 'src/tests/test-ip6-config.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-ip6-config.c'; fi` -src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o: src/tests/test-resolvconf-capture.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o `test -f 'src/tests/test-resolvconf-capture.c' || echo '$(srcdir)/'`src/tests/test-resolvconf-capture.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/test-resolvconf-capture.c' object='src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.o `test -f 'src/tests/test-resolvconf-capture.c' || echo '$(srcdir)/'`src/tests/test-resolvconf-capture.c - -src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj: src/tests/test-resolvconf-capture.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Tpo src/tests/$(DEPDIR)/src_tests_test_resolvconf_capture-test-resolvconf-capture.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/tests/test-resolvconf-capture.c' object='src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_resolvconf_capture_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/tests/src_tests_test_resolvconf_capture-test-resolvconf-capture.obj `if test -f 'src/tests/test-resolvconf-capture.c'; then $(CYGPATH_W) 'src/tests/test-resolvconf-capture.c'; else $(CYGPATH_W) '$(srcdir)/src/tests/test-resolvconf-capture.c'; fi` - -shared/nm-utils/src_tests_test_systemd-siphash24.o: shared/nm-utils/siphash24.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_tests_test_systemd-siphash24.o -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo -c -o shared/nm-utils/src_tests_test_systemd-siphash24.o `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/src_tests_test_systemd-siphash24.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_tests_test_systemd-siphash24.o `test -f 'shared/nm-utils/siphash24.c' || echo '$(srcdir)/'`shared/nm-utils/siphash24.c - -shared/nm-utils/src_tests_test_systemd-siphash24.obj: shared/nm-utils/siphash24.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared/nm-utils/src_tests_test_systemd-siphash24.obj -MD -MP -MF shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo -c -o shared/nm-utils/src_tests_test_systemd-siphash24.obj `if test -f 'shared/nm-utils/siphash24.c'; then $(CYGPATH_W) 'shared/nm-utils/siphash24.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/siphash24.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Tpo shared/nm-utils/$(DEPDIR)/src_tests_test_systemd-siphash24.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shared/nm-utils/siphash24.c' object='shared/nm-utils/src_tests_test_systemd-siphash24.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared/nm-utils/src_tests_test_systemd-siphash24.obj `if test -f 'shared/nm-utils/siphash24.c'; then $(CYGPATH_W) 'shared/nm-utils/siphash24.c'; else $(CYGPATH_W) '$(srcdir)/shared/nm-utils/siphash24.c'; fi` - src/tests/src_tests_test_systemd-test-systemd.o: src/tests/test-systemd.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_tests_test_systemd_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/tests/src_tests_test_systemd-test-systemd.o -MD -MP -MF src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Tpo -c -o src/tests/src_tests_test_systemd-test-systemd.o `test -f 'src/tests/test-systemd.c' || echo '$(srcdir)/'`src/tests/test-systemd.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Tpo src/tests/$(DEPDIR)/src_tests_test_systemd-test-systemd.Po @@ -15644,8 +16214,11 @@ clean-libtool: -rm -rf libnm-glib/tests/.libs libnm-glib/tests/_libs -rm -rf libnm-util/.libs libnm-util/_libs -rm -rf libnm-util/tests/.libs libnm-util/tests/_libs + -rm -rf libnm/fake-typelib/.libs libnm/fake-typelib/_libs -rm -rf libnm/tests/.libs libnm/tests/_libs -rm -rf shared/.libs shared/_libs + -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/nm-utils/.libs shared/nm-utils/_libs -rm -rf src/.libs src/_libs -rm -rf src/devices/.libs src/devices/_libs @@ -15673,8 +16246,6 @@ clean-libtool: -rm -rf src/settings/plugins/ibft/tests/.libs src/settings/plugins/ibft/tests/_libs -rm -rf src/settings/plugins/ifcfg-rh/.libs src/settings/plugins/ifcfg-rh/_libs -rm -rf src/settings/plugins/ifcfg-rh/tests/.libs src/settings/plugins/ifcfg-rh/tests/_libs - -rm -rf src/settings/plugins/ifnet/.libs src/settings/plugins/ifnet/_libs - -rm -rf src/settings/plugins/ifnet/tests/.libs src/settings/plugins/ifnet/tests/_libs -rm -rf src/settings/plugins/ifupdown/.libs src/settings/plugins/ifupdown/_libs -rm -rf src/settings/plugins/ifupdown/tests/.libs src/settings/plugins/ifupdown/tests/_libs -rm -rf src/settings/plugins/keyfile/.libs src/settings/plugins/keyfile/_libs @@ -16692,13 +17263,6 @@ src/settings/plugins/ifupdown/tests/test-ifupdown.log: src/settings/plugins/ifup --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -src/settings/plugins/ifnet/tests/test-ifnet.log: src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT) - @p='src/settings/plugins/ifnet/tests/test-ifnet$(EXEEXT)'; \ - b='src/settings/plugins/ifnet/tests/test-ifnet'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) src/devices/wifi/tests/test-general.log: src/devices/wifi/tests/test-general$(EXEEXT) @p='src/devices/wifi/tests/test-general$(EXEEXT)'; \ b='src/devices/wifi/tests/test-general'; \ @@ -16790,9 +17354,9 @@ src/devices/tests/test-lldp.log: src/devices/tests/test-lldp$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -src/devices/tests/test-arping.log: src/devices/tests/test-arping$(EXEEXT) - @p='src/devices/tests/test-arping$(EXEEXT)'; \ - b='src/devices/tests/test-arping'; \ +src/devices/tests/test-acd.log: src/devices/tests/test-acd$(EXEEXT) + @p='src/devices/tests/test-acd$(EXEEXT)'; \ + b='src/devices/tests/test-acd'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ @@ -16860,13 +17424,6 @@ src/tests/test-systemd.log: src/tests/test-systemd$(EXEEXT) --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -src/tests/test-resolvconf-capture.log: src/tests/test-resolvconf-capture$(EXEEXT) - @p='src/tests/test-resolvconf-capture$(EXEEXT)'; \ - b='src/tests/test-resolvconf-capture'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) src/tests/test-wired-defname.log: src/tests/test-wired-defname$(EXEEXT) @p='src/tests/test-wired-defname$(EXEEXT)'; \ b='src/tests/test-wired-defname'; \ @@ -16937,13 +17494,6 @@ libnm-util/tests/test-setting-dcb.log: libnm-util/tests/test-setting-dcb$(EXEEXT --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ "$$tst" $(AM_TESTS_FD_REDIRECT) -libnm-glib/tests/test-nm-client.log: libnm-glib/tests/test-nm-client$(EXEEXT) - @p='libnm-glib/tests/test-nm-client$(EXEEXT)'; \ - b='libnm-glib/tests/test-nm-client'; \ - $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ - --log-file $$b.log --trs-file $$b.trs \ - $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ - "$$tst" $(AM_TESTS_FD_REDIRECT) libnm-glib/tests/test-remote-settings-client.log: libnm-glib/tests/test-remote-settings-client$(EXEEXT) @p='libnm-glib/tests/test-remote-settings-client$(EXEEXT)'; \ b='libnm-glib/tests/test-remote-settings-client'; \ @@ -17161,13 +17711,13 @@ check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(MANS) \ - $(DATA) $(HEADERS) config.h +all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \ + $(MANS) $(DATA) $(HEADERS) config.h install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdnmunitdir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libdeprecateddir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(pppd_plugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(man8dir)" "$(DESTDIR)$(dbusactivationdir)" "$(DESTDIR)$(dbusinterfacesdir)" "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(polkit_policydir)" "$(DESTDIR)$(servicedir)" "$(DESTDIR)$(systemdnmunitdir)" "$(DESTDIR)$(systemdsystemunitdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(vapidir)" "$(DESTDIR)$(libdeprecateddir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmincludedir)" "$(DESTDIR)$(libnm_glib_libnmvpndir)" "$(DESTDIR)$(libnm_util_libnm_util_includedir)" "$(DESTDIR)$(libnmincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -17237,10 +17787,16 @@ distclean-generic: -rm -f libnm-util/tests/$(am__dirstamp) -rm -f libnm/$(DEPDIR)/$(am__dirstamp) -rm -f libnm/$(am__dirstamp) + -rm -f libnm/fake-typelib/$(DEPDIR)/$(am__dirstamp) + -rm -f libnm/fake-typelib/$(am__dirstamp) -rm -f libnm/tests/$(DEPDIR)/$(am__dirstamp) -rm -f libnm/tests/$(am__dirstamp) -rm -f shared/$(DEPDIR)/$(am__dirstamp) -rm -f shared/$(am__dirstamp) + -rm -f shared/c-siphash/src/$(DEPDIR)/$(am__dirstamp) + -rm -f shared/c-siphash/src/$(am__dirstamp) + -rm -f shared/n-acd/src/$(DEPDIR)/$(am__dirstamp) + -rm -f shared/n-acd/src/$(am__dirstamp) -rm -f shared/nm-utils/$(DEPDIR)/$(am__dirstamp) -rm -f shared/nm-utils/$(am__dirstamp) -rm -f src/$(DEPDIR)/$(am__dirstamp) @@ -17295,10 +17851,6 @@ distclean-generic: -rm -f src/settings/plugins/ifcfg-rh/$(am__dirstamp) -rm -f src/settings/plugins/ifcfg-rh/tests/$(DEPDIR)/$(am__dirstamp) -rm -f src/settings/plugins/ifcfg-rh/tests/$(am__dirstamp) - -rm -f src/settings/plugins/ifnet/$(DEPDIR)/$(am__dirstamp) - -rm -f src/settings/plugins/ifnet/$(am__dirstamp) - -rm -f src/settings/plugins/ifnet/tests/$(DEPDIR)/$(am__dirstamp) - -rm -f src/settings/plugins/ifnet/tests/$(am__dirstamp) -rm -f src/settings/plugins/ifupdown/$(DEPDIR)/$(am__dirstamp) -rm -f src/settings/plugins/ifupdown/$(am__dirstamp) -rm -f src/settings/plugins/ifupdown/tests/$(DEPDIR)/$(am__dirstamp) @@ -17342,12 +17894,12 @@ clean: clean-recursive clean-am: clean-binPROGRAMS clean-checkLTLIBRARIES clean-checkPROGRAMS \ clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \ clean-libtool clean-noinstLIBRARIES clean-noinstLTLIBRARIES \ - clean-noinstPROGRAMS clean-pkglibLTLIBRARIES \ + clean-noinstPROGRAMS clean-pluginLTLIBRARIES \ clean-pppd_pluginLTLIBRARIES clean-sbinPROGRAMS mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) + -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/fake-typelib/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/c-siphash/src/$(DEPDIR) shared/n-acd/src/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-libtool distclean-tags @@ -17375,18 +17927,18 @@ install-data-am: install-dbusactivationDATA install-dbusinterfacesDATA \ install-nodist_libnm_glib_libnmvpnHEADERS \ install-nodist_libnm_util_libnm_util_includeHEADERS \ install-nodist_libnmincludeHEADERS install-pkgconfigDATA \ - install-polkit_policyDATA install-pppd_pluginLTLIBRARIES \ - install-serviceDATA install-systemdnmunitDATA \ - install-systemdsystemunitDATA install-typelibDATA \ - install-udevrulesDATA install-vapiDATA + install-pluginLTLIBRARIES install-polkit_policyDATA \ + install-pppd_pluginLTLIBRARIES install-serviceDATA \ + install-systemdnmunitDATA install-systemdsystemunitDATA \ + install-typelibDATA install-udevrulesDATA install-vapiDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive install-dvi-am: -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \ - install-libexecPROGRAMS install-pkglibLTLIBRARIES \ +install-exec-am: install-binPROGRAMS install-dist_libexecSCRIPTS \ + install-libLTLIBRARIES install-libexecPROGRAMS \ install-sbinPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook @@ -17413,7 +17965,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -rf $(top_srcdir)/autom4te.cache - -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifnet/$(DEPDIR) src/settings/plugins/ifnet/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) + -rm -rf clients/$(DEPDIR) clients/cli/$(DEPDIR) clients/common/$(DEPDIR) clients/common/tests/$(DEPDIR) clients/tui/$(DEPDIR) clients/tui/newt/$(DEPDIR) dispatcher/$(DEPDIR) dispatcher/tests/$(DEPDIR) examples/C/glib/$(DEPDIR) examples/C/qt/$(DEPDIR) introspection/$(DEPDIR) libnm-core/$(DEPDIR) libnm-core/tests/$(DEPDIR) libnm-glib/$(DEPDIR) libnm-glib/tests/$(DEPDIR) libnm-util/$(DEPDIR) libnm-util/tests/$(DEPDIR) libnm/$(DEPDIR) libnm/fake-typelib/$(DEPDIR) libnm/tests/$(DEPDIR) shared/$(DEPDIR) shared/c-siphash/src/$(DEPDIR) shared/n-acd/src/$(DEPDIR) shared/nm-utils/$(DEPDIR) src/$(DEPDIR) src/devices/$(DEPDIR) src/devices/adsl/$(DEPDIR) src/devices/bluetooth/$(DEPDIR) src/devices/ovs/$(DEPDIR) src/devices/team/$(DEPDIR) src/devices/tests/$(DEPDIR) src/devices/wifi/$(DEPDIR) src/devices/wifi/tests/$(DEPDIR) src/devices/wwan/$(DEPDIR) src/dhcp/$(DEPDIR) src/dhcp/tests/$(DEPDIR) src/dns/$(DEPDIR) src/dnsmasq/$(DEPDIR) src/dnsmasq/tests/$(DEPDIR) src/ndisc/$(DEPDIR) src/ndisc/tests/$(DEPDIR) src/platform/$(DEPDIR) src/platform/tests/$(DEPDIR) src/platform/wifi/$(DEPDIR) src/ppp/$(DEPDIR) src/settings/$(DEPDIR) src/settings/plugins/ibft/$(DEPDIR) src/settings/plugins/ibft/tests/$(DEPDIR) src/settings/plugins/ifcfg-rh/$(DEPDIR) src/settings/plugins/ifcfg-rh/tests/$(DEPDIR) src/settings/plugins/ifupdown/$(DEPDIR) src/settings/plugins/ifupdown/tests/$(DEPDIR) src/settings/plugins/keyfile/$(DEPDIR) src/settings/plugins/keyfile/tests/$(DEPDIR) src/supplicant/$(DEPDIR) src/supplicant/tests/$(DEPDIR) src/systemd/$(DEPDIR) src/systemd/sd-adapt/$(DEPDIR) src/systemd/src/basic/$(DEPDIR) src/systemd/src/libsystemd-network/$(DEPDIR) src/systemd/src/libsystemd/sd-event/$(DEPDIR) src/systemd/src/libsystemd/sd-id128/$(DEPDIR) src/systemd/src/shared/$(DEPDIR) src/tests/$(DEPDIR) src/tests/config/$(DEPDIR) src/vpn/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -17432,9 +17984,9 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-dbusactivationDATA \ uninstall-dbusinterfacesDATA uninstall-dbusserviceDATA \ - uninstall-examplesDATA uninstall-girDATA \ - uninstall-libLTLIBRARIES uninstall-libdeprecatedHEADERS \ - uninstall-libexecPROGRAMS \ + uninstall-dist_libexecSCRIPTS uninstall-examplesDATA \ + uninstall-girDATA uninstall-libLTLIBRARIES \ + uninstall-libdeprecatedHEADERS uninstall-libexecPROGRAMS \ uninstall-libnm_glib_libnmincludeHEADERS \ uninstall-libnm_glib_libnmvpnHEADERS \ uninstall-libnm_util_libnm_util_includeHEADERS \ @@ -17443,7 +17995,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbusactivationDATA \ uninstall-nodist_libnm_glib_libnmvpnHEADERS \ uninstall-nodist_libnm_util_libnm_util_includeHEADERS \ uninstall-nodist_libnmincludeHEADERS uninstall-pkgconfigDATA \ - uninstall-pkglibLTLIBRARIES uninstall-polkit_policyDATA \ + uninstall-pluginLTLIBRARIES uninstall-polkit_policyDATA \ uninstall-pppd_pluginLTLIBRARIES uninstall-sbinPROGRAMS \ uninstall-serviceDATA uninstall-systemdnmunitDATA \ uninstall-systemdsystemunitDATA uninstall-typelibDATA \ @@ -17462,7 +18014,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ clean-cscope clean-generic clean-libLTLIBRARIES \ clean-libexecPROGRAMS clean-libtool clean-noinstLIBRARIES \ clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ - clean-pkglibLTLIBRARIES clean-pppd_pluginLTLIBRARIES \ + clean-pluginLTLIBRARIES clean-pppd_pluginLTLIBRARIES \ clean-sbinPROGRAMS cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ dist-tarZ dist-xz dist-zip distcheck distclean \ @@ -17471,12 +18023,13 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ distuninstallcheck dvi dvi-am html html-am info info-am \ install install-am install-binPROGRAMS install-data \ install-data-am install-data-hook install-dbusactivationDATA \ - install-dbusinterfacesDATA install-dbusserviceDATA install-dvi \ - install-dvi-am install-examplesDATA install-exec \ - install-exec-am install-exec-hook install-girDATA install-html \ - install-html-am install-info install-info-am \ - install-libLTLIBRARIES install-libdeprecatedHEADERS \ - install-libexecPROGRAMS install-libnm_glib_libnmincludeHEADERS \ + install-dbusinterfacesDATA install-dbusserviceDATA \ + install-dist_libexecSCRIPTS install-dvi install-dvi-am \ + install-examplesDATA install-exec install-exec-am \ + install-exec-hook install-girDATA install-html install-html-am \ + install-info install-info-am install-libLTLIBRARIES \ + install-libdeprecatedHEADERS install-libexecPROGRAMS \ + install-libnm_glib_libnmincludeHEADERS \ install-libnm_glib_libnmvpnHEADERS \ install-libnm_util_libnm_util_includeHEADERS \ install-libnmincludeHEADERS install-man install-man1 \ @@ -17485,7 +18038,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ install-nodist_libnm_glib_libnmvpnHEADERS \ install-nodist_libnm_util_libnm_util_includeHEADERS \ install-nodist_libnmincludeHEADERS install-pdf install-pdf-am \ - install-pkgconfigDATA install-pkglibLTLIBRARIES \ + install-pkgconfigDATA install-pluginLTLIBRARIES \ install-polkit_policyDATA install-pppd_pluginLTLIBRARIES \ install-ps install-ps-am install-sbinPROGRAMS \ install-serviceDATA install-strip install-systemdnmunitDATA \ @@ -17497,9 +18050,9 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ recheck tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS uninstall-dbusactivationDATA \ uninstall-dbusinterfacesDATA uninstall-dbusserviceDATA \ - uninstall-examplesDATA uninstall-girDATA uninstall-hook \ - uninstall-libLTLIBRARIES uninstall-libdeprecatedHEADERS \ - uninstall-libexecPROGRAMS \ + uninstall-dist_libexecSCRIPTS uninstall-examplesDATA \ + uninstall-girDATA uninstall-hook uninstall-libLTLIBRARIES \ + uninstall-libdeprecatedHEADERS uninstall-libexecPROGRAMS \ uninstall-libnm_glib_libnmincludeHEADERS \ uninstall-libnm_glib_libnmvpnHEADERS \ uninstall-libnm_util_libnm_util_includeHEADERS \ @@ -17509,7 +18062,7 @@ uninstall-man: uninstall-man1 uninstall-man5 uninstall-man7 \ uninstall-nodist_libnm_glib_libnmvpnHEADERS \ uninstall-nodist_libnm_util_libnm_util_includeHEADERS \ uninstall-nodist_libnmincludeHEADERS uninstall-pkgconfigDATA \ - uninstall-pkglibLTLIBRARIES uninstall-polkit_policyDATA \ + uninstall-pluginLTLIBRARIES uninstall-polkit_policyDATA \ uninstall-pppd_pluginLTLIBRARIES uninstall-sbinPROGRAMS \ uninstall-serviceDATA uninstall-systemdnmunitDATA \ uninstall-systemdsystemunitDATA uninstall-typelibDATA \ @@ -17566,8 +18119,9 @@ docs/api/dbus-%.xml: introspection/%.c $(dispatcher_libnm_dispatcher_core_la_OBJECTS): $(introspection_sources) $(dispatcher_nm_dispatcher_OBJECTS): $(introspection_sources) $(libnm_libnm_la_OBJECTS): $(introspection_sources) -$(src_libNetworkManager_la_OBJECTS): $(introspection_sources) -$(src_libNetworkManagerBase_la_OBJECTS): $(introspection_sources) + +check-docs: + $(srcdir)/tools/check-docs.sh "$(srcdir)" libnm-core/nm-core-enum-types.h.stamp: libnm-core/.dirstamp libnm-core/nm-core-enum-types.c.stamp: libnm-core/.dirstamp @@ -17620,8 +18174,17 @@ check-local-exports-libnm: libnm/libnm.la @HAVE_INTROSPECTION_TRUE@libnm/libnm.typelib: libnm/libnm.gir @HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_COMPILER) --includedir=$(srcdir)/libnm-core --includedir=$(builddir)/libnm-core --includedir=$(srcdir)/libnm --includedir=$(builddir)/libnm $< -o $@ +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ + +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ $(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@ + +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@libnm/fake-typelib/typelibs.c: libnm/fake-typelib/typelibs.gresource.xml libnm/fake-typelib/NetworkManager.typelib libnm/fake-typelib/NMClient.typelib +@HAVE_INTROSPECTION_TRUE@@WITH_FAKE_TYPELIBS_TRUE@ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< --target=$@ --sourcedir=$(builddir)/libnm/fake-typelib --generate-source --manual-register + @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-docs-overrides.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus "$(srcdir)" $@ +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl dbus $@ $(filter-out $<,$^) # When the python scripts loads libnm and the address sanitizers is # enabled, we must LD_PRELOAD libasan otherwise it will complain that @@ -17648,14 +18211,20 @@ check-local-exports-libnm: libnm/libnm.la @HAVE_INTROSPECTION_TRUE@ --output $@ @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-keyfile-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile "$(srcdir)" $@ +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl keyfile $@ $(filter-out $<,$^) @HAVE_INTROSPECTION_TRUE@libnm/nm-settings-ifcfg-rh-docs.xml: libnm/generate-plugin-docs.pl $(libnm_docs_sources) -@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh "$(srcdir)" $@ +@HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(srcdir)/libnm/generate-plugin-docs.pl ifcfg-rh $@ $(filter-out $<,$^) $(libnm_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(libnm_tests_test_secret_agent_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + +# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it +# is built first. +$(libnm_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) +$(libnm_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) +$(libnm_tests_test_secret_agent_OBJECTS): $(libnm_NM_1_0_typelib) $(src_libsystemd_nm_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_libNetworkManagerBase_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -17712,6 +18281,9 @@ $(src_settings_plugins_keyfile_tests_test_keyfile_OBJECTS): $(libnm_core_lib_h_p @CONFIG_PLUGIN_IFCFG_RH_TRUE@$(src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@CONFIG_PLUGIN_IFCFG_RH_TRUE@install-data-hook-ifcfg-rh: +@CONFIG_PLUGIN_IFCFG_RH_TRUE@ $(mkinstalldirs) -m 0755 $(DESTDIR)$(sysconfdir)/sysconfig/network-scripts + dist-hook-settings-ifcfg-rh-alias-files: @for f in $(src_settings_plugins_ifcfg_rh_tests_network_scripts_alias_files); do \ cp $(abs_srcdir)/$$f $(distdir)/src/settings/plugins/ifcfg-rh/tests/network-scripts/; \ @@ -17724,10 +18296,6 @@ dist-hook-settings-ifcfg-rh-alias-files: @CONFIG_PLUGIN_IFUPDOWN_TRUE@$(src_settings_plugins_ifupdown_tests_test_ifupdown_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -@CONFIG_PLUGIN_IFNET_TRUE@check-local-symbols-settings-ifnet: src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la -@CONFIG_PLUGIN_IFNET_TRUE@ $(call check_so_symbols,$(builddir)/src/settings/plugins/ifnet/.libs/libnm-settings-plugin-ifnet.so) -@CONFIG_PLUGIN_IFNET_TRUE@ $(CODE_COVERAGE_LDFLAGS) - check-local-devices-adsl: src/devices/adsl/libnm-device-plugin-adsl.la $(srcdir)/tools/check-exports.sh $(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so "$(srcdir)/linker-script-devices.ver" $(call check_so_symbols,$(builddir)/src/devices/adsl/.libs/libnm-device-plugin-adsl.so) @@ -17773,7 +18341,7 @@ $(src_platform_tests_test_nmp_object_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_platform_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_devices_tests_test_lldp_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_devices_tests_test_arping_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(src_devices_tests_test_acd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_ndisc_tests_test_ndisc_linux_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_ndisc_tests_test_ndisc_fake_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -17785,7 +18353,6 @@ $(src_tests_config_test_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(src_tests_test_resolvconf_capture_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @@ -17824,27 +18391,33 @@ $(dispatcher_tests_test_dispatcher_envp_OBJECTS): $(libnm_core_lib_h_pub_mkenums $(clients_nm_online_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +$(clients_common_libnmc_base_la_OBJECTS): $(libnm_lib_h_pub_mkenums) $(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp -@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp +@HAVE_INTROSPECTION_TRUE@$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^) -@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_c) -@HAVE_INTROSPECTION_TRUE@ @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ -@HAVE_INTROSPECTION_TRUE@ if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \ -@HAVE_INTROSPECTION_TRUE@ echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \ -@HAVE_INTROSPECTION_TRUE@ false; \ +@HAVE_INTROSPECTION_TRUE@check-local-settings-docs: $(clients_common_settings_doc_h) +@HAVE_INTROSPECTION_TRUE@ @if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \ +@HAVE_INTROSPECTION_TRUE@ if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \ +@HAVE_INTROSPECTION_TRUE@ if test "$$NM_TEST_REGENERATE" == 1 ; then \ +@HAVE_INTROSPECTION_TRUE@ cp -f "$(builddir)/$(clients_common_settings_doc_h)" "$(srcdir)/$(clients_common_settings_doc_h).in"; \ +@HAVE_INTROSPECTION_TRUE@ else \ +@HAVE_INTROSPECTION_TRUE@ echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes". You can also automatically copy the file by rerunning the test with \$$NM_TEST_REGENERATE=1 ; \ +@HAVE_INTROSPECTION_TRUE@ false; \ +@HAVE_INTROSPECTION_TRUE@ fi; \ @HAVE_INTROSPECTION_TRUE@ fi;\ @HAVE_INTROSPECTION_TRUE@ fi -@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp -@HAVE_INTROSPECTION_FALSE@ $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" +@HAVE_INTROSPECTION_FALSE@$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp +@HAVE_INTROSPECTION_FALSE@ $(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" @HAVE_INTROSPECTION_FALSE@check-local-settings-docs: $(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) -$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c) +$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h) $(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp $(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +@BUILD_NMCLI_TRUE@$(clients_cli_nmcli_OBJECTS): $(libnm_lib_h_pub_mkenums) @BUILD_NMCLI_TRUE@install-data-hook-nmcli: @BUILD_NMCLI_TRUE@ $(mkinstalldirs) $(DESTDIR)$(completiondir) @@ -17853,6 +18426,8 @@ $(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @BUILD_NMCLI_TRUE@uninstall-hook-nmcli: @BUILD_NMCLI_TRUE@ rm -f $(DESTDIR)$(completiondir)/nmcli +@BUILD_NMTUI_TRUE@$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums) + @BUILD_NMTUI_TRUE@$(clients_tui_nmtui_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @BUILD_NMTUI_TRUE@install-exec-hook-nmtui: @@ -17865,6 +18440,21 @@ $(clients_common_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @BUILD_NMTUI_TRUE@ rm -f "$(DESTDIR)$(bindir)/$$link"; \ @BUILD_NMTUI_TRUE@ done +############################################################################### +# clients/tests +############################################################################### + +check-local-clients-tests-test-client: clients/cli/nmcli clients/tests/test-client.py + mkdir -p "$(builddir)/clients/tests/" + GI_TYPELIB_PATH="$(abs_builddir)/libnm$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}" \ + LD_LIBRARY_PATH="$(abs_builddir)/libnm/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}" \ + NM_TEST_CLIENT_BUILDDIR="$(abs_builddir)" \ + NM_TEST_CLIENT_NMCLI_PATH=clients/cli/nmcli \ + "$(PYTHON)" \ + $(srcdir)/clients/tests/test-client.py -v &> "$(builddir)/clients/tests/test-client.log" && r=ok; \ + cat "$(builddir)/clients/tests/test-client.log"; \ + test "$$r" == ok + @HAVE_SYSTEMD_TRUE@data/NetworkManager.service: $(srcdir)/data/NetworkManager.service.in @HAVE_SYSTEMD_TRUE@ $(AM_V_GEN) $(data_edit) $< >$@ @@ -17927,10 +18517,23 @@ data/server.conf: $(srcdir)/data/server.conf.in @WITH_LEGACY_LIBRARIES_TRUE@check-local-exports-libnm-glib: @WITH_LEGACY_LIBRARIES_TRUE@ $(srcdir)/tools/check-exports.sh $(builddir)/libnm-glib/.libs/libnm-glib.so $(srcdir)/libnm-glib/libnm-glib.ver +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@check-local-libnm-glib-nm-client: libnm-glib/tests/test-nm-client +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ ( $(LOG_COMPILER) "$(builddir)/libnm-glib/tests/test-nm-client"; r="$$?"; test "$$r" = 0 -o "$$r" = 77 ) || \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@ false + @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) @WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_core_lib_h_pub_mkenums) +# tools/test-networkmanager-service.py uses libnm's typelib. Ensure it +# is built first. +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_nm_client_OBJECTS): $(libnm_NM_1_0_typelib) +@WITH_LEGACY_LIBRARIES_TRUE@$(libnm_glib_tests_test_remote_settings_client_OBJECTS): $(libnm_NM_1_0_typelib) + ############################################################################### # man ############################################################################### @@ -17942,6 +18545,8 @@ man/common.ent: man/common.ent.in @BUILD_DOCS_TRUE@man/%.1 man/%.5 man/%.7 man/%.8: man/%.xml man/common.ent @BUILD_DOCS_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< +@HAVE_INTROSPECTION_TRUE@man/nm-setting%.xml: man/common.ent + @HAVE_INTROSPECTION_TRUE@man/nm-setting%.xml: man/nm-setting%.xsl libnm/nm-setting%-docs.xml @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) $(XSLTPROC) --output $@ $(xsltproc_flags) $^ @@ -17991,7 +18596,7 @@ install-data-hook: $(install_data_hook) $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN $(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir) - $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir) uninstall-hook: $(uninstall_hook) diff --git a/NEWS b/NEWS index a9af5841..283fa05e 100644 --- a/NEWS +++ b/NEWS @@ -1,42 +1,75 @@ -=============================================== -NetworkManager-1.10.8 -Overview of changes since NetworkManager-1.10.6 -=============================================== +============================================= +NetworkManager-1.12.2 +Overview of changes since NetworkManager-1.12 +============================================= This is a new stable release of NetworkManager. Notable changes include: -* Fix connectivity timeout handling (bgo #794464) -* Retry activating devices when the parent becomes managed (rh #1553595) -* Correctly set the rp_filter value (rh #1565529) -* A fix to ensure teamd is respawned after daemon restart (rh #1551958) -* Better handle DHCP expiry (bgo #783391) -* Fix configuration of IPv6 over master interfaces (rh #1575944) -* Other various bug fixes including possible crashes -* Updated translations +* Fix missing symbols in libnm ABI for settings. +* Fix a regression that disallowed activations of VPN connections with a + device specified. +* Robustness fixes to connectivity checking. -=============================================== -NetworkManager-1.10.6 -Overview of changes since NetworkManager-1.10.4 -=============================================== - -This is a new stable release of NetworkManager. Notable changes include: - -* ovs: fix compilation issue of OVS plugin and various fixes -* team: add support for team runner "random" -* core: cleanup activation of device (rh #1537160) -* dhcp: retry indefinitely to renew the lease (rh #1503587) -* core: fix blocking autoconnect for no-secrets (rh #794014) -* libnm: mark async results as cancelled (bgo #794088) -* Various bug fixes including possible crashes. -* Updated translations. - -=============================================== -NetworkManager-1.10.4 -Overview of changes since NetworkManager-1.10.2 -=============================================== +============================================= +NetworkManager-1.12 +Overview of changes since NetworkManager-1.10 +============================================= This is a new stable release of NetworkManager. Notable changes include: +* Improved support for configuration checkpoint, including support in libnm. +* Added capability to set IP Tunnel configuration flags. +* The systemd-resolved DNS plugins now supports MDNS. +* systemd-resolved and dnsmasq DNS plugins now honor the DNS priority setting. +* Wi-Fi devices now support FILS for speedier roaming support. +* Drop dependency on libnl3 library. +* Add support for "onlink" routes. +* More robust connectivity checking. +* Dropped the obsolete "ifnet" settings plugin, +* Try harder to generate reasonable human-readable names for devices even if + the hwdb contains garbage. +* Add an "overview" option to hide default values in nmcli, resulting in more + concise output. +* Reworked the inner workings of D-Bus interface for better resource efficiency. +* Add support for configuring nmcli coloring via terminal-colors.d(5). +* Added experimental support for Meson build system, +* Added initial IWD Wi-Fi daemon support. +* A non-hexadecimal DHCPv4 client-id is now properly passed to + dhclient with the first byte (type) set to zero, as stated in the + documentation. This represents a change in behavior since previous + versions where the first character of the string was used as + type. The internal client is not affected by the change. +* DNS setting rc-manager=file now always follows dangling symlinks + instead of replacing /etc/resolv.conf with a plain file. +* Added wake_on_wlan connection setting to configure + wake-on-wireless-lan (WoWLAN). +* The libnm-glib library, deprecated in favor of libnm since NetworkManager 1.0, + is now not built by default. While it can still be enabled, the distributions + should have a good plan for removing it if they need to keep shipping it at + this point. +* nmcli now scans for Wi-Fi networks before displaying them, if the last scan + was too long ago. +* Added the ipv6.dhcp-duid property to allow configuring the DHCPv6 DUID +* Extended ipv6.dhcp-client-id property to support DHCP client identifers + depending on the MAC address and the stable ID. +* Set NM_DISPATCHER_ACTION environment variable in dispatcher scripts. + +The following features were backported to 1.10.x releases from 1.10.0 to +1.10.10 are also present in NetworkManager-1.12: + +* Fix crash during reapply of connection settings +* Fix connectivity timeout handling (bgo #794464), +* Retry activating devices when the parent becomes managed (rh #1553595), +* Correctly set the rp_filter value (rh #1565529). +* A fix to ensure teamd is respawned after daemon restart (rh #1551958). +* Better handle DHCP expiry (bgo #783391). +* Fix configuration of IPv6 over master interfaces (rh #1575944). +* ovs: fix compilation issue of OVS plugin and various fixes. +* team: add support for team runner "random". +* core: cleanup activation of device (rh #1537160). +* dhcp: retry indefinitely to renew the lease (rh #1503587). +* core: fix blocking autoconnect for no-secrets (rh #794014). +* libnm: mark async results as cancelled (bgo #794088). * Load jansson at runtime. This solves a clash with json-glib that caused a gnome-control-center crash, but also gets rid of a hard dependency. * Correct nmcli exit values after receiving a signal. @@ -45,15 +78,6 @@ This is a new stable release of NetworkManager. Notable changes include: * Improve communication of DAD failures. * Remember device default metrics across daemon restarts. * Various bug fixes including possible crashes. -* Updated translations. - -=============================================== -NetworkManager-1.10.2 -Overview of changes since NetworkManager-1.10.0 -=============================================== - -This is a new stable release of NetworkManager. Notable changes include: - * Added support for 'onlink' IPv4 routes attribute. * Wait longer for the carrier to come up after a MTU change. * Implemented abstraction for team connections that exposes team @@ -986,7 +1010,7 @@ Overview of changes since NetworkManager-0.4.1 default action. * Fix icon animation smoothness * Display more data in the Connection Information dialog - (Robert Love) + (Robert Love). ============================================ diff --git a/README b/README index 286cabcb..fd3898dd 100644 --- a/README +++ b/README @@ -45,7 +45,7 @@ settings service" and the "user settings service" store connection information and provide these to NetworkManager, also via D-Bus. Each settings service can determine how and where it persistently stores the connection information; for example, the GNOME applet stores its configuration in GConf, and the system -settings service stores it's config in distro-specific formats, or in a distro- +settings service stores its config in distro-specific formats, or in a distro- agnostic format, depending on user/administrator preference. A variety of other system services are used by NetworkManager to provide diff --git a/TODO b/TODO index 86fef82b..566bbd5a 100644 --- a/TODO +++ b/TODO @@ -19,7 +19,7 @@ The first is the largest obstacle, but ideally we implement this and enable it when we have the required glib and libsoup versions available. One other complication is that this checking should be done during the NM_DEVICE_STATE_IP_CHECK phase (along with other operations like WiFi hotspot -auto-login) while the current checks are done globally in nm-manager.c, so +auto-login) while the current checks are done globally in nm-manager.c, so keeping both code paths might be complex. But ideally, once the device has successfully gotten an IPv4 or IPv6 address, it @@ -38,7 +38,7 @@ based on it and the device's state. To allow for "pre-down" scenarios, this state should be implemented before a device is taken down while it still has connectivity. If the device is -taken down because it's ethernet carrier was dropped, or because the WiFi +taken down because its ethernet carrier was dropped, or because the WiFi connection was terminated by the supplicant, this state is pointless and should be skipped. But if the user requested a manual "disconnect", or NM is dropping connections on exit, etc, then this state should be entered. In the future @@ -235,7 +235,7 @@ proceeds with the connection. NM sends the correct wpa_supplicant config for WPS to the supplicant, and waits for the connection to occur. WPS can only be used the *first* time, so after a -first successfull connection, NM must request the actual hexadecimal PSK from +first successfull connection, NM must request the actual hexadecimal PSK from wpa_supplicant via D-Bus, and store that PSK in the connection, clear any WPS PIN code from the connection, and save the connection to backing storage. diff --git a/autogen.sh b/autogen.sh index 9bb02948..836bb603 100755 --- a/autogen.sh +++ b/autogen.sh @@ -28,5 +28,5 @@ AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose cd $olddir if test -z "$NOCONFIGURE"; then - exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error --enable-gtk-doc --enable-introspection "$@" + exec $srcdir/configure --enable-maintainer-mode --enable-more-warnings=error --enable-gtk-doc --enable-introspection --with-libnm-glib "$@" fi diff --git a/build-aux/compile b/build-aux/compile index 2ab71e4e..de0005d4 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Wrapper for compilers which do not understand '-c -o'. scriptversion=2016-01-11.22; # UTC diff --git a/build-aux/config.guess b/build-aux/config.guess index a7448442..717b2287 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. diff --git a/build-aux/config.sub b/build-aux/config.sub index 932128b3..f4bafc18 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Configuration validation subroutine script. # Copyright 1992-2017 Free Software Foundation, Inc. diff --git a/build-aux/depcomp b/build-aux/depcomp index b39f98f9..30379e22 100755 --- a/build-aux/depcomp +++ b/build-aux/depcomp @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # depcomp - compile a program generating dependencies as side-effects scriptversion=2016-01-11.22; # UTC diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index 0f0a2da3..30be9c82 100644 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -7272,10 +7272,12 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/build-aux/missing b/build-aux/missing index c6e37958..b7e571ef 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Common wrapper for a few potentially missing GNU programs. scriptversion=2016-01-11.22; # UTC diff --git a/build-aux/tap-driver.sh b/build-aux/tap-driver.sh index 82efa96c..3f6aa3a1 100755 --- a/build-aux/tap-driver.sh +++ b/build-aux/tap-driver.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff --git a/build-aux/test-driver b/build-aux/test-driver index 0218a01f..de1e61da 100755 --- a/build-aux/test-driver +++ b/build-aux/test-driver @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # test-driver - basic testsuite driver script. scriptversion=2016-01-11.22; # UTC diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 488b16f4..bbfe47fb 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -104,7 +104,7 @@ get_secrets_from_user (const char *request_id, rl_startup_hook = set_deftext; pre_input_deftext = g_strdup (secret->value); } - pwd = nmc_readline ("%s (%s): ", secret->name, secret->prop_name); + pwd = nmc_readline ("%s (%s): ", secret->pretty_name, secret->entry_id); /* No password provided, cancel the secrets. */ if (!pwd) @@ -136,7 +136,6 @@ secrets_requested (NMSecretAgentSimple *agent, nm_secret_agent_simple_response (agent, request_id, NULL); } - static NMCResultCode do_agent_secret (NmCli *nmc, int argc, char **argv) { diff --git a/clients/cli/common.c b/clients/cli/common.c index 0f5aea57..09c86334 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2012 - 2014 Red Hat, Inc. + * Copyright 2012 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -26,12 +26,10 @@ #include #include #include -#include #include #include #include -#include "nm-utils/nm-hash-utils.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" @@ -51,6 +49,9 @@ _ip_config_get_routes (NMIPConfig *cfg) if (!ptr_array) return NULL; + if (ptr_array->len == 0) + return NULL; + arr = g_new (char *, ptr_array->len + 1); for (i = 0; i < ptr_array->len; i++) { NMIPRoute *route = g_ptr_array_index (ptr_array, i); @@ -102,24 +103,19 @@ _ip_config_get_routes (NMIPConfig *cfg) } static gconstpointer -_metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, - gpointer environment_user_data, - const NmcMetaGenericInfo *info, - gpointer target, - NMMetaAccessorGetType get_type, - NMMetaAccessorGetFlags get_flags, - NMMetaAccessorGetOutFlags *out_flags, - gpointer *out_to_free) +_metagen_ip4_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { NMIPConfig *cfg4 = target; GPtrArray *ptr_array; char **arr; const char *const*arrc; guint i = 0; + const char *str; nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM); - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + NM_SET_OUT (out_is_default, TRUE); switch (info->info_type) { case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ADDRESS: @@ -140,7 +136,9 @@ _metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, arr = NULL; goto arr_out; case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_GATEWAY: - return nm_ip_config_get_gateway (cfg4); + str = nm_ip_config_get_gateway (cfg4); + NM_SET_OUT (out_is_default, !str); + return str; case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ROUTE: if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) return NULL; @@ -168,34 +166,31 @@ _metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment, g_return_val_if_reached (NULL); arrc_out: + NM_SET_OUT (out_is_default, !arrc || !arrc[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; return arrc; arr_out: + NM_SET_OUT (out_is_default, !arr || !arr[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; *out_to_free = arr; return arr; } static gconstpointer -_metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, - gpointer environment_user_data, - const NmcMetaGenericInfo *info, - gpointer target, - NMMetaAccessorGetType get_type, - NMMetaAccessorGetFlags get_flags, - NMMetaAccessorGetOutFlags *out_flags, - gpointer *out_to_free) +_metagen_ip6_config_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { NMIPConfig *cfg6 = target; GPtrArray *ptr_array; char **arr; const char *const*arrc; guint i = 0; + const char *str; nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM); - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + NM_SET_OUT (out_is_default, TRUE); switch (info->info_type) { case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ADDRESS: @@ -216,7 +211,9 @@ _metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, arr = NULL; goto arr_out; case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_GATEWAY: - return nm_ip_config_get_gateway (cfg6); + str = nm_ip_config_get_gateway (cfg6); + NM_SET_OUT (out_is_default, !str); + return str; case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ROUTE: if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV)) return NULL; @@ -239,10 +236,12 @@ _metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment, g_return_val_if_reached (NULL); arrc_out: + NM_SET_OUT (out_is_default, !arrc || !arrc[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; return arrc; arr_out: + NM_SET_OUT (out_is_default, !arr || !arr[0]); *out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV; *out_to_free = arr; return arr; @@ -259,11 +258,6 @@ const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CO _METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS, "WINS"), }; -static const NmcMetaGenericInfo *const metagen_ip4_config_group[] = { - NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config, .name_header = N_("GROUP")), - NULL, -}; - const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM + 1] = { #define _METAGEN_IP6_CONFIG(type, name) \ [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip6_config_get_fcn) @@ -274,14 +268,9 @@ const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CO _METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, "DOMAIN"), }; -static const NmcMetaGenericInfo *const metagen_ip6_config_group[] = { - NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config, .name_header = N_("GROUP")), - NULL, -}; - /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_dhcp4_config[] = { +const NmcMetaGenericInfo *const nmc_fields_dhcp_config[] = { NMC_META_GENERIC ("GROUP"), /* 0 */ NMC_META_GENERIC ("OPTION"), /* 1 */ NULL, @@ -297,12 +286,6 @@ const NmcMetaGenericInfo *const nmc_fields_ip6_config[] = { NULL, }; -const NmcMetaGenericInfo *const nmc_fields_dhcp6_config[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("OPTION"), /* 1 */ - NULL, -}; - gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, @@ -320,7 +303,7 @@ print_ip4_config (NMIPConfig *cfg4, if (!nmc_print (nmc_config, (gpointer[]) { cfg4, NULL }, NULL, - (const NMMetaAbstractInfo *const*) metagen_ip4_config_group, + NMC_META_GENERIC_GROUP ("IP4", metagen_ip4_config, N_("GROUP")), field_str, &error)) { return FALSE; @@ -346,7 +329,7 @@ print_ip6_config (NMIPConfig *cfg6, if (!nmc_print (nmc_config, (gpointer[]) { cfg6, NULL }, NULL, - (const NMMetaAbstractInfo *const*) metagen_ip6_config_group, + NMC_META_GENERIC_GROUP ("IP6", metagen_ip6_config, N_("GROUP")), field_str, &error)) { return FALSE; @@ -355,82 +338,37 @@ print_ip6_config (NMIPConfig *cfg6, } gboolean -print_dhcp4_config (NMDhcpConfig *dhcp4, - const NmcConfig *nmc_config, - const char *group_prefix, - const char *one_field) +print_dhcp_config (NMDhcpConfig *dhcp, + const NmcConfig *nmc_config, + const char *group_prefix, + const char *one_field) { GHashTable *table; const NMMetaAbstractInfo *const*tmpl; NmcOutputField *arr; - if (dhcp4 == NULL) + if (dhcp == NULL) return FALSE; - table = nm_dhcp_config_get_options (dhcp4); + table = nm_dhcp_config_get_options (dhcp); if (table) { - GHashTableIter table_iter; - gpointer key, value; char **options_arr = NULL; - int i = 0; NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + gs_free const char **keys = NULL; + guint i, nkeys; - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dhcp4_config; + tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dhcp_config; out_indices = parse_output_fields (one_field, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); - options_arr = g_new (char *, g_hash_table_size (table) + 1); - g_hash_table_iter_init (&table_iter, table); - while (g_hash_table_iter_next (&table_iter, &key, &value)) - options_arr[i++] = g_strdup_printf ("%s = %s", (char *) key, (char *) value); - options_arr[i] = NULL; - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); - set_val_strc (arr, 0, group_prefix); - set_val_arr (arr, 1, options_arr); - g_ptr_array_add (out.output_data, arr); - - print_data_prepare_width (out.output_data); - print_data (nmc_config, out_indices, NULL, 0, &out); - - return TRUE; - } - return FALSE; -} - -gboolean -print_dhcp6_config (NMDhcpConfig *dhcp6, - const NmcConfig *nmc_config, - const char *group_prefix, - const char *one_field) -{ - GHashTable *table; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - - if (dhcp6 == NULL) - return FALSE; + keys = (const char **) g_hash_table_get_keys_as_array (table, &nkeys); + nm_utils_strv_sort (keys, nkeys); - table = nm_dhcp_config_get_options (dhcp6); - if (table) { - GHashTableIter table_iter; - gpointer key, value; - char **options_arr = NULL; - int i = 0; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dhcp6_config; - out_indices = parse_output_fields (one_field, - tmpl, FALSE, NULL, NULL); - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - options_arr = g_new (char *, g_hash_table_size (table) + 1); - g_hash_table_iter_init (&table_iter, table); - while (g_hash_table_iter_next (&table_iter, &key, &value)) - options_arr[i++] = g_strdup_printf ("%s = %s", (char *) key, (char *) value); + options_arr = g_new (char *, nkeys + 1); + for (i = 0; i < nkeys; i++) + options_arr[i] = g_strdup_printf ("%s = %s", keys[i], (const char *) g_hash_table_lookup (table, keys[i])); options_arr[i] = NULL; arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); @@ -449,10 +387,13 @@ print_dhcp6_config (NMDhcpConfig *dhcp6, /* * nmc_find_connection: * @connections: array of NMConnections to search in - * @filter_type: "id", "uuid", "path" or %NULL + * @filter_type: "id", "uuid", "path", "filename", or %NULL * @filter_val: connection to find (connection name, UUID or path) - * @start: where to start in @list. The location is updated so that the function - * can be called multiple times (for connections with the same name). + * @out_result: if not NULL, attach all matching connection to this + * list. If necessary, a new array will be allocated. If the array + * already contains a connection, it will not be added a second time. + * All object are referenced by the array. If the function allocates + * a new array, it will set the free function to g_object_unref. * @complete: print possible completions * * Find a connection in @list according to @filter_val. @filter_type determines @@ -467,64 +408,169 @@ NMConnection * nmc_find_connection (const GPtrArray *connections, const char *filter_type, const char *filter_val, - int *start, + GPtrArray **out_result, gboolean complete) { NMConnection *connection; - NMConnection *found = NULL; - int i; - const char *id; - const char *uuid; - const char *path, *path_num; + NMConnection *best_candidate = NULL; + GPtrArray *result = out_result ? *out_result : NULL; + guint i, j; - for (i = start ? *start : 0; i < connections->len; i++) { - connection = NM_CONNECTION (connections->pdata[i]); + nm_assert (connections); + nm_assert (filter_val); + + for (i = 0; i < connections->len; i++) { + const char *v, *v_num; - id = nm_connection_get_id (connection); - uuid = nm_connection_get_uuid (connection); - path = nm_connection_get_path (connection); - path_num = path ? strrchr (path, '/') + 1 : NULL; + connection = NM_CONNECTION (connections->pdata[i]); /* When filter_type is NULL, compare connection ID (filter_val) * against all types. Otherwise, only compare against the specific * type. If 'path' filter type is specified, comparison against * numeric index (in addition to the whole path) is allowed. */ - if (!filter_type || strcmp (filter_type, "id") == 0) { + if (NM_IN_STRSET (filter_type, NULL, "id")) { + v = nm_connection_get_id (connection); if (complete) - nmc_complete_strings (filter_val, id, NULL); - if (strcmp (filter_val, id) == 0) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) goto found; } - if (!filter_type || strcmp (filter_type, "uuid") == 0) { + if (NM_IN_STRSET (filter_type, NULL, "uuid")) { + v = nm_connection_get_uuid (connection); if (complete && (filter_type || *filter_val)) - nmc_complete_strings (filter_val, uuid, NULL); - if (strcmp (filter_val, uuid) == 0) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) goto found; } - if (!filter_type || strcmp (filter_type, "path") == 0) { + if (NM_IN_STRSET (filter_type, NULL, "path")) { + v = nm_connection_get_path (connection); + v_num = nm_utils_dbus_path_get_last_component (v); if (complete && (filter_type || *filter_val)) - nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL); - if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0)) + nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL); + if ( nm_streq0 (filter_val, v) + || (filter_type && nm_streq0 (filter_val, v_num))) + goto found; + } + + if (NM_IN_STRSET (filter_type, NULL, "filename")) { + v = nm_remote_connection_get_filename (NM_REMOTE_CONNECTION (connections->pdata[i])); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) goto found; } continue; found: - if (!start) + if (!out_result) return connection; - if (found) { - *start = i; - return found; + if (!best_candidate) + best_candidate = connection; + if (!result) + result = g_ptr_array_new_with_free_func (g_object_unref); + for (j = 0; j < result->len; j++) { + if (connection == result->pdata[j]) + break; } - found = connection; + if (j == result->len) + g_ptr_array_add (result, g_object_ref (connection)); } - if (start) - *start = 0; - return found; + NM_SET_OUT (out_result, result); + return best_candidate; +} + +NMActiveConnection * +nmc_find_active_connection (const GPtrArray *active_cons, + const char *filter_type, + const char *filter_val, + GPtrArray **out_result, + gboolean complete) +{ + guint i, j; + NMActiveConnection *best_candidate = NULL; + GPtrArray *result = out_result ? *out_result : NULL; + + nm_assert (filter_val); + + for (i = 0; i < active_cons->len; i++) { + NMRemoteConnection *con; + NMActiveConnection *candidate = g_ptr_array_index (active_cons, i); + const char *v, *v_num; + + con = nm_active_connection_get_connection (candidate); + + /* When filter_type is NULL, compare connection ID (filter_val) + * against all types. Otherwise, only compare against the specific + * type. If 'path' or 'apath' filter types are specified, comparison + * against numeric index (in addition to the whole path) is allowed. + */ + if (NM_IN_STRSET (filter_type, NULL, "id")) { + v = nm_active_connection_get_id (candidate); + if (complete) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) + goto found; + } + + if (NM_IN_STRSET (filter_type, NULL, "uuid")) { + v = nm_active_connection_get_uuid (candidate); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) + goto found; + } + + if (NM_IN_STRSET (filter_type, NULL, "path")) { + v = con ? nm_connection_get_path (NM_CONNECTION (con)) : NULL; + v_num = nm_utils_dbus_path_get_last_component (v); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL); + if ( nm_streq0 (filter_val, v) + || (filter_type && nm_streq0 (filter_val, v_num))) + goto found; + } + + if (NM_IN_STRSET (filter_type, NULL, "filename")) { + v = nm_remote_connection_get_filename (con); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, NULL); + if (nm_streq0 (filter_val, v)) + goto found; + } + + if (NM_IN_STRSET (filter_type, NULL, "apath")) { + v = nm_object_get_path (NM_OBJECT (candidate)); + v_num = nm_utils_dbus_path_get_last_component (v); + if (complete && (filter_type || *filter_val)) + nmc_complete_strings (filter_val, v, filter_type ? v_num : NULL, NULL); + if ( nm_streq0 (filter_val, v) + || (filter_type && nm_streq0 (filter_val, v_num))) + goto found; + } + + continue; + +found: + if (!out_result) + return candidate; + if (!best_candidate) + best_candidate = candidate; + if (!result) + result = g_ptr_array_new_with_free_func (g_object_unref); + for (j = 0; j < result->len; j++) { + if (candidate == result->pdata[j]) + break; + } + if (j == result->len) + g_ptr_array_add (result, g_object_ref (candidate)); + } + + NM_SET_OUT (out_result, result); + return best_candidate; } static gboolean @@ -532,10 +578,10 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) { GError *error = NULL; NMSettingVpn *s_vpn; - const char *vpn_type, *gw, *port; - char *cookie = NULL; - char *gateway = NULL; - char *gwcert = NULL; + const char *gw, *port; + gs_free char *cookie = NULL; + gs_free char *gateway = NULL; + gs_free char *gwcert = NULL; int status = 0; int i; gboolean ret; @@ -547,8 +593,7 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) return FALSE; s_vpn = nm_connection_get_setting_vpn (connection); - vpn_type = nm_setting_vpn_get_service_type (s_vpn); - if (g_strcmp0 (vpn_type, NM_DBUS_INTERFACE ".openconnect")) + if (!nm_streq0 (nm_setting_vpn_get_service_type (s_vpn), NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT)) return FALSE; /* Get gateway and port */ @@ -571,34 +616,31 @@ vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets) /* Append port to the host value */ if (gateway && port) { - char *tmp = gateway; - gateway = g_strdup_printf ("%s%s", gateway, port); - g_free (tmp); + gs_free char *tmp = gateway; + + gateway = g_strdup_printf ("%s%s", tmp, port); } /* Fill secrets to the array */ for (i = 0; i < secrets->len; i++) { NMSecretAgentSimpleSecret *secret = secrets->pdata[i]; - if (!g_strcmp0 (secret->vpn_type, vpn_type)) { - if (!g_strcmp0 (secret->vpn_property, "cookie")) { - g_free (secret->value); - secret->value = cookie; - cookie = NULL; - } else if (!g_strcmp0 (secret->vpn_property, "gateway")) { - g_free (secret->value); - secret->value = gateway; - gateway = NULL; - } else if (!g_strcmp0 (secret->vpn_property, "gwcert")) { - g_free (secret->value); - secret->value = gwcert; - gwcert = NULL; - } + if (secret->secret_type != NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET) + continue; + if (!nm_streq0 (secret->vpn_type, NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT)) + continue; + + if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "cookie")) { + g_free (secret->value); + secret->value = g_steal_pointer (&cookie); + } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gateway")) { + g_free (secret->value); + secret->value = g_steal_pointer (&gateway); + } else if (nm_streq0 (secret->entry_id, NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRET "gwcert")) { + g_free (secret->value); + secret->value = g_steal_pointer (&gwcert); } } - g_free (cookie); - g_free (gateway); - g_free (gwcert); return TRUE; } @@ -625,7 +667,7 @@ get_secrets_from_user (const char *request_id, /* First try to find the password in provided passwords file, * then ask user. */ - if (pwds_hash && (pwd = g_hash_table_lookup (pwds_hash, secret->prop_name))) { + if (pwds_hash && (pwd = g_hash_table_lookup (pwds_hash, secret->entry_id))) { pwd = g_strdup (pwd); } else { if (ask) { @@ -641,8 +683,10 @@ get_secrets_from_user (const char *request_id, } if (msg) g_print ("%s\n", msg); - pwd = nmc_readline_echo (secret->password ? echo_on : TRUE, - "%s (%s): ", secret->name, secret->prop_name); + pwd = nmc_readline_echo (secret->is_secret + ? echo_on + : TRUE, + "%s (%s): ", secret->pretty_name, secret->entry_id); if (!pwd) pwd = g_strdup (""); } else { @@ -650,7 +694,7 @@ get_secrets_from_user (const char *request_id, g_print ("%s\n", msg); g_printerr (_("Warning: password for '%s' not given in 'passwd-file' " "and nmcli cannot ask without '--ask' option.\n"), - secret->prop_name); + secret->entry_id); } } /* No password provided, cancel the secrets. */ @@ -883,6 +927,31 @@ nmc_readline (const char *prompt_fmt, ...) return str; } +static void +nmc_secret_redisplay (void) +{ + int save_point = rl_point; + int save_end = rl_end; + char *save_line_buffer = rl_line_buffer; + const char *subst = nmc_password_subst_char (); + int subst_len = strlen (subst); + int i; + + rl_point = g_utf8_strlen (save_line_buffer, save_point) * subst_len; + rl_end = g_utf8_strlen (rl_line_buffer, -1) * subst_len; + rl_line_buffer = g_slice_alloc (rl_end + 1); + + for (i = 0; i + subst_len <= rl_end; i += subst_len) + memcpy (&rl_line_buffer[i], subst, subst_len); + rl_line_buffer[i] = '\0'; + + rl_redisplay (); + g_slice_free1 (rl_end + 1, rl_line_buffer); + rl_line_buffer = save_line_buffer; + rl_end = save_end; + rl_point = save_point; +} + /** * nmc_readline_echo: * @@ -894,29 +963,28 @@ nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...) { va_list args; char *prompt, *str; - struct termios termios_orig, termios_new; + HISTORY_STATE *saved_history; + HISTORY_STATE passwd_history = { 0, }; va_start (args, prompt_fmt); prompt = g_strdup_vprintf (prompt_fmt, args); va_end (args); - /* Disable echoing characters */ + /* Hide the actual password */ if (!echo_on) { - tcgetattr (STDIN_FILENO, &termios_orig); - termios_new = termios_orig; - termios_new.c_lflag &= ~(ECHO); - tcsetattr (STDIN_FILENO, TCSADRAIN, &termios_new); + saved_history = history_get_history_state (); + history_set_history_state (&passwd_history); + rl_redisplay_function = nmc_secret_redisplay; } str = nmc_readline_helper (prompt); g_free (prompt); - /* Restore original terminal settings */ + /* Restore the non-hiding behavior */ if (!echo_on) { - tcsetattr (STDIN_FILENO, TCSADRAIN, &termios_orig); - /* New line - setting ECHONL | ICANON did not help */ - fprintf (stdout, "\n"); + rl_redisplay_function = rl_redisplay; + history_set_history_state (saved_history); } return str; @@ -1215,9 +1283,8 @@ nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char /* A valid command was specified. */ if (c->usage && argc == 2 && nmc->complete) nmc_complete_help (*(argv+1)); - if (c->usage && nmc_arg_is_help (*(argv+1))) { - if (!nmc->complete) - c->usage (); + if (!nmc->complete && c->usage && nmc_arg_is_help (*(argv+1))) { + c->usage (); g_simple_async_result_complete_in_idle (simple); g_object_unref (simple); } else { diff --git a/clients/cli/common.h b/clients/cli/common.h index 354b2a5f..8f4e47c2 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -27,15 +27,20 @@ gboolean print_ip4_config (NMIPConfig *cfg4, const NmcConfig *nmc_config, const char *one_field); gboolean print_ip6_config (NMIPConfig *cfg6, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field); -gboolean print_dhcp4_config (NMDhcpConfig *dhcp4, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field); -gboolean print_dhcp6_config (NMDhcpConfig *dhcp6, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field); +gboolean print_dhcp_config (NMDhcpConfig *dhcp, const NmcConfig *nmc_config, const char *group_prefix, const char *one_field); NMConnection *nmc_find_connection (const GPtrArray *connections, const char *filter_type, const char *filter_val, - int *start, + GPtrArray **out_result, gboolean complete); +NMActiveConnection *nmc_find_active_connection (const GPtrArray *active_cons, + const char *filter_type, + const char *filter_val, + GPtrArray **out_result, + gboolean complete); + void nmc_secrets_requested (NMSecretAgentSimple *agent, const char *request_id, const char *title, @@ -78,8 +83,7 @@ void nmc_complete_bool (const char *prefix); const char *nmc_error_get_simple_message (GError *error); extern const NmcMetaGenericInfo *const metagen_ip4_config[]; -extern const NmcMetaGenericInfo *const nmc_fields_dhcp4_config[]; extern const NmcMetaGenericInfo *const nmc_fields_ip6_config[]; -extern const NmcMetaGenericInfo *const nmc_fields_dhcp6_config[]; +extern const NmcMetaGenericInfo *const nmc_fields_dhcp_config[]; #endif /* NMC_COMMON_H */ diff --git a/clients/cli/connections.c b/clients/cli/connections.c index e0f55c53..1563178d 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -31,8 +31,6 @@ #include #include -#include "nm-utils/nm-hash-utils.h" - #include "nm-client-utils.h" #include "nm-vpn-helpers.h" #include "nm-meta-setting-access.h" @@ -78,41 +76,557 @@ struct _OptionInfo { /*****************************************************************************/ -const NmcMetaGenericInfo *const nmc_fields_con_show[] = { - NMC_META_GENERIC ("NAME"), /* 0 */ - NMC_META_GENERIC ("UUID"), /* 1 */ - NMC_META_GENERIC ("TYPE"), /* 2 */ - NMC_META_GENERIC ("TIMESTAMP"), /* 3 */ - NMC_META_GENERIC ("TIMESTAMP-REAL"), /* 4 */ - NMC_META_GENERIC ("AUTOCONNECT"), /* 5 */ - NMC_META_GENERIC ("AUTOCONNECT-PRIORITY"), /* 6 */ - NMC_META_GENERIC ("READONLY"), /* 7 */ - NMC_META_GENERIC ("DBUS-PATH"), /* 8 */ - NMC_META_GENERIC ("ACTIVE"), /* 9 */ - NMC_META_GENERIC ("DEVICE"), /* 10 */ - NMC_META_GENERIC ("STATE"), /* 11 */ - NMC_META_GENERIC ("ACTIVE-PATH"), /* 12 */ - NMC_META_GENERIC ("SLAVE"), /* 13 */ - NULL, +NM_UTILS_LOOKUP_STR_DEFINE_STATIC (active_connection_state_to_string, NMActiveConnectionState, + NM_UTILS_LOOKUP_DEFAULT (N_("unknown")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_ACTIVATING, N_("activating")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_ACTIVATED, N_("activated")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_DEACTIVATING, N_("deactivating")), + NM_UTILS_LOOKUP_ITEM (NM_ACTIVE_CONNECTION_STATE_DEACTIVATED, N_("deactivated")), + NM_UTILS_LOOKUP_ITEM_IGNORE (NM_ACTIVE_CONNECTION_STATE_UNKNOWN), +) + +NM_UTILS_LOOKUP_STR_DEFINE_STATIC (vpn_connection_state_to_string, NMVpnConnectionState, + NM_UTILS_LOOKUP_DEFAULT (N_("unknown")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_PREPARE, N_("VPN connecting (prepare)")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_NEED_AUTH, N_("VPN connecting (need authentication)")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_CONNECT, N_("VPN connecting")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_IP_CONFIG_GET, N_("VPN connecting (getting IP configuration)")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_ACTIVATED, N_("VPN connected")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_FAILED, N_("VPN connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_VPN_CONNECTION_STATE_DISCONNECTED, N_("VPN disconnected")), + NM_UTILS_LOOKUP_ITEM_IGNORE (NM_VPN_CONNECTION_STATE_UNKNOWN), +) + +/* Essentially a version of nm_setting_connection_get_connection_type() that + * prefers an alias instead of the settings name when in pretty print mode. + * That is so that we print "wifi" instead of "802-11-wireless" in "nmcli c". */ +static const char * +connection_type_to_display (const char *type, NMMetaAccessorGetType get_type) +{ + const NMMetaSettingInfoEditor *editor; + int i; + + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + if (!type) + return NULL; + + if (get_type != NM_META_ACCESSOR_GET_TYPE_PRETTY) + return type; + + for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { + editor = &nm_meta_setting_infos_editor[i]; + if (nm_streq (type, editor->general->setting_name)) + return editor->alias ?: type; + } + return type; +} + +static int +active_connection_get_state_ord (NMActiveConnection *active) +{ + /* returns an integer related to @active's state, that can be used for sorting + * active connections based on their activation state. */ + if (!active) + return -2; + + switch (nm_active_connection_get_state (active)) { + case NM_ACTIVE_CONNECTION_STATE_UNKNOWN: return 0; + case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: return 1; + case NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: return 2; + case NM_ACTIVE_CONNECTION_STATE_ACTIVATING: return 3; + case NM_ACTIVE_CONNECTION_STATE_ACTIVATED: return 4; + } + return -1; +} + +static int +active_connection_cmp (NMActiveConnection *ac_a, NMActiveConnection *ac_b) +{ + NM_CMP_SELF (ac_a, ac_b); + NM_CMP_DIRECT (active_connection_get_state_ord (ac_b), + active_connection_get_state_ord (ac_a)); + NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_id (ac_a), nm_active_connection_get_id (ac_b)); + NM_CMP_DIRECT_STRCMP0 (nm_active_connection_get_connection_type (ac_a), nm_active_connection_get_connection_type (ac_b)); + NM_CMP_DIRECT_STRCMP0 (nm_object_get_path (NM_OBJECT (ac_a)), nm_object_get_path (NM_OBJECT (ac_b))); + return 0; +} + +static char * +get_ac_device_string (NMActiveConnection *active) +{ + GString *dev_str; + const GPtrArray *devices; + int i; + + if (!active) + return NULL; + + /* Get devices of the active connection */ + dev_str = g_string_new (NULL); + devices = nm_active_connection_get_devices (active); + for (i = 0; i < devices->len; i++) { + NMDevice *device = g_ptr_array_index (devices, i); + const char *dev_iface = nm_device_get_iface (device); + + if (dev_iface) { + g_string_append (dev_str, dev_iface); + g_string_append_c (dev_str, ','); + } + } + if (dev_str->len > 0) + g_string_truncate (dev_str, dev_str->len - 1); /* Cut off last ',' */ + + return g_string_free (dev_str, FALSE); +} + +/*****************************************************************************/ + +/* FIXME: The same or similar code for VPN info appears also in nm-applet (applet-dialogs.c), + * and in gnome-control-center as well. It could probably be shared somehow. */ + +static char * +get_vpn_connection_type (NMConnection *connection) +{ + const char *type, *p; + + /* The service type is in form of "org.freedesktop.NetworkManager.vpnc". + * Extract end part after last dot, e.g. "vpnc" + */ + type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection)); + p = strrchr (type, '.'); + return g_strdup (p ? p + 1 : type); +} + +/* VPN parameters can be found at: + * http://git.gnome.org/browse/network-manager-openvpn/tree/src/nm-openvpn-service.h + * http://git.gnome.org/browse/network-manager-vpnc/tree/src/nm-vpnc-service.h + * http://git.gnome.org/browse/network-manager-pptp/tree/src/nm-pptp-service.h + * http://git.gnome.org/browse/network-manager-openconnect/tree/src/nm-openconnect-service.h + * http://git.gnome.org/browse/network-manager-openswan/tree/src/nm-openswan-service.h + * See also 'properties' directory in these plugins. + */ +static const gchar * +find_vpn_gateway_key (const char *vpn_type) +{ + if (g_strcmp0 (vpn_type, "openvpn") == 0) return "remote"; + if (g_strcmp0 (vpn_type, "vpnc") == 0) return "IPSec gateway"; + if (g_strcmp0 (vpn_type, "pptp") == 0) return "gateway"; + if (g_strcmp0 (vpn_type, "openconnect") == 0) return "gateway"; + if (g_strcmp0 (vpn_type, "openswan") == 0) return "right"; + if (g_strcmp0 (vpn_type, "libreswan") == 0) return "right"; + if (g_strcmp0 (vpn_type, "ssh") == 0) return "remote"; + if (g_strcmp0 (vpn_type, "l2tp") == 0) return "gateway"; + return ""; +} + +static const gchar * +find_vpn_username_key (const char *vpn_type) +{ + if (g_strcmp0 (vpn_type, "openvpn") == 0) return "username"; + if (g_strcmp0 (vpn_type, "vpnc") == 0) return "Xauth username"; + if (g_strcmp0 (vpn_type, "pptp") == 0) return "user"; + if (g_strcmp0 (vpn_type, "openconnect") == 0) return "username"; + if (g_strcmp0 (vpn_type, "openswan") == 0) return "leftxauthusername"; + if (g_strcmp0 (vpn_type, "libreswan") == 0) return "leftxauthusername"; + if (g_strcmp0 (vpn_type, "l2tp") == 0) return "user"; + return ""; +} + +enum VpnDataItem { + VPN_DATA_ITEM_GATEWAY, + VPN_DATA_ITEM_USERNAME +}; + +static const gchar * +get_vpn_data_item (NMConnection *connection, enum VpnDataItem vpn_data_item) +{ + const char *key; + gs_free char *type = NULL; + + type = get_vpn_connection_type (connection); + + switch (vpn_data_item) { + case VPN_DATA_ITEM_GATEWAY: + key = find_vpn_gateway_key (type); + break; + case VPN_DATA_ITEM_USERNAME: + key = find_vpn_username_key (type); + break; + default: + key = ""; + break; + } + + return nm_setting_vpn_get_data_item (nm_connection_get_setting_vpn (connection), key); +} + +/*****************************************************************************/ + +typedef struct { + NMConnection *connection; + NMActiveConnection *primary_active; + GPtrArray *all_active; + bool show_active_fields; +} MetagenConShowRowData; + +static MetagenConShowRowData * +_metagen_con_show_row_data_new_for_connection (NMRemoteConnection *connection, gboolean show_active_fields) +{ + MetagenConShowRowData *row_data; + + row_data = g_slice_new0 (MetagenConShowRowData); + row_data->connection = g_object_ref (NM_CONNECTION (connection)); + row_data->show_active_fields = show_active_fields; + return row_data; +} + +static MetagenConShowRowData * +_metagen_con_show_row_data_new_for_active_connection (NMRemoteConnection *connection, NMActiveConnection *active, gboolean show_active_fields) +{ + MetagenConShowRowData *row_data; + + row_data = g_slice_new0 (MetagenConShowRowData); + if (connection) + row_data->connection = g_object_ref (NM_CONNECTION (connection)); + row_data->primary_active = g_object_ref (active); + row_data->show_active_fields = show_active_fields; + return row_data; +} + +static void +_metagen_con_show_row_data_add_active_connection (MetagenConShowRowData *row_data, NMActiveConnection *active) +{ + if (!row_data->primary_active) { + row_data->primary_active = g_object_ref (active); + return; + } + if (!row_data->all_active) { + row_data->all_active = g_ptr_array_new_with_free_func (g_object_unref); + g_ptr_array_add (row_data->all_active, g_object_ref (row_data->primary_active)); + } + g_ptr_array_add (row_data->all_active, g_object_ref (active)); +} + +static void +_metagen_con_show_row_data_init_primary_active (MetagenConShowRowData *row_data) +{ + NMActiveConnection *ac, *best_ac; + guint i; + + if (!row_data->all_active) + return; + + best_ac = row_data->all_active->pdata[0]; + for (i = 1; i < row_data->all_active->len; i++) { + ac = row_data->all_active->pdata[i]; + + if (active_connection_get_state_ord (ac) > active_connection_get_state_ord (best_ac)) + best_ac = ac; + } + + if (row_data->primary_active != best_ac) { + g_object_unref (row_data->primary_active); + row_data->primary_active = g_object_ref (best_ac); + } + g_clear_pointer (&row_data->all_active, g_ptr_array_unref); +} + +static void +_metagen_con_show_row_data_destroy (gpointer data) +{ + MetagenConShowRowData *row_data = data; + + if (!row_data) + return; + + g_clear_object (&row_data->connection); + g_clear_object (&row_data->primary_active); + g_clear_pointer (&row_data->all_active, g_ptr_array_unref); + g_slice_free (MetagenConShowRowData, row_data); +} + +static const char * +_con_show_fcn_get_id (NMConnection *c, NMActiveConnection *ac) +{ + NMSettingConnection *s_con = NULL; + const char *s; + + if (c) + s_con = nm_connection_get_setting_connection (c); + + s = s_con ? nm_setting_connection_get_id (s_con) : NULL; + if (!s && ac) { + /* note that if we have no s_con, that usually means that the user has no permissions + * to see the connection. We still fall to get the ID from the active-connection, + * which exposes it despite the user having no permissions. + * + * That might be unexpected, because the user is shown an ID, which he later + * is unable to resolve in other operations. */ + s = nm_active_connection_get_id (ac); + } + return s; +} + +static const char * +_con_show_fcn_get_type (NMConnection *c, NMActiveConnection *ac, NMMetaAccessorGetType get_type) +{ + NMSettingConnection *s_con = NULL; + const char *s; + + if (c) + s_con = nm_connection_get_setting_connection (c); + + s = s_con ? nm_setting_connection_get_connection_type (s_con) : NULL; + if (!s && ac) { + /* see _con_show_fcn_get_id() for why we fallback to get the value + * from @ac. */ + s = nm_active_connection_get_connection_type (ac); + } + return connection_type_to_display (s, get_type); +} + +static gconstpointer +_metagen_con_show_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + const MetagenConShowRowData *row_data = target; + NMConnection *c = row_data->connection; + NMActiveConnection *ac = row_data->primary_active; + NMSettingConnection *s_con = NULL; + const char *s; + char *s_mut; + + NMC_HANDLE_COLOR ( ac + ? nmc_active_connection_state_to_color (nm_active_connection_get_state (ac)) + : NM_META_COLOR_CONNECTION_UNKNOWN); + + if (c) + s_con = nm_connection_get_setting_connection (c); + + if (!row_data->show_active_fields) { + /* we are not supposed to show any fields of the active connection. + * We only tracked the primary_active to get the coloring right. + * From now on, there is no active connection. */ + ac = NULL; + + /* in this mode, we expect that we are called only with connections that + * have a [connection] setting and a UUID. Otherwise, the connection is + * effectively invisible to the user, and should be hidden. + * + * But in that case, we expect that the caller pre-filtered this row out. + * So assert(). */ + nm_assert (s_con); + nm_assert (nm_setting_connection_get_uuid (s_con)); + } + + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME: + return _con_show_fcn_get_id (c, ac); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID: + s = s_con ? nm_setting_connection_get_uuid (s_con) : NULL; + if (!s && ac) { + /* see _con_show_fcn_get_id() for why we fallback to get the value + * from @ac. */ + s = nm_active_connection_get_uuid (ac); + } + return s; + case NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE: + return _con_show_fcn_get_type (c, ac, get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP: + case NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP_REAL: + if (!s_con) + return NULL; + { + guint64 timestamp; + time_t timestamp_real; + + timestamp = nm_setting_connection_get_timestamp (s_con); + + if (info->info_type == NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP) + return (*out_to_free = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp)); + else { + if (!timestamp) { + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return _("never"); + return "never"; + } + timestamp_real = timestamp; + s_mut = g_malloc0 (128); + strftime (s_mut, 64, "%c", localtime (×tamp_real)); + return (*out_to_free = s_mut); + } + } + case NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT: + if (!s_con) + return NULL; + return nmc_meta_generic_get_bool (nm_setting_connection_get_autoconnect (s_con), get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT_PRIORITY: + if (!s_con) + return NULL; + return (*out_to_free = g_strdup_printf ("%d", nm_setting_connection_get_autoconnect_priority (s_con))); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_READONLY: + if (!s_con) + return NULL; + return nmc_meta_generic_get_bool (nm_setting_connection_get_read_only (s_con), get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_DBUS_PATH: + if (!c) + return NULL; + return nm_connection_get_path (c); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE: + return nmc_meta_generic_get_bool (!!ac, get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE: + if (ac) + return (*out_to_free = get_ac_device_string (ac)); + return NULL; + case NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE: + return nmc_meta_generic_get_str_i18n (ac + ? active_connection_state_to_string (nm_active_connection_get_state (ac)) + : NULL, + get_type); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH: + if (ac) + return nm_object_get_path (NM_OBJECT (ac)); + return NULL; + case NMC_GENERIC_INFO_TYPE_CON_SHOW_SLAVE: + if (!s_con) + return NULL; + return nm_setting_connection_get_slave_type (s_con); + case NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME: + if (!NM_IS_REMOTE_CONNECTION (c)) + return NULL; + return nm_remote_connection_get_filename (NM_REMOTE_CONNECTION (c)); + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_con_show[_NMC_GENERIC_INFO_TYPE_CON_SHOW_NUM + 1] = { +#define _METAGEN_CON_SHOW(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_con_show_get_fcn) + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME, "NAME"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID, "UUID"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE, "TYPE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP, "TIMESTAMP"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP_REAL, "TIMESTAMP-REAL"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT, "AUTOCONNECT"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT_PRIORITY, "AUTOCONNECT-PRIORITY"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_READONLY, "READONLY"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_DBUS_PATH, "DBUS-PATH"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE, "ACTIVE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, "DEVICE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, "STATE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH, "ACTIVE-PATH"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_SLAVE, "SLAVE"), + _METAGEN_CON_SHOW (NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME, "FILENAME"), }; #define NMC_FIELDS_CON_SHOW_COMMON "NAME,UUID,TYPE,DEVICE" -const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = { - NMC_META_GENERIC ("GROUP"), /* 0 */ - NMC_META_GENERIC ("NAME"), /* 1 */ - NMC_META_GENERIC ("UUID"), /* 2 */ - NMC_META_GENERIC ("DEVICES"), /* 3 */ - NMC_META_GENERIC ("STATE"), /* 4 */ - NMC_META_GENERIC ("DEFAULT"), /* 5 */ - NMC_META_GENERIC ("DEFAULT6"), /* 6 */ - NMC_META_GENERIC ("SPEC-OBJECT"), /* 7 */ - NMC_META_GENERIC ("VPN"), /* 8 */ - NMC_META_GENERIC ("DBUS-PATH"), /* 9 */ - NMC_META_GENERIC ("CON-PATH"), /* 10 */ - NMC_META_GENERIC ("ZONE"), /* 11 */ - NMC_META_GENERIC ("MASTER-PATH"), /* 12 */ - NULL, +/*****************************************************************************/ + +static gconstpointer +_metagen_con_active_general_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) +{ + NMActiveConnection *ac = target; + NMConnection *c; + NMSettingConnection *s_con = NULL; + NMDevice *dev; + guint i; + const char *s; + + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); + + nm_assert (NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, NM_META_ACCESSOR_GET_TYPE_PARSABLE)); + + c = NM_CONNECTION (nm_active_connection_get_connection (ac)); + if (c) + s_con = nm_connection_get_setting_connection (c); + + switch (info->info_type) { + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME: + return nm_active_connection_get_id (ac); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID: + return nm_active_connection_get_uuid (ac); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES: + { + GString *str = NULL; + const GPtrArray *devices; + + s = NULL; + devices = nm_active_connection_get_devices (ac); + if (devices) { + for (i = 0; i < devices->len; i++) { + NMDevice *device = devices->pdata[i]; + const char *iface; + + iface = nm_device_get_iface (device); + if (!iface) + continue; + if (!s) { + s = iface; + continue; + } + if (!str) + str = g_string_new (s); + g_string_append_c (str, ','); + g_string_append (str, iface); + } + } + if (str) + return (*out_to_free = g_string_free (str, FALSE)); + return s; + } + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE: + return nmc_meta_generic_get_str_i18n (active_connection_state_to_string (nm_active_connection_get_state (ac)), + get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT: + return nmc_meta_generic_get_bool (nm_active_connection_get_default (ac), get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6: + return nmc_meta_generic_get_bool (nm_active_connection_get_default6 (ac), get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_SPEC_OBJECT: + return nm_active_connection_get_specific_object_path (ac); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_VPN: + return nmc_meta_generic_get_bool (NM_IS_VPN_CONNECTION (ac), get_type); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DBUS_PATH: + return nm_object_get_path (NM_OBJECT (ac)); + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH: + return c ? nm_connection_get_path (c) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE: + /* this is really ugly, because the zone is not a property of the active-connection, + * but the settings-connection profile. There is no guarantee, that they agree. */ + return s_con ? nm_setting_connection_get_zone (s_con) : NULL; + case NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH: + dev = nm_active_connection_get_master (ac); + return dev ? nm_object_get_path (NM_OBJECT (dev)) : NULL; + default: + break; + } + + g_return_val_if_reached (NULL); +} + +const NmcMetaGenericInfo *const metagen_con_active_general[_NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NUM + 1] = { +#define _METAGEN_CON_ACTIVE_GENERAL(type, name) \ + [type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_con_active_general_get_fcn) + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME, "NAME"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID, "UUID"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES, "DEVICES"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE, "STATE"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT, "DEFAULT"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6, "DEFAULT6"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_SPEC_OBJECT, "SPEC-OBJECT"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_VPN, "VPN"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DBUS_PATH, "DBUS-PATH"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH, "CON-PATH"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE, "ZONE"), + _METAGEN_CON_ACTIVE_GENERAL (NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH, "MASTER-PATH"), }; + +/*****************************************************************************/ + #define NMC_FIELDS_SETTINGS_NAMES_ALL NM_SETTING_CONNECTION_SETTING_NAME","\ NM_SETTING_WIRED_SETTING_NAME","\ NM_SETTING_802_1X_SETTING_NAME","\ @@ -151,7 +665,6 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[] = { // NM_SETTING_DUMMY_SETTING_NAME // NM_SETTING_WIMAX_SETTING_NAME - const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[] = { NMC_META_GENERIC ("GROUP"), /* 0 */ NMC_META_GENERIC ("TYPE"), /* 1 */ @@ -164,11 +677,11 @@ const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[] = { }; const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[] = { - NMC_META_GENERIC_WITH_NESTED ("GENERAL", nmc_fields_con_active_details_general + 1), /* 0 */ + NMC_META_GENERIC_WITH_NESTED ("GENERAL", metagen_con_active_general), /* 0 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 1 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp4_config + 1), /* 2 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp_config + 1), /* 2 */ NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 3 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp6_config + 1), /* 4 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp_config + 1), /* 4 */ NMC_META_GENERIC_WITH_NESTED ("VPN", nmc_fields_con_active_details_vpn + 1), /* 5 */ NULL, }; @@ -189,7 +702,10 @@ typedef struct { NMSetting *setting; const char *property; } TabCompletionInfo; -static TabCompletionInfo nmc_tab_completion = {NULL, NULL, NULL, NULL}; + +static TabCompletionInfo nmc_tab_completion; + +/*****************************************************************************/ static void usage (void) @@ -505,12 +1021,8 @@ usage_connection_export (void) static void quit (void) { - if (progress_id) { - g_source_remove (progress_id); - progress_id = 0; + if (nm_clear_g_source (&progress_id)) nmc_terminal_erase_line (); - } - g_main_loop_quit (loop); } @@ -523,97 +1035,44 @@ construct_header_name (const char *base, const char *spec) return g_strdup_printf ("%s (%s)", base, spec); } -static const char * -active_connection_state_to_string (NMActiveConnectionState state) +static int +get_ac_for_connection_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data) { - switch (state) { - case NM_ACTIVE_CONNECTION_STATE_ACTIVATING: - return _("activating"); - case NM_ACTIVE_CONNECTION_STATE_ACTIVATED: - return _("activated"); - case NM_ACTIVE_CONNECTION_STATE_DEACTIVATING: - return _("deactivating"); - case NM_ACTIVE_CONNECTION_STATE_DEACTIVATED: - return _("deactivated"); - case NM_ACTIVE_CONNECTION_STATE_UNKNOWN: - default: - return _("unknown"); - } -} + NMActiveConnection *ac_a = *((NMActiveConnection *const*) pa); + NMActiveConnection *ac_b = *((NMActiveConnection *const*) pb); -static const char * -vpn_connection_state_to_string (NMVpnConnectionState state) -{ - switch (state) { - case NM_VPN_CONNECTION_STATE_PREPARE: - return _("VPN connecting (prepare)"); - case NM_VPN_CONNECTION_STATE_NEED_AUTH: - return _("VPN connecting (need authentication)"); - case NM_VPN_CONNECTION_STATE_CONNECT: - return _("VPN connecting"); - case NM_VPN_CONNECTION_STATE_IP_CONFIG_GET: - return _("VPN connecting (getting IP configuration)"); - case NM_VPN_CONNECTION_STATE_ACTIVATED: - return _("VPN connected"); - case NM_VPN_CONNECTION_STATE_FAILED: - return _("VPN connection failed"); - case NM_VPN_CONNECTION_STATE_DISCONNECTED: - return _("VPN disconnected"); - default: - return _("unknown"); - } -} - -/* Caller has to free the returned string */ -static char * -get_ac_device_string (NMActiveConnection *active) -{ - GString *dev_str; - const GPtrArray *devices; - int i; - - if (!active) - return NULL; - - /* Get devices of the active connection */ - dev_str = g_string_new (NULL); - devices = nm_active_connection_get_devices (active); - for (i = 0; i < devices->len; i++) { - NMDevice *device = g_ptr_array_index (devices, i); - const char *dev_iface = nm_device_get_iface (device); - - if (dev_iface) { - g_string_append (dev_str, dev_iface); - g_string_append_c (dev_str, ','); - } - } - if (dev_str->len > 0) - g_string_truncate (dev_str, dev_str->len - 1); /* Cut off last ',' */ - - return g_string_free (dev_str, FALSE); + return active_connection_cmp (ac_a, ac_b); } static NMActiveConnection * -get_ac_for_connection (const GPtrArray *active_cons, NMConnection *connection) +get_ac_for_connection (const GPtrArray *active_cons, NMConnection *connection, GPtrArray **out_result) { - const char *con_path, *ac_con_path; - int i; - NMActiveConnection *ac = NULL; + guint i; + NMActiveConnection *best_candidate = NULL; + GPtrArray *result = out_result ? *out_result : NULL; - /* Is the connection active? */ - con_path = nm_connection_get_path (connection); for (i = 0; i < active_cons->len; i++) { NMActiveConnection *candidate = g_ptr_array_index (active_cons, i); NMRemoteConnection *con; con = nm_active_connection_get_connection (candidate); - ac_con_path = con ? nm_connection_get_path (NM_CONNECTION (con)) : NULL; - if (!g_strcmp0 (ac_con_path, con_path)) { - ac = candidate; - break; - } + if (NM_CONNECTION (con) != connection) + continue; + + if (!out_result) + return candidate; + if (!result) + result = g_ptr_array_new_with_free_func (g_object_unref); + g_ptr_array_add (result, g_object_ref (candidate)); + } + + if (result) { + g_ptr_array_sort_with_data (result, get_ac_for_connection_cmp, NULL); + best_candidate = result->pdata[0]; } - return ac; + + NM_SET_OUT (out_result, result); + return best_candidate; } typedef struct { @@ -723,400 +1182,49 @@ nmc_connection_profile_details (NMConnection *connection, NmCli *nmc) const char *prop_name = (const char *) g_ptr_array_index (prop_array, i); if (nmc->nmc_config.print_output != NMC_PRINT_TERSE && !nmc->nmc_config.multiline_output && was_output) - g_print ("\n"); /* Empty line */ - - was_output = FALSE; - - setting = nm_connection_get_setting_by_name (connection, nm_meta_setting_infos_editor[section_idx].general->setting_name); - if (setting) { - setting_details (&nmc->nmc_config, setting, prop_name); - was_output = TRUE; - } - } - - g_array_free (print_settings_array, TRUE); - if (prop_array) - g_ptr_array_free (prop_array, TRUE); - - return TRUE; -} - -static NMActiveConnection * -find_active_connection (const GPtrArray *active_cons, - const GPtrArray *cons, - const char *filter_type, - const char *filter_val, - int *idx, - gboolean complete) -{ - int i; - int start = (idx && *idx > 0) ? *idx : 0; - const char *path, *a_path, *path_num, *a_path_num; - const char *id; - const char *uuid; - NMRemoteConnection *con; - NMActiveConnection *found = NULL; - - for (i = start; i < active_cons->len; i++) { - NMActiveConnection *candidate = g_ptr_array_index (active_cons, i); - - con = nm_active_connection_get_connection (candidate); - - id = nm_active_connection_get_id (candidate); - uuid = nm_active_connection_get_uuid (candidate); - path = con ? nm_connection_get_path (NM_CONNECTION (con)) : NULL; - path_num = path ? strrchr (path, '/') + 1 : NULL; - a_path = nm_object_get_path (NM_OBJECT (candidate)); - a_path_num = a_path ? strrchr (a_path, '/') + 1 : NULL; - - /* When filter_type is NULL, compare connection ID (filter_val) - * against all types. Otherwise, only compare against the specific - * type. If 'path' or 'apath' filter types are specified, comparison - * against numeric index (in addition to the whole path) is allowed. - */ - if (!filter_type || strcmp (filter_type, "id") == 0) { - if (complete) - nmc_complete_strings (filter_val, id, NULL); - if (strcmp (filter_val, id) == 0) - goto found; - } - - if (!filter_type || strcmp (filter_type, "uuid") == 0) { - if (complete && (filter_type || *filter_val)) - nmc_complete_strings (filter_val, uuid, NULL); - if (strcmp (filter_val, uuid) == 0) - goto found; - } - - if (!filter_type || strcmp (filter_type, "path") == 0) { - if (complete && (filter_type || *filter_val)) - nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL); - if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0)) - goto found; - } - - if (!filter_type || strcmp (filter_type, "apath") == 0) { - if (complete && (filter_type || *filter_val)) - nmc_complete_strings (filter_val, a_path, filter_type ? a_path_num : NULL, NULL); - if (g_strcmp0 (filter_val, a_path) == 0 || (filter_type && g_strcmp0 (filter_val, a_path_num) == 0)) - goto found; - } - - continue; -found: - if (!idx) - return candidate; - if (found) { - *idx = i; - return found; - } - found = candidate; - } - - if (idx) - *idx = 0; - return found; -} - -void -nmc_active_connection_state_to_color (NMActiveConnectionState state, NMMetaTermColor *color) -{ - *color = NM_META_TERM_COLOR_NORMAL; - - if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) - *color = NM_META_TERM_COLOR_YELLOW; - else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) - *color = NM_META_TERM_COLOR_GREEN; - else if (state > NM_ACTIVE_CONNECTION_STATE_ACTIVATED) - *color = NM_META_TERM_COLOR_RED; -} - -/* Essentially a version of nm_setting_connection_get_connection_type() that - * prefers an alias instead of the settings name when in pretty print mode. - * That is so that we print "wifi" instead of "802-11-wireless" in "nmcli c". */ -static const char * -connection_type_pretty (const char *type, NMCPrintOutput print_output) -{ - const NMMetaSettingInfoEditor *editor; - int i; - - if (print_output == NMC_PRINT_TERSE) - return type; - - for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) { - editor = &nm_meta_setting_infos_editor[i]; - if (strcmp (type, editor->general->setting_name) == 0) { - if (editor->alias) - return editor->alias; - break; - } - } - - return type; -} - -static void -fill_output_connection (NMConnection *connection, NMClient *client, NMCPrintOutput print_output, - GPtrArray *output_data, gboolean active_only) -{ - NMSettingConnection *s_con; - guint64 timestamp; - time_t timestamp_real; - char *timestamp_str; - char *timestamp_real_str = ""; - char *prio_str; - NmcOutputField *arr; - NMActiveConnection *ac = NULL; - const char *ac_path = NULL; - const char *ac_state = NULL; - NMActiveConnectionState ac_state_int = NM_ACTIVE_CONNECTION_STATE_UNKNOWN; - char *ac_dev = NULL; - NMMetaTermColor color; - - s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); - - ac = get_ac_for_connection (nm_client_get_active_connections (client), connection); - if (active_only && !ac) - return; - - if (ac) { - ac_path = nm_object_get_path (NM_OBJECT (ac)); - ac_state_int = nm_active_connection_get_state (ac); - ac_state = active_connection_state_to_string (ac_state_int); - ac_dev = get_ac_device_string (ac); - } - - /* Obtain field values */ - timestamp = nm_setting_connection_get_timestamp (s_con); - timestamp_str = g_strdup_printf ("%" G_GUINT64_FORMAT, timestamp); - if (timestamp) { - timestamp_real = timestamp; - timestamp_real_str = g_malloc0 (64); - strftime (timestamp_real_str, 64, "%c", localtime (×tamp_real)); - } - prio_str = g_strdup_printf ("%u", nm_setting_connection_get_autoconnect_priority (s_con)); - - arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_con_show, 0); - - /* Show active connections in color */ - nmc_active_connection_state_to_color (ac_state_int, &color); - set_val_color_all (arr, color); - - set_val_strc (arr, 0, nm_setting_connection_get_id (s_con)); - set_val_strc (arr, 1, nm_setting_connection_get_uuid (s_con)); - set_val_strc (arr, 2, connection_type_pretty (nm_setting_connection_get_connection_type (s_con), print_output)); - set_val_str (arr, 3, timestamp_str); - set_val_str (arr, 4, timestamp ? timestamp_real_str : g_strdup (_("never"))); - set_val_strc (arr, 5, nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no")); - set_val_str (arr, 6, prio_str); - set_val_strc (arr, 7, nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no")); - set_val_strc (arr, 8, nm_connection_get_path (connection)); - set_val_strc (arr, 9, ac ? _("yes") : _("no")); - set_val_str (arr, 10, ac_dev); - set_val_strc (arr, 11, ac_state); - set_val_strc (arr, 12, ac_path); - set_val_strc (arr, 13, nm_setting_connection_get_slave_type (s_con)); - - g_ptr_array_add (output_data, arr); -} - -static void -fill_output_connection_for_invisible (NMActiveConnection *ac, NMCPrintOutput print_output, GPtrArray *output_data) -{ - NmcOutputField *arr; - const char *ac_path = NULL; - const char *ac_state = NULL; - char *name, *ac_dev = NULL; - - name = g_strdup_printf (" %s", nm_active_connection_get_id (ac)); - ac_path = nm_object_get_path (NM_OBJECT (ac)); - ac_state = active_connection_state_to_string (nm_active_connection_get_state (ac)); - ac_dev = get_ac_device_string (ac); - - arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_con_show, 0); - - set_val_str (arr, 0, name); - set_val_strc (arr, 1, nm_active_connection_get_uuid (ac)); - set_val_strc (arr, 2, connection_type_pretty (nm_active_connection_get_connection_type (ac), print_output)); - set_val_strc (arr, 3, NULL); - set_val_strc (arr, 4, NULL); - set_val_strc (arr, 5, NULL); - set_val_strc (arr, 6, NULL); - set_val_strc (arr, 7, NULL); - set_val_strc (arr, 8, NULL); - set_val_strc (arr, 9, _("yes")); - set_val_str (arr, 10, ac_dev); - set_val_strc (arr, 11, ac_state); - set_val_strc (arr, 12, ac_path); - set_val_strc (arr, 13, NULL); - - set_val_color_fmt_all (arr, NM_META_TERM_FORMAT_DIM); - - g_ptr_array_add (output_data, arr); -} - -static void -fill_output_active_connection (NMActiveConnection *active, - GPtrArray *output_data, - gboolean with_group, - guint32 o_flags) -{ - NMRemoteConnection *con; - NMSettingConnection *s_con = NULL; - const GPtrArray *devices; - GString *dev_str; - NMActiveConnectionState state; - NMDevice *master; - const char *con_path = NULL, *con_zone = NULL; - int i; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - int idx_start = with_group ? 0 : 1; - - con = nm_active_connection_get_connection (active); - if (con) { - con_path = nm_connection_get_path (NM_CONNECTION (con)); - s_con = nm_connection_get_setting_connection (NM_CONNECTION (con)); - g_assert (s_con != NULL); - con_zone = nm_setting_connection_get_zone (s_con); - } - - state = nm_active_connection_get_state (active); - master = nm_active_connection_get_master (active); - - /* Get devices of the active connection */ - dev_str = g_string_new (NULL); - devices = nm_active_connection_get_devices (active); - for (i = 0; i < devices->len; i++) { - NMDevice *device = g_ptr_array_index (devices, i); - const char *dev_iface = nm_device_get_iface (device); - - if (dev_iface) { - g_string_append (dev_str, dev_iface); - g_string_append_c (dev_str, ','); - } - } - if (dev_str->len > 0) - g_string_truncate (dev_str, dev_str->len - 1); /* Cut off last ',' */ - - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_general; - if (!with_group) - tmpl++; - - /* Fill field values */ - arr = nmc_dup_fields_array (tmpl, o_flags); - if (with_group) - set_val_strc (arr, 0, nmc_fields_con_active_details_groups[0]->name); - set_val_strc (arr, 1-idx_start, nm_active_connection_get_id (active)); - set_val_strc (arr, 2-idx_start, nm_active_connection_get_uuid (active)); - set_val_str (arr, 3-idx_start, dev_str->str); - set_val_strc (arr, 4-idx_start, active_connection_state_to_string (state)); - set_val_strc (arr, 5-idx_start, nm_active_connection_get_default (active) ? _("yes") : _("no")); - set_val_strc (arr, 6-idx_start, nm_active_connection_get_default6 (active) ? _("yes") : _("no")); - set_val_strc (arr, 7-idx_start, nm_active_connection_get_specific_object_path (active)); - set_val_strc (arr, 8-idx_start, NM_IS_VPN_CONNECTION (active) ? _("yes") : _("no")); - set_val_strc (arr, 9-idx_start, nm_object_get_path (NM_OBJECT (active))); - set_val_strc (arr, 10-idx_start, con_path); - set_val_strc (arr, 11-idx_start, con_zone); - set_val_strc (arr, 12-idx_start, master ? nm_object_get_path (NM_OBJECT (master)) : NULL); - set_val_strc (arr, 13-idx_start, s_con ? nm_setting_connection_get_slave_type (s_con) : NULL); - - g_ptr_array_add (output_data, arr); - - g_string_free (dev_str, FALSE); -} - -typedef struct { - char **array; - guint32 idx; -} FillVPNDataInfo; - -static void -fill_vpn_data_item (const char *key, const char *value, gpointer user_data) -{ - FillVPNDataInfo *info = (FillVPNDataInfo *) user_data; - - info->array[info->idx++] = g_strdup_printf ("%s = %s", key, value); -} - -// FIXME: The same or similar code for VPN info appears also in nm-applet (applet-dialogs.c), -// and in gnome-control-center as well. It could probably be shared somehow. -static char * -get_vpn_connection_type (NMConnection *connection) -{ - const char *type, *p; - - /* The service type is in form of "org.freedesktop.NetworkManager.vpnc". - * Extract end part after last dot, e.g. "vpnc" - */ - type = nm_setting_vpn_get_service_type (nm_connection_get_setting_vpn (connection)); - p = strrchr (type, '.'); - return g_strdup (p ? p + 1 : type); -} - -/* VPN parameters can be found at: - * http://git.gnome.org/browse/network-manager-openvpn/tree/src/nm-openvpn-service.h - * http://git.gnome.org/browse/network-manager-vpnc/tree/src/nm-vpnc-service.h - * http://git.gnome.org/browse/network-manager-pptp/tree/src/nm-pptp-service.h - * http://git.gnome.org/browse/network-manager-openconnect/tree/src/nm-openconnect-service.h - * http://git.gnome.org/browse/network-manager-openswan/tree/src/nm-openswan-service.h - * See also 'properties' directory in these plugins. - */ -static const gchar * -find_vpn_gateway_key (const char *vpn_type) -{ - if (g_strcmp0 (vpn_type, "openvpn") == 0) return "remote"; - if (g_strcmp0 (vpn_type, "vpnc") == 0) return "IPSec gateway"; - if (g_strcmp0 (vpn_type, "pptp") == 0) return "gateway"; - if (g_strcmp0 (vpn_type, "openconnect") == 0) return "gateway"; - if (g_strcmp0 (vpn_type, "openswan") == 0) return "right"; - if (g_strcmp0 (vpn_type, "libreswan") == 0) return "right"; - if (g_strcmp0 (vpn_type, "ssh") == 0) return "remote"; - if (g_strcmp0 (vpn_type, "l2tp") == 0) return "gateway"; - return ""; + g_print ("\n"); /* Empty line */ + + was_output = FALSE; + + setting = nm_connection_get_setting_by_name (connection, nm_meta_setting_infos_editor[section_idx].general->setting_name); + if (setting) { + setting_details (&nmc->nmc_config, setting, prop_name); + was_output = TRUE; + } + } + + g_array_free (print_settings_array, TRUE); + if (prop_array) + g_ptr_array_free (prop_array, TRUE); + + return TRUE; } -static const gchar * -find_vpn_username_key (const char *vpn_type) +NMMetaColor +nmc_active_connection_state_to_color (NMActiveConnectionState state) { - if (g_strcmp0 (vpn_type, "openvpn") == 0) return "username"; - if (g_strcmp0 (vpn_type, "vpnc") == 0) return "Xauth username"; - if (g_strcmp0 (vpn_type, "pptp") == 0) return "user"; - if (g_strcmp0 (vpn_type, "openconnect") == 0) return "username"; - if (g_strcmp0 (vpn_type, "openswan") == 0) return "leftxauthusername"; - if (g_strcmp0 (vpn_type, "libreswan") == 0) return "leftxauthusername"; - if (g_strcmp0 (vpn_type, "l2tp") == 0) return "user"; - return ""; + if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING) + return NM_META_COLOR_CONNECTION_ACTIVATING; + else if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) + return NM_META_COLOR_CONNECTION_ACTIVATED; + else if (state > NM_ACTIVE_CONNECTION_STATE_ACTIVATED) + return NM_META_COLOR_CONNECTION_DISCONNECTING; + else + return NM_META_COLOR_CONNECTION_UNKNOWN; } -enum VpnDataItem { - VPN_DATA_ITEM_GATEWAY, - VPN_DATA_ITEM_USERNAME -}; +typedef struct { + char **array; + guint32 idx; +} FillVPNDataInfo; -static const gchar * -get_vpn_data_item (NMConnection *connection, enum VpnDataItem vpn_data_item) +static void +fill_vpn_data_item (const char *key, const char *value, gpointer user_data) { - const char *key; - char *type = get_vpn_connection_type (connection); - - switch (vpn_data_item) { - case VPN_DATA_ITEM_GATEWAY: - key = find_vpn_gateway_key (type); - break; - case VPN_DATA_ITEM_USERNAME: - key = find_vpn_username_key (type); - break; - default: - key = ""; - break; - } - g_free (type); + FillVPNDataInfo *info = (FillVPNDataInfo *) user_data; - return nm_setting_vpn_get_data_item (nm_connection_get_setting_vpn (connection), key); + info->array[info->idx++] = g_strdup_printf ("%s = %s", key, value); } -/* FIXME end */ static gboolean nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) @@ -1128,7 +1236,6 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) const char *fields_str = NULL; const NMMetaAbstractInfo *const*tmpl; NmcOutputField *arr; - size_t tmpl_len; const char *base_hdr = _("Activate connection details"); gboolean was_output = FALSE; @@ -1171,30 +1278,27 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) int group_idx = g_array_index (print_groups, int, i); char *group_fld = (char *) g_ptr_array_index (group_fields, i); - if (nmc->nmc_config.print_output != NMC_PRINT_TERSE && !nmc->nmc_config.multiline_output && was_output) - g_print ("\n"); /* Empty line */ + if ( nmc->nmc_config.print_output != NMC_PRINT_TERSE + && !nmc->nmc_config.multiline_output + && was_output) + g_print ("\n"); was_output = FALSE; - /* GENERAL */ - if (strcasecmp (nmc_fields_con_active_details_groups[group_idx]->name, nmc_fields_con_active_details_groups[0]->name) == 0) { - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - - /* Add field names */ - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_general; - tmpl_len = sizeof (nmc_fields_con_active_details_general); - out_indices = parse_output_fields (group_fld, - tmpl, FALSE, NULL, NULL); - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - /* Fill in values */ - fill_output_active_connection (acon, out.output_data, TRUE, NMC_OF_FLAG_SECTION_PREFIX); + if (nmc_fields_con_active_details_groups[group_idx]->nested == metagen_con_active_general) { + gs_free char *f = NULL; - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, NULL, 0, &out); + if (group_fld) + f = g_strdup_printf ("GENERAL.%s", group_fld); + nmc_print (&nmc->nmc_config, + (gpointer[]) { acon, NULL }, + NULL, + NMC_META_GENERIC_GROUP ("GENERAL", metagen_con_active_general, N_("GROUP")), + f, + NULL); was_output = TRUE; + continue; } /* IP4 */ @@ -1211,7 +1315,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) gboolean b1 = FALSE; NMDhcpConfig *dhcp4 = nm_active_connection_get_dhcp4_config (acon); - b1 = print_dhcp4_config (dhcp4, &nmc->nmc_config, "DHCP4", group_fld); + b1 = print_dhcp_config (dhcp4, &nmc->nmc_config, "DHCP4", group_fld); was_output = was_output || b1; } @@ -1229,7 +1333,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) gboolean b1 = FALSE; NMDhcpConfig *dhcp6 = nm_active_connection_get_dhcp6_config (acon); - b1 = print_dhcp6_config (dhcp6, &nmc->nmc_config, "DHCP6", group_fld); + b1 = print_dhcp_config (dhcp6, &nmc->nmc_config, "DHCP6", group_fld); was_output = was_output || b1; } @@ -1250,7 +1354,7 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) con = NM_CONNECTION (nm_active_connection_get_connection (acon)); s_con = nm_connection_get_setting_connection (con); - g_assert (s_con != NULL); + g_assert (s_con); tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_active_details_vpn; out_indices = parse_output_fields (group_fld, @@ -1278,13 +1382,15 @@ nmc_active_connection_details (NMActiveConnection *acon, NmCli *nmc) if (banner) banner_str = g_strescape (banner, ""); vpn_state = nm_vpn_connection_get_vpn_state (NM_VPN_CONNECTION (acon)); - vpn_state_str = g_strdup_printf ("%d - %s", vpn_state, vpn_connection_state_to_string (vpn_state)); + vpn_state_str = g_strdup_printf ("%d - %s", + vpn_state, + gettext (vpn_connection_state_to_string (vpn_state))); /* Add values */ arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX); set_val_strc (arr, 0, nmc_fields_con_active_details_groups[5]->name); set_val_str (arr, 1, type_str); - set_val_strc (arr, 2, username ? username : get_vpn_data_item (con, VPN_DATA_ITEM_USERNAME)); + set_val_strc (arr, 2, username ?: get_vpn_data_item (con, VPN_DATA_ITEM_USERNAME)); set_val_strc (arr, 3, get_vpn_data_item (con, VPN_DATA_ITEM_GATEWAY)); set_val_str (arr, 4, banner_str); set_val_str (arr, 5, vpn_state_str); @@ -1434,173 +1540,237 @@ typedef enum { typedef struct { NmCli *nmc; const GArray *order; -} NmcSortInfo; + gboolean show_active_fields; +} ConShowSortInfo; static int -compare_connections (gconstpointer a, gconstpointer b, gpointer user_data) -{ - NMConnection *ca = *(NMConnection **)a; - NMConnection *cb = *(NMConnection **)b; - NMActiveConnection *aca, *acb; - NmcSortInfo *info = (NmcSortInfo *) user_data; - GArray *default_order = NULL; - const GArray *order; - NmcSortOrder item; - int cmp = 0, i; - const char *tmp1, *tmp2; - unsigned long tmp1_int, tmp2_int; +con_show_get_items_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data) +{ + const ConShowSortInfo *sort_info = user_data; + const MetagenConShowRowData *row_data_a = *((const MetagenConShowRowData *const*) pa); + const MetagenConShowRowData *row_data_b = *((const MetagenConShowRowData *const*) pb); + NMConnection *c_a = row_data_a->connection; + NMConnection *c_b = row_data_b->connection; + NMActiveConnection *ac_a = row_data_a->primary_active; + NMActiveConnection *ac_b = row_data_b->primary_active; + NMActiveConnection *ac_a_effective = sort_info->show_active_fields ? ac_a : NULL; + NMActiveConnection *ac_b_effective = sort_info->show_active_fields ? ac_b : NULL; + + /* first sort active-connections which are invisible, i.e. that have no connection */ + if (!c_a && c_b) + return -1; + if (!c_b && c_a) + return 1; + + /* we have two connections... */ + if (c_a && c_b && c_a != c_b) { + const NmcSortOrder *order_arr; + guint i, order_len; + NMMetaAccessorGetType get_type = nmc_print_output_to_accessor_get_type (sort_info->nmc->nmc_config.print_output); + + if (sort_info->order) { + order_arr = &g_array_index (sort_info->order, NmcSortOrder, 0); + order_len = sort_info->order->len; + } else { + static const NmcSortOrder def[] = { NMC_SORT_ACTIVE, NMC_SORT_NAME, NMC_SORT_PATH }; - if (info->order ) - order = info->order; - else { - NmcSortOrder def[] = { NMC_SORT_ACTIVE, NMC_SORT_NAME, NMC_SORT_PATH }; - int num = G_N_ELEMENTS (def); - default_order = g_array_sized_new (FALSE, FALSE, sizeof (NmcSortOrder), num); - g_array_append_vals (default_order, def, num); - order = default_order; - } - - for (i = 0; i < order->len; i++) { - item = g_array_index (order, NmcSortOrder, i); - switch (item) { - case NMC_SORT_ACTIVE: - case NMC_SORT_ACTIVE_INV: - aca = get_ac_for_connection (nm_client_get_active_connections (info->nmc->client), ca); - acb = get_ac_for_connection (nm_client_get_active_connections (info->nmc->client), cb); - cmp = (aca && !acb) ? -1 : (!aca && acb) ? 1 : 0; - if (item == NMC_SORT_ACTIVE_INV) - cmp = -(cmp); - break; - case NMC_SORT_TYPE: - case NMC_SORT_TYPE_INV: - cmp = g_strcmp0 (nm_connection_get_connection_type (ca), - nm_connection_get_connection_type (cb)); - if (item == NMC_SORT_TYPE_INV) - cmp = -(cmp); - break; - case NMC_SORT_NAME: - case NMC_SORT_NAME_INV: - cmp = g_strcmp0 (nm_connection_get_id (ca), - nm_connection_get_id (cb)); - if (item == NMC_SORT_NAME_INV) - cmp = -(cmp); - break; - case NMC_SORT_PATH: - case NMC_SORT_PATH_INV: - tmp1 = nm_connection_get_path (ca); - tmp2 = nm_connection_get_path (cb); - tmp1 = tmp1 ? strrchr (tmp1, '/') : "0"; - tmp2 = tmp2 ? strrchr (tmp2, '/') : "0"; - nmc_string_to_uint (tmp1 ? tmp1+1 : "0", FALSE, 0, 0, &tmp1_int); - nmc_string_to_uint (tmp2 ? tmp2+1 : "0", FALSE, 0, 0, &tmp2_int); - cmp = (int) tmp1_int - tmp2_int; - if (item == NMC_SORT_PATH_INV) - cmp = -(cmp); - break; - default: - cmp = 0; - break; + /* Note: the default order does not consider whether a column is shown. + * That means, the selection of the output fields, does not affect the + * order (although there could be an argument that it should). */ + order_arr = def; + order_len = G_N_ELEMENTS (def); } - if (cmp != 0) - goto end; - } -end: - if (default_order) - g_array_unref (default_order); - return cmp; -} -static GPtrArray * -sort_connections (const GPtrArray *cons, NmCli *nmc, const GArray *order) -{ - GPtrArray *sorted; - int i; - NmcSortInfo compare_info; + for (i = 0; i < order_len; i++) { + NmcSortOrder item = order_arr[i]; - if (!cons) - return NULL; + switch (item) { + + case NMC_SORT_ACTIVE: + NM_CMP_DIRECT (active_connection_get_state_ord (ac_b), + active_connection_get_state_ord (ac_a)); + break; + case NMC_SORT_ACTIVE_INV: + NM_CMP_DIRECT (active_connection_get_state_ord (ac_a), + active_connection_get_state_ord (ac_b)); + break; - compare_info.nmc = nmc; - compare_info.order = order; + case NMC_SORT_TYPE: + NM_CMP_DIRECT_STRCMP0 (_con_show_fcn_get_type (c_a, ac_a_effective, get_type), + _con_show_fcn_get_type (c_b, ac_b_effective, get_type)); + break; + case NMC_SORT_TYPE_INV: + NM_CMP_DIRECT_STRCMP0 (_con_show_fcn_get_type (c_b, ac_b_effective, get_type), + _con_show_fcn_get_type (c_a, ac_a_effective, get_type)); + break; - sorted = g_ptr_array_sized_new (cons->len); - for (i = 0; i < cons->len; i++) - g_ptr_array_add (sorted, cons->pdata[i]); - g_ptr_array_sort_with_data (sorted, compare_connections, &compare_info); - return sorted; -} + case NMC_SORT_NAME: + NM_CMP_RETURN (nm_utf8_collate0 (_con_show_fcn_get_id (c_a, ac_a_effective), + _con_show_fcn_get_id (c_b, ac_b_effective))); + break; + case NMC_SORT_NAME_INV: + NM_CMP_RETURN (nm_utf8_collate0 (_con_show_fcn_get_id (c_b, ac_b_effective), + _con_show_fcn_get_id (c_a, ac_a_effective))); + break; -static int -compare_ac_connections (gconstpointer a, gconstpointer b, gpointer user_data) -{ - NMActiveConnection *ca = *(NMActiveConnection **)a; - NMActiveConnection *cb = *(NMActiveConnection **)b; - int cmp; + case NMC_SORT_PATH: + NM_CMP_RETURN (nm_utils_dbus_path_cmp (nm_connection_get_path (c_a), nm_connection_get_path (c_b))); + break; + + case NMC_SORT_PATH_INV: + NM_CMP_RETURN (nm_utils_dbus_path_cmp (nm_connection_get_path (c_b), nm_connection_get_path (c_a))); + break; + + default: + nm_assert_not_reached (); + break; + } + } - /* Sort states first */ - cmp = nm_active_connection_get_state (cb) - nm_active_connection_get_state (ca); - if (cmp != 0) - return cmp; + NM_CMP_DIRECT_STRCMP0 (nm_connection_get_uuid (c_a), + nm_connection_get_uuid (c_b)); + NM_CMP_DIRECT_STRCMP0 (nm_connection_get_path (c_a), + nm_connection_get_path (c_b)); - cmp = g_strcmp0 (nm_active_connection_get_id (ca), - nm_active_connection_get_id (cb)); - if (cmp != 0) - return cmp; + /* This line is not expected to be reached, because there shouldn't be two + * different connections with the same path. Anyway, fall-through and compare by + * active connections... */ + } - return g_strcmp0 (nm_active_connection_get_connection_type (ca), - nm_active_connection_get_connection_type (cb)); + return active_connection_cmp (ac_a, ac_b); } static GPtrArray * -get_invisible_active_connections (NmCli *nmc) -{ - const GPtrArray *acons; - const GPtrArray *connections; - GPtrArray *invisibles; - int a, c; +con_show_get_items (NmCli *nmc, gboolean active_only, gboolean show_active_fields, GArray *order) +{ + gs_unref_hashtable GHashTable *row_hash = NULL; + GHashTableIter hiter; + GPtrArray *result; + const GPtrArray *arr; + NMRemoteConnection *c; + MetagenConShowRowData *row_data; + guint i; + const ConShowSortInfo sort_info = { + .nmc = nmc, + .order = order, + .show_active_fields = show_active_fields, + }; - g_return_val_if_fail (nmc != NULL, NULL); + row_hash = g_hash_table_new (nm_direct_hash, NULL); + + arr = nm_client_get_connections (nmc->client); + for (i = 0; i < arr->len; i++) { + /* Note: libnm will not expose connection that are invisible + * to the user but currently inactive. + * + * That differs from get-active-connection(). If an invisible connection + * is active, we can get its NMActiveConnection. We can even obtain + * the corresponding NMRemoteConnection (although, of course it has + * no visible settings). + * + * I think this inconsistency is a bug in libnm. Anyway, the result is, + * that we print invisible connections if they are active, but otherwise + * we exclude them. */ + c = arr->pdata[i]; + g_hash_table_insert (row_hash, + c, + _metagen_con_show_row_data_new_for_connection (c, + show_active_fields)); + } + + arr = nm_client_get_active_connections (nmc->client); + for (i = 0; i < arr->len; i++) { + NMActiveConnection *ac = arr->pdata[i]; + + c = nm_active_connection_get_connection (ac); + if (!show_active_fields && !c) { + /* the active connection has no connection, and we don't show + * any active fields. Skip this row. */ + continue; + } - invisibles = g_ptr_array_new (); - acons = nm_client_get_active_connections (nmc->client); - connections = nm_client_get_connections (nmc->client); - for (a = 0; a < acons->len; a++) { - gboolean found = FALSE; - NMActiveConnection *acon = g_ptr_array_index (acons, a); - const char *a_uuid = nm_active_connection_get_uuid (acon); + row_data = c + ? g_hash_table_lookup (row_hash, c) + : NULL; + + if (show_active_fields || !c) { + /* the active connection either has no connection (in which we create a + * connection-less row), or we are interested in showing each active + * connection in its own row. Add a row. */ + if (row_data) { + /* we create a rowdata for this connection earlier. We drop it, because this + * connection is tracked via the rowdata of the active connection. */ + g_hash_table_remove (row_hash, c); + _metagen_con_show_row_data_destroy (row_data); + } + row_data = _metagen_con_show_row_data_new_for_active_connection (c, ac, show_active_fields); + g_hash_table_insert (row_hash, ac, row_data); + continue; + } + + /* we add the active connection to the row for the referenced + * connection. We need to group them this way, to print the proper + * color (activated or not) based on primary_active. */ + if (!row_data) { + /* this is unexpected. The active connection references a connection that + * seemingly no longer exists. It's a bug in libnm. Add a row nontheless. */ + row_data = _metagen_con_show_row_data_new_for_connection (c, show_active_fields); + g_hash_table_insert (row_hash, c, row_data); + } + _metagen_con_show_row_data_add_active_connection (row_data, ac); + } - for (c = 0; c < connections->len; c++) { - NMConnection *con = g_ptr_array_index (connections, c); - const char *c_uuid = nm_connection_get_uuid (con); + result = g_ptr_array_new_with_free_func (_metagen_con_show_row_data_destroy); - if (strcmp (a_uuid, c_uuid) == 0) { - found = TRUE; - break; - } + g_hash_table_iter_init (&hiter, row_hash); + while (g_hash_table_iter_next (&hiter, NULL, (gpointer *) &row_data)) { + if ( active_only + && !row_data->primary_active) { + /* We only print connections that are active. Skip this row. */ + _metagen_con_show_row_data_destroy (row_data); + continue; } - /* Active connection is not in connections array, add it to */ - if (!found) - g_ptr_array_add (invisibles, acon); + if (!show_active_fields) { + NMSettingConnection *s_con; + + nm_assert (NM_IS_REMOTE_CONNECTION (row_data->connection)); + s_con = nm_connection_get_setting_connection (row_data->connection); + if ( !s_con + || !nm_setting_connection_get_uuid (s_con)) { + /* we are in a mode, where we only print rows for connection. + * For that we require that all rows are visible to the user, + * meaning: the have a [connection] setting and a UUID. + * + * Otherwise, this connection is likely invisible to the user. + * Skip it. */ + _metagen_con_show_row_data_destroy (row_data); + continue; + } + _metagen_con_show_row_data_init_primary_active (row_data); + } else + nm_assert (!row_data->all_active); + g_ptr_array_add (result, row_data); } - g_ptr_array_sort_with_data (invisibles, compare_ac_connections, NULL); - return invisibles; + + g_ptr_array_sort_with_data (result, con_show_get_items_cmp, (gpointer) &sort_info); + return result; } static GArray * parse_preferred_connection_order (const char *order, GError **error) { - char **strv, **iter; + gs_free const char **strv = NULL; + const char *const*iter; const char *str; GArray *order_arr; NmcSortOrder val; gboolean inverse, unique; int i; - strv = nmc_strsplit_set (order, ":", -1); - if (!strv || !*strv) { + strv = nm_utils_strsplit_set (order, ":"); + if (!strv) { g_set_error (error, NMCLI_ERROR, 0, _("incorrect string '%s' of '--order' option"), order); - g_strfreev (strv); return NULL; } @@ -1642,17 +1812,25 @@ parse_preferred_connection_order (const char *order, GError **error) g_array_append_val (order_arr, val); } - g_strfreev (strv); return order_arr; } static NMConnection * -get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error) +get_connection (NmCli *nmc, + int *argc, + char ***argv, + const char **out_selector, + const char **out_value, + GPtrArray **out_result, + GError **error) { const GPtrArray *connections; NMConnection *connection = NULL; const char *selector = NULL; + NM_SET_OUT (out_selector, NULL); + NM_SET_OUT (out_value, NULL); + if (*argc == 0) { g_set_error_literal (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("No connection specified")); @@ -1660,47 +1838,47 @@ get_connection (NmCli *nmc, int *argc, char ***argv, int *pos, GError **error) } if (*argc == 1 && nmc->complete) - nmc_complete_strings (**argv, "id", "uuid", "path", NULL); - - if ( strcmp (**argv, "id") == 0 - || strcmp (**argv, "uuid") == 0 - || strcmp (**argv, "path") == 0) { - selector = **argv; - (*argc)--; - (*argv)++; - if (!*argc) { - g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, - _("%s argument is missing"), selector); - return NULL; + nmc_complete_strings (**argv, "id", "uuid", "path", "filename", NULL); + + if (NM_IN_STRSET (**argv, "id", "uuid", "path", "filename")) { + if (*argc == 1) { + if (!nmc->complete) { + g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, + _("%s argument is missing"), selector); + return NULL; + } + } else { + selector = **argv; + (*argv)++; + (*argc)--; } } + NM_SET_OUT (out_selector, selector); + NM_SET_OUT (out_value, **argv); + connections = nm_client_get_connections (nmc->client); - connection = nmc_find_connection (connections, selector, **argv, pos, + connection = nmc_find_connection (connections, selector, **argv, out_result, *argc == 1 && nmc->complete); if (!connection) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_NOT_FOUND, _("unknown connection '%s'"), **argv); } - /* If the caller wants multiple results (pos is set) and there are any, - * don't switch to next argument. - */ - if (!pos || !*pos) - next_arg (nmc, argc, argv, NULL); - + next_arg (nmc, argc, argv, NULL); return connection; } static NMCResultCode do_connections_show (NmCli *nmc, int argc, char **argv) { - GError *err = NULL; - char *profile_flds = NULL, *active_flds = NULL; - GPtrArray *invisibles, *sorted_cons; + gs_free_error GError *err = NULL; + gs_free char *profile_flds = NULL; + gs_free char *active_flds = NULL; gboolean active_only = FALSE; - GArray *order = NULL; - int i, option; + gs_unref_array GArray *order = NULL; + guint i; + int option; /* check connection show options [--active] [--order ] */ while ((option = next_arg (nmc, &argc, &argv, "--active", "--order", NULL)) > 0) { @@ -1727,55 +1905,63 @@ do_connections_show (NmCli *nmc, int argc, char **argv) } if (argc == 0) { - const GPtrArray *connections; const char *fields_str = NULL; - char *fields_common = NMC_FIELDS_CON_SHOW_COMMON; - const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + gs_unref_ptrarray GPtrArray *items = NULL; + gs_free NMMetaSelectionResultList *selection = NULL; + gboolean show_active_fields = TRUE; if (nmc->complete) goto finish; if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) - fields_str = fields_common; + fields_str = NMC_FIELDS_CON_SHOW_COMMON; else if (!nmc->required_fields || strcasecmp (nmc->required_fields, "all") == 0) { } else fields_str = nmc->required_fields; - tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_con_show; - out_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, &err); - if (err) - goto finish; - - /* Add headers */ - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - /* There might be active connections not present in connection list - * (e.g. private connections of a different user). Show them as well. */ - invisibles = get_invisible_active_connections (nmc); - for (i = 0; i < invisibles->len; i++) - fill_output_connection_for_invisible (invisibles->pdata[i], nmc->nmc_config.print_output, out.output_data); - g_ptr_array_free (invisibles, TRUE); + /* determine whether the user wants to see any fields that are related to active-connections + * (e.g. the apath, the current state, or the device where the profile is active). + * + * If that's the case, then we will show one line for each active connection. In case + * a profile has multiple active connections, it will be listed multiple times. + * If that's not the case, we filter out these duplicate lines. */ + selection = nm_meta_selection_create_parse_list ((const NMMetaAbstractInfo *const*) metagen_con_show, + NULL, + fields_str, + FALSE, + NULL); + if (selection && selection->num > 0) { + show_active_fields = FALSE; + for (i = 0; i < selection->num; i++) { + const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) selection->items[i].info; + + if (NM_IN_SET (info->info_type, NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH)) { + show_active_fields = TRUE; + break; + } + } + } - /* Sort the connections and fill the output data */ - connections = nm_client_get_connections (nmc->client); - sorted_cons = sort_connections (connections, nmc, order); - for (i = 0; i < sorted_cons->len; i++) - fill_output_connection (sorted_cons->pdata[i], nmc->client, nmc->nmc_config.print_output, out.output_data, active_only); - g_ptr_array_free (sorted_cons, TRUE); - - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, - active_only ? _("NetworkManager active profiles") - : _("NetworkManager connection profiles"), - 0, &out); + /* Optionally start paging the output. */ + nmc_terminal_spawn_pager (&nmc->nmc_config); + + items = con_show_get_items (nmc, active_only, show_active_fields, order); + g_ptr_array_add (items, NULL); + if (!nmc_print (&nmc->nmc_config, + items->pdata, + active_only + ? _("NetworkManager active profiles") + : _("NetworkManager connection profiles"), + (const NMMetaAbstractInfo *const*) metagen_con_show, + fields_str, + &err)) + goto finish; } else { gboolean new_line = FALSE; gboolean without_fields = (nmc->required_fields == NULL); const GPtrArray *active_cons = nm_client_get_active_connections (nmc->client); - int pos = 0; /* multiline mode is default for 'connection show ' */ if (!nmc->mode_specified) @@ -1784,8 +1970,8 @@ do_connections_show (NmCli *nmc, int argc, char **argv) /* Split required fields into the settings and active ones. */ if (!split_required_fields_for_con_show (nmc->required_fields, &profile_flds, &active_flds, &err)) goto finish; - g_free (nmc->required_fields); - nmc->required_fields = NULL; + + nm_clear_g_free (&nmc->required_fields); /* Before printing the connections check if we have a "--show-secret" * option after the connection ids */ @@ -1794,10 +1980,7 @@ do_connections_show (NmCli *nmc, int argc, char **argv) char **argv_cp = argv; do { - if ( nm_streq (*argv_cp, "id") - || nm_streq (*argv_cp, "uuid") - || nm_streq (*argv_cp, "path") - || nm_streq (*argv_cp, "apath")) { + if (NM_IN_STRSET (*argv_cp, "id", "uuid", "path", "filename", "apath")) { argc_cp--; argv_cp++; } @@ -1808,16 +1991,16 @@ do_connections_show (NmCli *nmc, int argc, char **argv) const GPtrArray *connections; gboolean res; NMConnection *con; - NMActiveConnection *acon = NULL; + gs_unref_object NMActiveConnection *explicit_acon = NULL; const char *selector = NULL; + gs_unref_ptrarray GPtrArray *found_cons = NULL; + gboolean explicit_acon_handled = FALSE; + guint i_found_cons; if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "id", "uuid", "path", "apath", NULL); + nmc_complete_strings (*argv, "id", "uuid", "path", "filename", "apath", NULL); - if ( strcmp (*argv, "id") == 0 - || strcmp (*argv, "uuid") == 0 - || strcmp (*argv, "path") == 0 - || strcmp (*argv, "apath") == 0) { + if (NM_IN_STRSET (*argv, "id", "uuid", "path", "filename", "apath")) { selector = *argv; argc--; argv++; @@ -1830,17 +2013,26 @@ do_connections_show (NmCli *nmc, int argc, char **argv) /* Try to find connection by id, uuid or path first */ connections = nm_client_get_connections (nmc->client); - con = nmc_find_connection (connections, selector, *argv, &pos, + con = nmc_find_connection (connections, selector, *argv, &found_cons, argc == 1 && nmc->complete); - if (!con && (!selector || strcmp (selector, "apath") == 0)) { + if ( !con + && NM_IN_STRSET (selector, NULL, "apath")) { /* Try apath too */ - acon = find_active_connection (active_cons, connections, "apath", *argv, NULL, - argc == 1 && nmc->complete); - if (acon) - con = NM_CONNECTION (nm_active_connection_get_connection (acon)); + explicit_acon = nmc_find_active_connection (active_cons, "apath", *argv, NULL, + argc == 1 && nmc->complete); + if (explicit_acon) { + if ( !selector + && !nm_streq0 (*argv, nm_object_get_path (NM_OBJECT (explicit_acon)))) { + /* we matched the apath based on the last component alone (note the full D-Bus path). + * That is how nmc_find_active_connection() works, if you pass in a selector. + * Reject it. */ + explicit_acon = NULL; + } + nm_g_object_ref (explicit_acon); + } } - if (!con && !acon) { + if (!con && !explicit_acon) { g_string_printf (nmc->return_text, _("Error: %s - no such connection profile."), *argv); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; goto finish; @@ -1852,54 +2044,81 @@ do_connections_show (NmCli *nmc, int argc, char **argv) * may see only the active connection. */ - /* Filter only active connections */ - if (!acon) - acon = get_ac_for_connection (active_cons, con); - if (active_only && !acon) { - next_arg (nmc, &argc, &argv, NULL); - continue; - } - if (nmc->complete) { next_arg (nmc, &argc, &argv, NULL); continue; } - /* Show an empty line between connections */ - if (new_line) - g_print ("\n"); - - /* Show profile configuration */ - if (without_fields || profile_flds) { - if (con) { - nmc->required_fields = profile_flds; - if (nmc->nmc_config.show_secrets) - update_secrets_in_connection (NM_REMOTE_CONNECTION (con), con); - res = nmc_connection_profile_details (con, nmc); - nmc->required_fields = NULL; - if (!res) - goto finish; + explicit_acon_handled = FALSE; + i_found_cons = 0; + for (;;) { + gs_unref_ptrarray GPtrArray *found_acons = NULL; + + if (explicit_acon) { + if (explicit_acon_handled) + break; + explicit_acon_handled = TRUE; + /* the user referenced an "apath". In this case, we can only have at most one connection + * and one apath. */ + con = NM_CONNECTION (nm_active_connection_get_connection (explicit_acon)); + } else { + if (i_found_cons >= found_cons->len) + break; + con = found_cons->pdata[i_found_cons++]; + get_ac_for_connection (active_cons, con, &found_acons); } - } - /* If the profile is active, print also active details */ - if (without_fields || active_flds) { - if (acon) { - nmc->required_fields = active_flds; - res = nmc_active_connection_details (acon, nmc); - nmc->required_fields = NULL; - if (!res) - goto finish; + if (active_only && !explicit_acon && !found_acons) { + /* this connection is not interesting, we only print active ones. */ + continue; + } + + nm_assert (explicit_acon || con); + + if (new_line) + g_print ("\n"); + new_line = TRUE; + + if (without_fields || profile_flds) { + if (con) { + nmc->required_fields = profile_flds; + if (nmc->nmc_config.show_secrets) + update_secrets_in_connection (NM_REMOTE_CONNECTION (con), con); + res = nmc_connection_profile_details (con, nmc); + nmc->required_fields = NULL; + if (!res) + goto finish; + } + } + + if (without_fields || active_flds) { + guint l = explicit_acon ? 1 : (found_acons ? found_acons->len : 0); + + for (i = 0; i < l; i++) { + NMActiveConnection *acon; + + if (i > 0) { + /* if there are multiple active connections, separate them with newline. + * that is a bit odd, because we already separate connections with newlines, + * and commonly don't separate the connection from the first active connection. */ + g_print ("\n"); + } + + if (explicit_acon) + acon = explicit_acon; + else + acon = found_acons->pdata[i]; + + nmc->required_fields = active_flds; + res = nmc_active_connection_details (acon, nmc); + nmc->required_fields = NULL; + if (!res) + goto finish; + } } } - new_line = TRUE; - /* Take next argument. - * But for pos != NULL we have more connections of the same name, - * so process the same argument again. - */ - if (!pos) - next_arg (nmc, &argc, &argv, NULL); + next_arg (nmc, &argc, &argv, NULL); } } @@ -1907,12 +2126,7 @@ finish: if (err) { g_string_printf (nmc->return_text, _("Error: %s."), err->message); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_error_free (err); } - g_free (profile_flds); - g_free (active_flds); - if (order) - g_array_unref (order); return nmc->return_value; } @@ -1925,8 +2139,8 @@ get_default_active_connection (NmCli *nmc, NMDevice **device) const GPtrArray *connections; int i; - g_return_val_if_fail (nmc != NULL, NULL); - g_return_val_if_fail (device != NULL, NULL); + g_return_val_if_fail (nmc, NULL); + g_return_val_if_fail (device, NULL); g_return_val_if_fail (*device == NULL, NULL); connections = nm_client_get_active_connections (nmc->client); @@ -1984,10 +2198,10 @@ find_device_for_connection (NmCli *nmc, const char *con_type; int i, j; - g_return_val_if_fail (nmc != NULL, FALSE); + g_return_val_if_fail (nmc, FALSE); g_return_val_if_fail (iface || ap || nsp, FALSE); - g_return_val_if_fail (device != NULL && *device == NULL, FALSE); - g_return_val_if_fail (spec_object != NULL && *spec_object == NULL, FALSE); + g_return_val_if_fail (device && *device == NULL, FALSE); + g_return_val_if_fail (spec_object && *spec_object == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); s_con = nm_connection_get_setting_connection (connection); @@ -2042,8 +2256,10 @@ find_device_for_connection (NmCli *nmc, } found_device = dev; - if (ap && !strcmp (con_type, NM_SETTING_WIRELESS_SETTING_NAME) && NM_IS_DEVICE_WIFI (dev)) { - char *bssid_up = g_ascii_strup (ap, -1); + if ( ap + && nm_streq (con_type, NM_SETTING_WIRELESS_SETTING_NAME) + && NM_IS_DEVICE_WIFI (dev)) { + gs_free char *bssid_up = g_ascii_strup (ap, -1); const GPtrArray *aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); found_device = NULL; /* Mark as not found; set to the device again later, only if AP matches */ @@ -2051,29 +2267,28 @@ find_device_for_connection (NmCli *nmc, NMAccessPoint *candidate_ap = g_ptr_array_index (aps, j); const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); - if (!strcmp (bssid_up, candidate_bssid)) { + if (nm_streq0 (bssid_up, candidate_bssid)) { found_device = dev; *spec_object = nm_object_get_path (NM_OBJECT (candidate_ap)); break; } } - g_free (bssid_up); } - } - if (found_device) { - *device = found_device; - return TRUE; - } else { - if (iface) + if (!found_device) { + if (iface) { g_set_error (error, NMCLI_ERROR, 0, _("device '%s' not compatible with connection '%s'"), iface, nm_setting_connection_get_id (s_con)); - else + } else { g_set_error (error, NMCLI_ERROR, 0, _("no device found for connection '%s'"), nm_setting_connection_get_id (s_con)); + } return FALSE; } + + *device = found_device; + return TRUE; } } @@ -2295,48 +2510,50 @@ activate_connection_cb (GObject *client, GAsyncResult *result, gpointer user_dat static GHashTable * parse_passwords (const char *passwd_file, GError **error) { - GHashTable *pwds_hash; - char *contents = NULL; + gs_unref_hashtable GHashTable *pwds_hash = NULL; + gs_free char *contents = NULL; gsize len = 0; GError *local_err = NULL; - char **lines, **iter; + gs_free const char **strv = NULL; + const char *const*iter; char *pwd_spec, *pwd, *prop; const char *setting; pwds_hash = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, g_free); if (!passwd_file) - return pwds_hash; + return g_steal_pointer (&pwds_hash); - /* Read the passwords file */ + /* Read the passwords file */ if (!g_file_get_contents (passwd_file, &contents, &len, &local_err)) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("failed to read passwd-file '%s': %s"), passwd_file, local_err->message); g_error_free (local_err); - g_hash_table_destroy (pwds_hash); return NULL; } - lines = nmc_strsplit_set (contents, "\r\n", -1); - for (iter = lines; *iter; iter++) { - pwd = strchr (*iter, ':'); + strv = nm_utils_strsplit_set (contents, "\r\n"); + for (iter = strv; *iter; iter++) { + gs_free char *iter_s = g_strdup (*iter); + + pwd = strchr (iter_s, ':'); if (!pwd) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("missing colon in 'password' entry '%s'"), *iter); - goto failure; + return NULL; } *(pwd++) = '\0'; - prop = strchr (*iter, '.'); + prop = strchr (iter_s, '.'); if (!prop) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("missing dot in 'password' entry '%s'"), *iter); - goto failure; + return NULL; } *(prop++) = '\0'; - setting = *iter; + setting = iter_s; while (g_ascii_isspace (*setting)) setting++; /* Accept wifi-sec or wifi instead of cumbersome '802-11-wireless-security' */ @@ -2345,25 +2562,15 @@ parse_passwords (const char *passwd_file, GError **error) if (nm_setting_lookup_type (setting) == G_TYPE_INVALID) { g_set_error (error, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT, _("invalid setting name in 'password' entry '%s'"), setting); - goto failure; + return NULL; } pwd_spec = g_strdup_printf ("%s.%s", setting, prop); g_hash_table_insert (pwds_hash, pwd_spec, g_strdup (pwd)); } - g_strfreev (lines); - g_free (contents); - return pwds_hash; - -failure: - g_strfreev (lines); - g_free (contents); - g_hash_table_destroy (pwds_hash); - return NULL; + return g_steal_pointer (&pwds_hash); } - - static gboolean nmc_activate_connection (NmCli *nmc, NMConnection *connection, @@ -2382,7 +2589,7 @@ nmc_activate_connection (NmCli *nmc, gboolean device_found; GError *local = NULL; - g_return_val_if_fail (nmc != NULL, FALSE); + g_return_val_if_fail (nmc, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE); if (connection && (ifname || ap || nsp)) { @@ -2482,7 +2689,7 @@ do_connection_up (NmCli *nmc, int argc, char **argv) } if (argc > 0 && strcmp (*argv, "ifname") != 0) { - connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); + connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, NULL, NULL, &error); if (!connection) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); return error->code; @@ -2534,47 +2741,135 @@ do_connection_up (NmCli *nmc, int argc, char **argv) g_printerr (_("Unknown parameter: %s\n"), *argv); } - next_arg (nmc, &argc, &argv, NULL); + next_arg (nmc, &argc, &argv, NULL); + } + + if (nmc->complete) + return nmc->return_value; + + /* Use nowait_flag instead of should_wait because exiting has to be postponed till + * active_connection_state_cb() is called. That gives NM time to check our permissions + * and we can follow activation progress. + */ + nmc->nowait_flag = (nmc->timeout == 0); + nmc->should_wait++; + + if (!nmc_activate_connection (nmc, connection, ifname, ap, nsp, pwds, activate_connection_cb, &error)) { + g_string_printf (nmc->return_text, _("Error: %s."), + error->message); + nmc->should_wait--; + return error->code; + } + + /* Start progress indication */ + if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) + progress_id = g_timeout_add (120, progress_cb, _("preparing")); + + return nmc->return_value; +} + +/*****************************************************************************/ + +typedef struct { + NmCli *nmc; + /* a list of object that is relevant for the callback. The object + * type differs, and depends on the type of callback. */ + GPtrArray *obj_list; + guint timeout_id; + GCancellable *cancellable; +} ConnectionCbInfo; + +static void connection_removed_cb (NMClient *client, NMConnection *connection, ConnectionCbInfo *info); + +static void down_active_connection_state_cb (NMActiveConnection *active, + GParamSpec *pspec, + ConnectionCbInfo *info); + +static void +connection_cb_info_obj_list_destroy (ConnectionCbInfo *info, gpointer obj) +{ + nm_assert (info); + nm_assert (info->obj_list); + nm_assert (G_IS_OBJECT (obj)); + + g_signal_handlers_disconnect_by_func (obj, down_active_connection_state_cb, info); + g_object_unref (obj); +} + +static gssize +connection_cb_info_obj_list_idx (ConnectionCbInfo *info, gpointer obj) +{ + guint i; + + nm_assert (info); + nm_assert (info->obj_list); + nm_assert (G_IS_OBJECT (obj)); + + for (i = 0; i < info->obj_list->len; i++) { + if (info->obj_list->pdata[i] == obj) + return i; + } + return -1; +} + +static gpointer +connection_cb_info_obj_list_has (ConnectionCbInfo *info, gpointer obj) +{ + gssize idx; + + idx = connection_cb_info_obj_list_idx (info, obj); + if (idx >= 0) + return info->obj_list->pdata[idx]; + return NULL; +} + +static gpointer +connection_cb_info_obj_list_steal (ConnectionCbInfo *info, gpointer obj) +{ + gssize idx; + + idx = connection_cb_info_obj_list_idx (info, obj); + if (idx >= 0) { + g_ptr_array_remove_index (info->obj_list, idx); + return obj; + } + return NULL; +} + +static void +connection_cb_info_finish (ConnectionCbInfo *info, gpointer obj) +{ + if (obj) { + obj = connection_cb_info_obj_list_steal (info, obj); + if (obj) + connection_cb_info_obj_list_destroy (info, obj); + } else { + while (info->obj_list->len > 0) { + obj = info->obj_list->pdata[info->obj_list->len - 1]; + g_ptr_array_remove_index (info->obj_list, info->obj_list->len - 1); + connection_cb_info_obj_list_destroy (info, obj); + } } - if (nmc->complete) - return nmc->return_value; + if (info->obj_list->len > 0) + return; - /* Use nowait_flag instead of should_wait because exiting has to be postponed till - * active_connection_state_cb() is called. That gives NM time to check our permissions - * and we can follow activation progress. - */ - nmc->nowait_flag = (nmc->timeout == 0); - nmc->should_wait++; + nm_clear_g_source (&info->timeout_id); + nm_clear_g_cancellable (&info->cancellable); - if (!nmc_activate_connection (nmc, connection, ifname, ap, nsp, pwds, activate_connection_cb, &error)) { - g_string_printf (nmc->return_text, _("Error: %s."), - error->message); - nmc->should_wait--; - return error->code; - } + g_signal_handlers_disconnect_by_func (info->nmc->client, connection_removed_cb, info); - /* Start progress indication */ - if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) - progress_id = g_timeout_add (120, progress_cb, _("preparing")); + g_slice_free (ConnectionCbInfo, info); - return nmc->return_value; + quit (); } -typedef struct { - NmCli *nmc; - GSList *queue; - guint timeout_id; - GCancellable *cancellable; -} ConnectionCbInfo; - -static void connection_cb_info_finish (ConnectionCbInfo *info, - gpointer connection); +/*****************************************************************************/ static void connection_removed_cb (NMClient *client, NMConnection *connection, ConnectionCbInfo *info) { - if (!g_slist_find (info->queue, connection)) + if (!connection_cb_info_obj_list_has (info, connection)) return; g_print (_("Connection '%s' (%s) successfully deleted.\n"), nm_connection_get_id (connection), @@ -2611,49 +2906,17 @@ connection_op_timeout_cb (gpointer user_data) return G_SOURCE_REMOVE; } -static void -destroy_queue_element (gpointer data) -{ - g_signal_handlers_disconnect_matched (data, G_SIGNAL_MATCH_FUNC, 0, 0, 0, - down_active_connection_state_cb, NULL); - g_object_unref (data); -} - -static void -connection_cb_info_finish (ConnectionCbInfo *info, gpointer connection) -{ - if (connection) { - info->queue = g_slist_remove (info->queue, connection); - g_object_unref (G_OBJECT (connection)); - } else { - g_slist_free_full (info->queue, destroy_queue_element); - info->queue = NULL; - } - - if (info->queue) - return; - - if (info->timeout_id) - g_source_remove (info->timeout_id); - - nm_clear_g_cancellable (&info->cancellable); - - g_signal_handlers_disconnect_by_func (info->nmc->client, connection_removed_cb, info); - g_slice_free (ConnectionCbInfo, info); - quit (); -} - static NMCResultCode do_connection_down (NmCli *nmc, int argc, char **argv) { NMActiveConnection *active; ConnectionCbInfo *info = NULL; const GPtrArray *active_cons; - GSList *queue = NULL, *iter, *next; - char **arg_arr = NULL; + gs_strfreev char **arg_arr = NULL; char **arg_ptr; int arg_num; - int idx = 0; + guint i; + gs_unref_ptrarray GPtrArray *found_active_cons = NULL; if (nmc->timeout == -1) nmc->timeout = 10; @@ -2674,108 +2937,88 @@ do_connection_down (NmCli *nmc, int argc, char **argv) } if (arg_num == 0) { g_string_printf (nmc->return_text, _("Error: No connection specified.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } } /* Get active connections */ active_cons = nm_client_get_active_connections (nmc->client); while (arg_num > 0) { - const GPtrArray *connections; const char *selector = NULL; if (arg_num == 1 && nmc->complete) - nmc_complete_strings (*arg_ptr, "id", "uuid", "path", "apath", NULL); - - if ( strcmp (*arg_ptr, "id") == 0 - || strcmp (*arg_ptr, "uuid") == 0 - || strcmp (*arg_ptr, "path") == 0 - || strcmp (*arg_ptr, "apath") == 0) { + nmc_complete_strings (*arg_ptr, "id", "uuid", "path", "filename", "apath", NULL); + if (NM_IN_STRSET (*arg_ptr, "id", "uuid", "path", "filename", "apath")) { selector = *arg_ptr; arg_num--; arg_ptr++; if (!arg_num) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), selector); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } } - connections = nm_client_get_connections (nmc->client); - active = find_active_connection (active_cons, connections, selector, *arg_ptr, &idx, - arg_num == 1 && nmc->complete); - if (active) { - /* Check if the connection is unique. */ - /* Calling down for the same connection repeatedly would result in - * NM responding for the last D-Bus call only and we would stall. */ - if (!g_slist_find (queue, active)) - queue = g_slist_prepend (queue, g_object_ref (active)); - } else { + active = nmc_find_active_connection (active_cons, + selector, + *arg_ptr, + &found_active_cons, + arg_num == 1 && nmc->complete); + if (!active) { if (!nmc->complete) g_printerr (_("Error: '%s' is not an active connection.\n"), *arg_ptr); g_string_printf (nmc->return_text, _("Error: not all active connections found.")); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; } - if (idx == 0) - next_arg (nmc->ask ? NULL : nmc, &arg_num, &arg_ptr, NULL); + next_arg (nmc->ask ? NULL : nmc, &arg_num, &arg_ptr, NULL); } - if (!queue) { + if (!found_active_cons) { g_string_printf (nmc->return_text, _("Error: no active connection provided.")); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto finish; - } else if (nmc->complete) { - g_slist_free (queue); - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_NOT_FOUND); } - queue = g_slist_reverse (queue); + nm_assert (found_active_cons->len > 0); + + if (nmc->complete) + return nmc->return_value; if (nmc->timeout > 0) { nmc->should_wait++; info = g_slice_new0 (ConnectionCbInfo); info->nmc = nmc; - info->queue = queue; - info->timeout_id = g_timeout_add_seconds (nmc->timeout, connection_op_timeout_cb, info); - } - - iter = queue; - while (iter) { - GError *error = NULL; - - next = g_slist_next (iter); - active = iter->data; - - if (info) { + info->obj_list = g_ptr_array_sized_new (found_active_cons->len); + for (i = 0; i < found_active_cons->len; i++) { + active = found_active_cons->pdata[i]; + g_ptr_array_add (info->obj_list, g_object_ref (active)); g_signal_connect (active, "notify::" NM_ACTIVE_CONNECTION_STATE, G_CALLBACK (down_active_connection_state_cb), info); } + info->timeout_id = g_timeout_add_seconds (nmc->timeout, connection_op_timeout_cb, info); + } + + for (i = 0; i < found_active_cons->len; i++) { + GError *error = NULL; + + active = found_active_cons->pdata[i]; - /* Now deactivate the connection */ if (!nm_client_deactivate_connection (nmc->client, active, NULL, &error)) { g_print (_("Connection '%s' deactivation failed: %s\n"), nm_active_connection_get_id (active), error->message); - g_error_free (error); + g_clear_error (&error); if (info) { g_signal_handlers_disconnect_by_func (active, down_active_connection_state_cb, info); - /* Remove the active connection from @queue */ connection_cb_info_finish (info, active); } } - - iter = next; } -finish: - g_strfreev (arg_arr); return nmc->return_value; } @@ -3339,7 +3582,7 @@ _dynamic_options_set (const NMMetaAbstractInfo *abstract_info, PropertyInfFlags v, v2; if (G_UNLIKELY (!cache)) - cache = g_hash_table_new (NULL, NULL); + cache = g_hash_table_new (nm_direct_hash, NULL); if (g_hash_table_lookup_extended (cache, (gpointer) abstract_info, NULL, &p)) v = GPOINTER_TO_UINT (p); @@ -3595,6 +3838,7 @@ set_property (NMConnection *connection, */ 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 @@ -4265,7 +4509,7 @@ nmc_read_connection_properties (NmCli *nmc, return FALSE; if (!*argc && nmc->complete) - complete_property (setting, strv[1], value ? value : "", connection); + complete_property (setting, strv[1], value ?: "", connection); if (!set_property (connection, setting_name, strv[1], value, modifier, error)) return FALSE; @@ -4346,7 +4590,7 @@ nmc_read_connection_properties (NmCli *nmc, return FALSE; if (!*argc && nmc->complete) - complete_option (chosen, value ? value : "", connection); + complete_option (chosen, value ?: "", connection); if (!set_option (nmc, connection, chosen, value, error)) return FALSE; @@ -4457,8 +4701,8 @@ nmcli_con_add_tab_completion (const char *text, int start, int end) NMMetaSettingType s; char **match_array = NULL; rl_compentry_func_t *generator_func = NULL; - gs_free char *no = g_strdup_printf ("[%s]: ", gettext ("no")); - gs_free char *yes = g_strdup_printf ("[%s]: ", gettext ("yes")); + gs_free char *no = g_strdup_printf ("[%s]: ", _("no")); + gs_free char *yes = g_strdup_printf ("[%s]: ", _("yes")); /* Disable readline's default filename completion */ rl_attempted_completion_over = 1; @@ -4741,9 +4985,9 @@ again: static NMCResultCode do_connection_add (NmCli *nmc, int argc, char **argv) { - NMConnection *connection = NULL; + gs_unref_object NMConnection *connection = NULL; NMSettingConnection *s_con; - GError *error = NULL; + gs_free_error GError *error = NULL; AddConnectionInfo *info = NULL; gboolean save_bool = TRUE; gboolean seen_dash_dash = FALSE; @@ -4755,27 +4999,24 @@ do_connection_add (NmCli *nmc, int argc, char **argv) nmc->return_value = NMC_RESULT_SUCCESS; - /* Create a new connection object */ connection = nm_simple_connection_new (); - /* Build up the 'connection' setting */ s_con = (NMSettingConnection *) nm_setting_connection_new (); nm_connection_add_setting (connection, NM_SETTING (s_con)); read_properties: + g_clear_error (&error); /* Get the arguments from the command line if any */ if (argc && !nmc_read_connection_properties (nmc, connection, &argc, &argv, &error)) { if (g_strcmp0 (*argv, "--") == 0 && !seen_dash_dash) { /* This is for compatibility with older nmcli that required * options and properties to be separated with "--" */ - g_clear_error (&error); seen_dash_dash = TRUE; next_arg (nmc, &argc, &argv, NULL); goto read_properties; } else if (g_strcmp0 (*argv, "save") == 0) { /* It would be better if "save" was a separate argument and not * mixed with properties, but there's not much we can do about it now. */ - g_clear_error (&error); argc--; argv++; if (!argc) { @@ -4785,11 +5026,11 @@ read_properties: nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; goto finish; } + g_clear_error (&error); if (!nmc_string_to_bool (*argv, &save_bool, &error)) { g_string_printf (nmc->return_text, _("Error: 'save': %s."), error->message); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - g_clear_error (&error); goto finish; } next_arg (nmc, &argc, &argv, NULL); @@ -4798,7 +5039,6 @@ read_properties: g_string_assign (nmc->return_text, error->message); nmc->return_value = error->code; - g_clear_error (&error); goto finish; } @@ -4908,9 +5148,6 @@ read_properties: finish: reset_options (); - if (connection) - g_object_unref (connection); - return nmc->return_value; } @@ -4962,15 +5199,7 @@ gen_nmcli_cmds_submenu (const char *text, int state) static char * gen_cmd_nmcli (const char *text, int state) { - const char *words[] = { "status-line", "save-confirmation", "show-secrets", "prompt-color", NULL }; - return nmc_rl_gen_func_basic (text, state, words); -} - -static char * -gen_cmd_nmcli_prompt_color (const char *text, int state) -{ - const char *words[] = { "normal", "black", "red", "green", "yellow", - "blue", "magenta", "cyan", "white", NULL }; + const char *words[] = { "status-line", "save-confirmation", "show-secrets", NULL }; return nmc_rl_gen_func_basic (text, state, words); } @@ -5286,8 +5515,6 @@ get_gen_func_cmd_nmcli (const char *str) return gen_func_bool_values; if (matches (str, "show-secrets")) return gen_func_bool_values; - if (matches (str, "prompt-color")) - return gen_cmd_nmcli_prompt_color; return NULL; } @@ -5889,50 +6116,80 @@ typedef enum { NMC_EDITOR_MAIN_CMD_QUIT, } NmcEditorMainCmd; +static void +_split_cmd (const char *cmd, char **out_arg0, const char **out_argr) +{ + gs_free char *arg0 = NULL; + const char *argr = NULL; + gsize l; + + NM_SET_OUT (out_arg0, NULL); + NM_SET_OUT (out_argr, NULL); + + if (!cmd) + return; + while (nm_utils_is_separator (cmd[0])) + cmd++; + if (!cmd[0]) + return; + + l = strcspn (cmd, " \t"); + arg0 = g_strndup (cmd, l); + cmd += l; + if (cmd[0]) { + while (nm_utils_is_separator (cmd[0])) + cmd++; + if (cmd[0]) + argr = cmd; + } + + NM_SET_OUT (out_arg0, g_steal_pointer (&arg0)); + NM_SET_OUT (out_argr, argr); +} + static NmcEditorMainCmd parse_editor_main_cmd (const char *cmd, char **cmd_arg) { NmcEditorMainCmd editor_cmd = NMC_EDITOR_MAIN_CMD_UNKNOWN; - char **vec; + gs_free char *cmd_arg0 = NULL; + const char *cmd_argr; - vec = nmc_strsplit_set (cmd, " \t", 2); - if (g_strv_length (vec) < 1) { - if (cmd_arg) - *cmd_arg = NULL; - return NMC_EDITOR_MAIN_CMD_UNKNOWN; - } + _split_cmd (cmd, &cmd_arg0, &cmd_argr); + if (!cmd_arg0) + goto fail; - if (matches (vec[0], "goto")) + if (matches (cmd_arg0, "goto")) editor_cmd = NMC_EDITOR_MAIN_CMD_GOTO; - else if (matches (vec[0], "remove")) + else if (matches (cmd_arg0, "remove")) editor_cmd = NMC_EDITOR_MAIN_CMD_REMOVE; - else if (matches (vec[0], "set")) + else if (matches (cmd_arg0, "set")) editor_cmd = NMC_EDITOR_MAIN_CMD_SET; - else if (matches (vec[0], "describe")) + else if (matches (cmd_arg0, "describe")) editor_cmd = NMC_EDITOR_MAIN_CMD_DESCRIBE; - else if (matches (vec[0], "print")) + else if (matches (cmd_arg0, "print")) editor_cmd = NMC_EDITOR_MAIN_CMD_PRINT; - else if (matches (vec[0], "verify")) + else if (matches (cmd_arg0, "verify")) editor_cmd = NMC_EDITOR_MAIN_CMD_VERIFY; - else if (matches (vec[0], "save")) + else if (matches (cmd_arg0, "save")) editor_cmd = NMC_EDITOR_MAIN_CMD_SAVE; - else if (matches (vec[0], "activate")) + else if (matches (cmd_arg0, "activate")) editor_cmd = NMC_EDITOR_MAIN_CMD_ACTIVATE; - else if (matches (vec[0], "back")) + else if (matches (cmd_arg0, "back")) editor_cmd = NMC_EDITOR_MAIN_CMD_BACK; - else if (matches (vec[0], "help") || strcmp (vec[0], "?") == 0) + else if (matches (cmd_arg0, "help") || strcmp (cmd_arg0, "?") == 0) editor_cmd = NMC_EDITOR_MAIN_CMD_HELP; - else if (matches (vec[0], "quit")) + else if (matches (cmd_arg0, "quit")) editor_cmd = NMC_EDITOR_MAIN_CMD_QUIT; - else if (matches (vec[0], "nmcli")) + else if (matches (cmd_arg0, "nmcli")) editor_cmd = NMC_EDITOR_MAIN_CMD_NMCLI; + else + goto fail; - /* set pointer to command argument */ - if (cmd_arg) - *cmd_arg = vec[1] ? g_strstrip (g_strdup (vec[1])) : NULL; - - g_strfreev (vec); + NM_SET_OUT (cmd_arg, g_strdup (cmd_argr)); return editor_cmd; +fail: + NM_SET_OUT (cmd_arg, NULL); + return NMC_EDITOR_MAIN_CMD_UNKNOWN; } static void @@ -6081,40 +6338,39 @@ static NmcEditorSubCmd parse_editor_sub_cmd (const char *cmd, char **cmd_arg) { NmcEditorSubCmd editor_cmd = NMC_EDITOR_SUB_CMD_UNKNOWN; - char **vec; + gs_free char *cmd_arg0 = NULL; + const char *cmd_argr; - vec = nmc_strsplit_set (cmd, " \t", 2); - if (g_strv_length (vec) < 1) { - if (cmd_arg) - *cmd_arg = NULL; - return NMC_EDITOR_SUB_CMD_UNKNOWN; - } + _split_cmd (cmd, &cmd_arg0, &cmd_argr); + if (!cmd_arg0) + goto fail; - if (matches (vec[0], "set")) + if (matches (cmd_arg0, "set")) editor_cmd = NMC_EDITOR_SUB_CMD_SET; - else if (matches (vec[0], "add")) + else if (matches (cmd_arg0, "add")) editor_cmd = NMC_EDITOR_SUB_CMD_ADD; - else if (matches (vec[0], "change")) + else if (matches (cmd_arg0, "change")) editor_cmd = NMC_EDITOR_SUB_CMD_CHANGE; - else if (matches (vec[0], "remove")) + else if (matches (cmd_arg0, "remove")) editor_cmd = NMC_EDITOR_SUB_CMD_REMOVE; - else if (matches (vec[0], "describe")) + else if (matches (cmd_arg0, "describe")) editor_cmd = NMC_EDITOR_SUB_CMD_DESCRIBE; - else if (matches (vec[0], "print")) + else if (matches (cmd_arg0, "print")) editor_cmd = NMC_EDITOR_SUB_CMD_PRINT; - else if (matches (vec[0], "back")) + else if (matches (cmd_arg0, "back")) editor_cmd = NMC_EDITOR_SUB_CMD_BACK; - else if (matches (vec[0], "help") || strcmp (vec[0], "?") == 0) + else if (matches (cmd_arg0, "help") || strcmp (cmd_arg0, "?") == 0) editor_cmd = NMC_EDITOR_SUB_CMD_HELP; - else if (matches (vec[0], "quit")) + else if (matches (cmd_arg0, "quit")) editor_cmd = NMC_EDITOR_SUB_CMD_QUIT; + else + goto fail; - /* set pointer to command argument */ - if (cmd_arg) - *cmd_arg = g_strdup (vec[1]); - - g_strfreev (vec); + NM_SET_OUT (cmd_arg, g_strdup (cmd_argr)); return editor_cmd; +fail: + NM_SET_OUT (cmd_arg, NULL); + return NMC_EDITOR_SUB_CMD_UNKNOWN; } static void @@ -6259,8 +6515,8 @@ static gboolean progress_activation_editor_cb (gpointer user_data) { MonitorACInfo *info = (MonitorACInfo *) user_data; - NMDevice *device = info->device; - NMActiveConnection *ac = info->ac; + gs_unref_object NMDevice *device = info->device; + gs_unref_object NMActiveConnection *ac = info->ac; NMActiveConnectionState ac_state; NMDeviceState dev_state; @@ -6277,12 +6533,12 @@ progress_activation_editor_cb (gpointer user_data) nmc_terminal_erase_line (); g_print (_("Connection successfully activated (D-Bus active path: %s)\n"), nm_object_get_path (NM_OBJECT (ac))); - goto finish; /* we are done */ + goto finish; } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_DEACTIVATED || dev_state == NM_DEVICE_STATE_FAILED) { nmc_terminal_erase_line (); g_print (_("Error: Connection activation failed.\n")); - goto finish; /* we are done */ + goto finish; } if (info->nmc->secret_agent) { @@ -6297,10 +6553,6 @@ progress_activation_editor_cb (gpointer user_data) finish: info->monitor_id = 0; - if (device) - g_object_unref (device); - if (ac) - g_object_unref (ac); return FALSE; } @@ -6405,7 +6657,7 @@ refresh_remote_connection (GWeakRef *weak, NMRemoteConnection **remote) { gboolean previous; - g_return_val_if_fail (remote != NULL, FALSE); + g_return_val_if_fail (remote, FALSE); previous = (*remote != NULL); if (*remote) @@ -6454,33 +6706,31 @@ property_edit_submenu (NmCli *nmc, const char *prop_name) { NmcEditorSubCmd cmdsub; - gboolean cmd_property_loop = TRUE; - gboolean should_quit = FALSE; - char *prop_val_user; gboolean set_result; GError *tmp_err = NULL; - char *prompt; - gboolean dirty; - GValue prop_g_value = G_VALUE_INIT; + gs_free char *prompt = NULL; gboolean temp_changes; - gboolean removed; /* Set global variable for use in TAB completion */ nmc_tab_completion.property = prop_name; - prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL, - "nmcli %s.%s> ", + prompt = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_PROMPT, "nmcli %s.%s> ", nm_setting_get_name (curr_setting), prop_name); - while (cmd_property_loop) { - char *cmd_property_user; - char *cmd_property_arg; + for (;;) { + 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; /* Get the remote connection again, it may have disapeared */ removed = refresh_remote_connection (rem_con_weak, rem_con); - if (removed) + if (removed) { g_print (_("The connection profile has been removed from another client. " "You may type 'save' in the main menu to restore it.\n")); + } /* Connection is dirty? (not saved or differs from the saved) */ dirty = is_connection_dirty (connection, *rem_con); @@ -6489,7 +6739,7 @@ property_edit_submenu (NmCli *nmc, editor_show_status_line (connection, dirty, temp_changes); cmd_property_user = nmc_readline ("%s", prompt); - if (!cmd_property_user || *cmd_property_user == '\0') + if (!cmd_property_user || !*cmd_property_user) continue; cmdsub = parse_editor_sub_cmd (g_strstrip (cmd_property_user), &cmd_property_arg); @@ -6525,7 +6775,6 @@ property_edit_submenu (NmCli *nmc, } set_result = nmc_setting_set_property (curr_setting, prop_name, prop_val_user, &tmp_err); - g_free (prop_val_user); if (!set_result) { g_print (_("Error: failed to set '%s' property: %s\n"), prop_name, tmp_err->message); g_clear_error (&tmp_err); @@ -6536,8 +6785,6 @@ property_edit_submenu (NmCli *nmc, g_signal_handlers_unblock_matched (curr_setting, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, NULL); } } - if (G_IS_VALUE (&prop_g_value)) - g_value_unset (&prop_g_value); break; case NMC_EDITOR_SUB_CMD_CHANGE: @@ -6555,9 +6802,6 @@ property_edit_submenu (NmCli *nmc, 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); } - g_free (prop_val_user); - if (G_IS_VALUE (&prop_g_value)) - g_value_unset (&prop_g_value); break; case NMC_EDITOR_SUB_CMD_REMOVE: @@ -6610,8 +6854,7 @@ property_edit_submenu (NmCli *nmc, case NMC_EDITOR_SUB_CMD_BACK: /* Set global variable for use in TAB completion */ nmc_tab_completion.property = NULL; - cmd_property_loop = FALSE; - break; + return TRUE; case NMC_EDITOR_SUB_CMD_HELP: editor_sub_usage (cmd_property_arg); @@ -6619,14 +6862,10 @@ property_edit_submenu (NmCli *nmc, case NMC_EDITOR_SUB_CMD_QUIT: if (is_connection_dirty (connection, *rem_con)) { - if (confirm_quit ()) { - cmd_property_loop = FALSE; - should_quit = TRUE; /* we will quit nmcli */ - } - } else { - cmd_property_loop = FALSE; - should_quit = TRUE; /* we will quit nmcli */ - } + if (confirm_quit ()) + return FALSE; + } else + return FALSE; break; case NMC_EDITOR_SUB_CMD_UNKNOWN: @@ -6634,12 +6873,7 @@ property_edit_submenu (NmCli *nmc, g_print (_("Unknown command: '%s'\n"), cmd_property_user); break; } - g_free (cmd_property_user); - g_free (cmd_property_arg); } - g_free (prompt); - - return !should_quit; } /* @@ -6650,29 +6884,26 @@ property_edit_submenu (NmCli *nmc, static void split_editor_main_cmd_args (const char *str, char **setting, char **property, char **value) { - char **args, **items; + gs_free char *cmd_arg0 = NULL; + const char *cmd_argr; + const char *s; - if (!str) - return; + NM_SET_OUT (setting, NULL); + NM_SET_OUT (property, NULL); + NM_SET_OUT (value, NULL); - args = nmc_strsplit_set (str, " \t", 2); - if (args[0]) { - items = nmc_strsplit_set (args[0], ".", 2); - if (g_strv_length (items) == 2) { - if (setting) - *setting = g_strdup (items[0]); - if (property) - *property = g_strdup (items[1]); - } else { - if (property) - *property = g_strdup (items[0]); - } - g_strfreev (items); + _split_cmd (str, &cmd_arg0, &cmd_argr); + if (!cmd_arg0) + return; - if (value && args[1]) - *value = g_strstrip (g_strdup (args[1])); + NM_SET_OUT (value, g_strdup (cmd_argr)); + s = strchr (cmd_arg0, '.'); + if (s && s > cmd_arg0) { + NM_SET_OUT (setting, g_strndup (cmd_arg0, s - cmd_arg0)); + NM_SET_OUT (property, g_strdup (&s[1])); + } else { + NM_SET_OUT (property, g_steal_pointer (&cmd_arg0)); } - g_strfreev (args); } static NMSetting * @@ -6793,7 +7024,7 @@ confirm_connection_saving (NMConnection *local, NMConnection *remote) return confirmed; } -typedef struct { +typedef struct { guint level; char *main_prompt; NMSetting *curr_setting; @@ -6802,14 +7033,13 @@ typedef struct { } NmcEditorMenuContext; static void -menu_switch_to_level0 (NmcColorOption color_option, +menu_switch_to_level0 (const NmcConfig *nmc_config, NmcEditorMenuContext *menu_ctx, - const char *prompt, - NMMetaTermColor prompt_color) + const char *prompt) { menu_ctx->level = 0; g_free (menu_ctx->main_prompt); - menu_ctx->main_prompt = nmc_colorize (color_option, prompt_color, NM_META_TERM_FORMAT_NORMAL, "%s", prompt); + menu_ctx->main_prompt = nmc_colorize (nmc_config, NM_META_COLOR_PROMPT, "%s", prompt); menu_ctx->curr_setting = NULL; g_strfreev (menu_ctx->valid_props); menu_ctx->valid_props = NULL; @@ -6818,16 +7048,14 @@ menu_switch_to_level0 (NmcColorOption color_option, } static void -menu_switch_to_level1 (NmcColorOption color_option, +menu_switch_to_level1 (const NmcConfig *nmc_config, NmcEditorMenuContext *menu_ctx, NMSetting *setting, - const char *setting_name, - NMMetaTermColor prompt_color) + const char *setting_name) { menu_ctx->level = 1; g_free (menu_ctx->main_prompt); - menu_ctx->main_prompt = nmc_colorize (color_option, prompt_color, NM_META_TERM_FORMAT_NORMAL, - "nmcli %s> ", setting_name); + menu_ctx->main_prompt = nmc_colorize (nmc_config, NM_META_COLOR_PROMPT, "nmcli %s> ", setting_name); menu_ctx->curr_setting = setting; g_strfreev (menu_ctx->valid_props); menu_ctx->valid_props = nmc_setting_get_valid_properties (menu_ctx->curr_setting); @@ -6850,7 +7078,6 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t gs_free char *valid_settings_str = NULL; const char *s_type = NULL; AddConnectionInfo *info = NULL; - gboolean dirty; gboolean temp_changes; GError *err1 = NULL; NmcEditorMenuContext menu_ctx = { 0 }; @@ -6865,8 +7092,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t valid_settings_str = get_valid_options_string (valid_settings_main, valid_settings_slave); g_print (_("You may edit the following settings: %s\n"), valid_settings_str); - menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL, - BASE_PROMPT); + menu_ctx.main_prompt = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_PROMPT, BASE_PROMPT); /* Get remote connection */ con_tmp = nm_client_get_connection_by_uuid (nmc->client, @@ -6880,6 +7106,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t gs_free char *cmd_arg_s = NULL; gs_free char *cmd_arg_p = NULL; gs_free char *cmd_arg_v = NULL; + gboolean dirty; /* Connection is dirty? (not saved or differs from the saved) */ dirty = is_connection_dirty (connection, rem_con); @@ -6887,17 +7114,18 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t if (nmc->editor_status_line) editor_show_status_line (connection, dirty, temp_changes); - /* Read user input */ cmd_user = nmc_readline ("%s", menu_ctx.main_prompt); /* Get the remote connection again, it may have disapeared */ removed = refresh_remote_connection (&weak, &rem_con); - if (removed) + if (removed) { g_print (_("The connection profile has been removed from another client. " "You may type 'save' to restore it.\n")); + } - if (!cmd_user || *cmd_user == '\0') + if (!cmd_user || !*cmd_user) continue; + cmd = parse_editor_main_cmd (g_strstrip (cmd_user), &cmd_arg); split_editor_main_cmd_args (cmd_arg, &cmd_arg_s, &cmd_arg_p, &cmd_arg_v); @@ -7005,7 +7233,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* in top level - no setting selected yet */ const char *setting_name; NMSetting *setting; - const char *user_arg = cmd_arg_s ? cmd_arg_s : cmd_arg_p; + const char *user_arg = cmd_arg_s ?: cmd_arg_p; setting_name = ask_check_setting (user_arg, valid_settings_main, @@ -7042,7 +7270,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t nmc_tab_completion.setting = setting; /* Switch to level 1 */ - menu_switch_to_level1 (nmc->nmc_config.use_colors, &menu_ctx, setting, setting_name, nmc->editor_prompt_color); + menu_switch_to_level1 (&nmc->nmc_config, &menu_ctx, setting, setting_name); if (!cmd_arg_s) { g_print (_("You may edit the following properties: %s\n"), menu_ctx.valid_props_str); @@ -7097,7 +7325,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* cmd_arg_s != NULL means argument is "setting.property" */ descr_all = !cmd_arg_s && !menu_ctx.curr_setting; - user_s = descr_all ? cmd_arg_p : cmd_arg_s ? cmd_arg_s : NULL; + user_s = descr_all ? cmd_arg_p : cmd_arg_s; if (user_s) { ss = is_setting_valid (connection, valid_settings_main, @@ -7124,7 +7352,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t connection_remove_setting (connection, ss); if (ss == menu_ctx.curr_setting) { /* If we removed the setting we are in, go up */ - menu_switch_to_level0 (nmc->nmc_config.use_colors, &menu_ctx, BASE_PROMPT, nmc->editor_prompt_color); + menu_switch_to_level0 (&nmc->nmc_config, &menu_ctx, BASE_PROMPT); nmc_tab_completion.setting = NULL; /* for TAB completion */ } } else { @@ -7152,7 +7380,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* coverity[copy_paste_error] - suppress Coverity COPY_PASTE_ERROR defect */ if (ss == menu_ctx.curr_setting) { /* If we removed the setting we are in, go up */ - menu_switch_to_level0 (nmc->nmc_config.use_colors, &menu_ctx, BASE_PROMPT, nmc->editor_prompt_color); + menu_switch_to_level0 (&nmc->nmc_config, &menu_ctx, BASE_PROMPT); nmc_tab_completion.setting = NULL; /* for TAB completion */ } } else @@ -7190,7 +7418,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* cmd_arg_s != NULL means argument is "setting.property" */ descr_all = !cmd_arg_s && !menu_ctx.curr_setting; - user_s = descr_all ? cmd_arg_p : cmd_arg_s ? cmd_arg_s : NULL; + user_s = descr_all ? cmd_arg_p : cmd_arg_s; if (user_s) { ss = is_setting_valid (connection, valid_settings_main, @@ -7247,7 +7475,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t case NMC_EDITOR_MAIN_CMD_PRINT: /* Print current connection settings/properties */ if (cmd_arg) { - if (strcmp (cmd_arg, "all") == 0) + if (nm_streq (cmd_arg, "all")) editor_show_connection (connection, nmc); else { NMSetting *ss = NULL; @@ -7256,7 +7484,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t /* cmd_arg_s != NULL means argument is "setting.property" */ whole_setting = !cmd_arg_s && !menu_ctx.curr_setting; - user_s = whole_setting ? cmd_arg_p : cmd_arg_s ? cmd_arg_s : NULL; + user_s = whole_setting ? cmd_arg_p : cmd_arg_s; if (user_s) { const char *s_name; @@ -7508,7 +7736,7 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t case NMC_EDITOR_MAIN_CMD_BACK: /* Go back (up) an the menu */ if (menu_ctx.level == 1) { - menu_switch_to_level0 (nmc->nmc_config.use_colors, &menu_ctx, BASE_PROMPT, nmc->editor_prompt_color); + menu_switch_to_level0 (&nmc->nmc_config, &menu_ctx, BASE_PROMPT); nmc_tab_completion.setting = NULL; /* for TAB completion */ } break; @@ -7544,37 +7772,18 @@ editor_menu_main (NmCli *nmc, NMConnection *connection, const char *connection_t } else nmc->nmc_config_mutable.show_secrets = bb; } else if (cmd_arg_p && matches (cmd_arg_p, "prompt-color")) { - GError *tmp_err = NULL; - NMMetaTermColor color; - color = nmc_term_color_parse_string (cmd_arg_v ? g_strstrip (cmd_arg_v) : " ", &tmp_err); - if (tmp_err) { - g_print (_("Error: bad color: %s\n"), tmp_err->message); - g_clear_error (&tmp_err); - } else { - nmc->editor_prompt_color = color; - nm_clear_g_free (&menu_ctx.main_prompt); - if (menu_ctx.level == 0) { - menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL, - BASE_PROMPT); - } else { - menu_ctx.main_prompt = nmc_colorize (nmc->nmc_config.use_colors, nmc->editor_prompt_color, NM_META_TERM_FORMAT_NORMAL, - "nmcli %s> ", - nm_setting_get_name (menu_ctx.curr_setting)); - } - } + g_debug ("Ignoring erroneous --prompt-color argument. Use terminal-colors.d(5) to set the prompt color.\n"); } else if (!cmd_arg_p) { g_print (_("Current nmcli configuration:\n")); g_print ("status-line: %s\n" "save-confirmation: %s\n" - "show-secrets: %s\n" - "prompt-color: %d\n", + "show-secrets: %s\n", nmc->editor_status_line ? "yes" : "no", nmc->editor_save_confirmation ? "yes" : "no", - nmc->nmc_config.show_secrets ? "yes" : "no", - nmc->editor_prompt_color); + nmc->nmc_config.show_secrets ? "yes" : "no"); } else g_print (_("Invalid configuration option '%s'; allowed [%s]\n"), - cmd_arg_v ? cmd_arg_v : "", "status-line, save-confirmation, show-secrets, prompt-color"); + cmd_arg_v ?: "", "status-line, save-confirmation, show-secrets"); break; @@ -7645,7 +7854,7 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection, const char *sl g_object_set (s_con, NM_SETTING_CONNECTION_TYPE, NM_SETTING_WIRED_SETTING_NAME, - NM_SETTING_CONNECTION_MASTER, dev_ifname ? dev_ifname : "eth0", + NM_SETTING_CONNECTION_MASTER, dev_ifname ?: "eth0", NM_SETTING_CONNECTION_SLAVE_TYPE, slave_type, NULL); } else { @@ -7666,11 +7875,10 @@ editor_init_new_connection (NmCli *nmc, NMConnection *connection, const char *sl const char *dev_ifname = get_ethernet_device_name (nmc); g_object_set (NM_SETTING_VLAN (base_setting), - NM_SETTING_VLAN_PARENT, dev_ifname ? dev_ifname : "eth0", + NM_SETTING_VLAN_PARENT, dev_ifname ?: "eth0", NULL); } - setting = nm_meta_setting_info_editor_new_setting (&nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_IP4_CONFIG], NM_META_ACCESSOR_SETTING_INIT_TYPE_CLI); nm_connection_add_setting (connection, setting); @@ -7731,32 +7939,30 @@ static NMCResultCode do_connection_edit (NmCli *nmc, int argc, char **argv) { const GPtrArray *connections; - NMConnection *connection = NULL; + gs_unref_object NMConnection *connection = NULL; NMSettingConnection *s_con; const char *connection_type; - char *uuid; - char *default_name = NULL; const char *type = NULL; - char *type_ask = NULL; const char *con_name = NULL; const char *con = NULL; const char *con_id = NULL; const char *con_uuid = NULL; const char *con_path = NULL; + const char *con_filename = NULL; const char *selector = NULL; - char *tmp_str; - GError *error = NULL; + gs_free_error GError *error = NULL; GError *err1 = NULL; - nmc_arg_t exp_args[] = { {"type", TRUE, &type, FALSE}, - {"con-name", TRUE, &con_name, FALSE}, - {"id", TRUE, &con_id, FALSE}, - {"uuid", TRUE, &con_uuid, FALSE}, - {"path", TRUE, &con_path, FALSE}, - {NULL} }; + nmc_arg_t exp_args[] = { { "type", TRUE, &type, FALSE }, + { "con-name", TRUE, &con_name, FALSE }, + { "id", TRUE, &con_id, FALSE }, + { "uuid", TRUE, &con_uuid, FALSE }, + { "path", TRUE, &con_path, FALSE }, + { "filename", TRUE, &con_filename, FALSE }, + { NULL } }; next_arg (nmc, &argc, &argv, NULL); if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path", NULL); + nmc_complete_strings (*argv, "type", "con-name", "id", "uuid", "path", "filename", NULL); nmc->return_value = NMC_RESULT_SUCCESS; @@ -7765,9 +7971,7 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) else { if (!nmc_parse_args (exp_args, TRUE, &argc, &argv, &error)) { g_string_assign (nmc->return_text, error->message); - nmc->return_value = error->code; - g_clear_error (&error); - goto error; + NMC_RETURN (nmc, error->code); } } @@ -7780,22 +7984,24 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) connections = nm_client_get_connections (nmc->client); if (!con) { - if (con_id && !con_uuid && !con_path) { + if (con_id && !con_uuid && !con_path && !con_filename) { con = con_id; selector = "id"; - } else if (con_uuid && !con_id && !con_path) { + } else if (con_uuid && !con_id && !con_path && !con_filename) { con = con_uuid; selector = "uuid"; - } else if (con_path && !con_id && !con_uuid) { + } else if (con_path && !con_id && !con_uuid && !con_filename) { con = con_path; selector = "path"; - } else if (!con_path && !con_id && !con_uuid) { + } else if (con_filename && !con_path && !con_id && !con_uuid) { + con = con_filename; + selector = "filename"; + } else if (!con_path && !con_id && !con_uuid && !con_filename) { /* no-op */ } else { g_string_printf (nmc->return_text, - _("Error: only one of 'id', uuid, or 'path' can be provided.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto error; + _("Error: only one of 'id', 'filename', uuid, or 'path' can be provided.")); + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } } @@ -7805,12 +8011,11 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) found_con = nmc_find_connection (connections, selector, con, NULL, nmc->complete); if (nmc->complete) - goto error; + return nmc->return_value; if (!found_con) { g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto error; + NMC_RETURN (nmc, NMC_RESULT_ERROR_NOT_FOUND); } /* Duplicate the connection and use that so that we need not @@ -7822,7 +8027,6 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) update_secrets_in_connection (NM_REMOTE_CONNECTION (found_con), connection); s_con = nm_connection_get_setting_connection (connection); - g_assert (s_con); connection_type = nm_setting_connection_get_connection_type (s_con); if (type) @@ -7838,18 +8042,23 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) editor_init_existing_connection (connection); } else { const char *slave_type = NULL; + gs_free char *uuid = NULL; + gs_free char *default_name = NULL; + gs_free char *tmp_str = NULL; /* New connection */ if (nmc->complete) { if (type && argc == 0) nmc_complete_connection_type (type); - goto error; + return nmc->return_value; } connection_type = check_valid_name_toplevel (type, &slave_type, &err1); tmp_str = get_valid_options_string_toplevel (); while (!connection_type) { + gs_free char *type_ask = NULL; + if (!type) g_print (_("Valid connection types: %s\n"), tmp_str); else @@ -7859,14 +8068,11 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) type_ask = nmc_readline (EDITOR_PROMPT_CON_TYPE); type = type_ask = type_ask ? g_strstrip (type_ask) : NULL; connection_type = check_valid_name_toplevel (type_ask, &slave_type, &err1); - g_free (type_ask); } - g_free (tmp_str); + nm_clear_g_free (&tmp_str); - /* Create a new connection object */ connection = nm_simple_connection_new (); - /* Build up the 'connection' setting */ s_con = (NMSettingConnection *) nm_setting_connection_new (); uuid = nm_utils_uuid_generate (); if (con_name) @@ -7881,8 +8087,6 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) NM_SETTING_CONNECTION_UUID, uuid, NM_SETTING_CONNECTION_TYPE, connection_type, NULL); - g_free (uuid); - g_free (default_name); nm_connection_add_setting (connection, NM_SETTING (s_con)); /* Initialize the new connection so that it is valid from the start */ @@ -7905,7 +8109,6 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) g_print (_("Type 'describe [.]' for detailed property description.")); g_print ("\n\n"); - /* Set global variables for use in TAB completion */ nmc_tab_completion.nmc = nmc; nmc_tab_completion.con_type = g_strdup (connection_type); nmc_tab_completion.connection = connection; @@ -7913,15 +8116,9 @@ do_connection_edit (NmCli *nmc, int argc, char **argv) /* Run menu loop */ editor_menu_main (nmc, connection, connection_type); - if (connection) - g_object_unref (connection); - g_free (nmc_tab_completion.con_type); - - return nmc->return_value; - -error: - g_assert (!connection); - g_free (type_ask); + nmc_tab_completion.nmc = NULL; + nm_clear_g_free (&nmc_tab_completion.con_type); + nmc_tab_completion.connection = NULL; return nmc->return_value; } @@ -7931,8 +8128,8 @@ modify_connection_cb (GObject *connection, GAsyncResult *result, gpointer user_data) { - NmCli *nmc = (NmCli *) user_data; - GError *error = NULL; + NmCli *nmc = user_data; + gs_free_error GError *error = NULL; if (!nm_remote_connection_commit_changes_finish (NM_REMOTE_CONNECTION (connection), result, &error)) { @@ -7940,13 +8137,13 @@ modify_connection_cb (GObject *connection, _("Error: Failed to modify connection '%s': %s"), nm_connection_get_id (NM_CONNECTION (connection)), error->message); - g_error_free (error); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; } else { - if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) + if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) { g_print (_("Connection '%s' (%s) successfully modified.\n"), nm_connection_get_id (NM_CONNECTION (connection)), nm_connection_get_uuid (NM_CONNECTION (connection))); + } } quit (); } @@ -7958,20 +8155,18 @@ do_connection_modify (NmCli *nmc, { NMConnection *connection = NULL; NMRemoteConnection *rc = NULL; - GError *error = NULL; + gs_free_error GError *error = NULL; gboolean temporary = FALSE; - /* Check --temporary */ if (next_arg (nmc, &argc, &argv, "--temporary", NULL) > 0) { temporary = TRUE; next_arg (nmc, &argc, &argv, NULL); } - connection = get_connection (nmc, &argc, &argv, NULL, &error); + connection = get_connection (nmc, &argc, &argv, NULL, NULL, NULL, &error); if (!connection) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = error->code; - goto finish; + NMC_RETURN (nmc, error->code); } rc = nm_client_get_connection_by_uuid (nmc->client, @@ -7979,24 +8174,20 @@ do_connection_modify (NmCli *nmc, if (!rc) { g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), nm_connection_get_uuid (connection)); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_NOT_FOUND); } if (!nmc_read_connection_properties (nmc, NM_CONNECTION (rc), &argc, &argv, &error)) { g_string_assign (nmc->return_text, error->message); - nmc->return_value = error->code; - g_clear_error (&error); - goto finish; + NMC_RETURN (nmc, error->code); } if (nmc->complete) - goto finish; + return nmc->return_value; update_connection (!temporary, rc, modify_connection_cb, nmc); nmc->should_wait++; -finish: return nmc->return_value; } @@ -8044,11 +8235,11 @@ static NMCResultCode do_connection_clone (NmCli *nmc, int argc, char **argv) { NMConnection *connection = NULL; - NMConnection *new_connection = NULL; + gs_unref_object NMConnection *new_connection = NULL; NMSettingConnection *s_con; CloneConnectionInfo *info; const char *new_name; - char *new_name_ask = NULL; + gs_free char *new_name_ask = NULL; char *uuid; gboolean temporary = FALSE; char **arg_arr = NULL; @@ -8078,15 +8269,14 @@ do_connection_clone (NmCli *nmc, int argc, char **argv) argc_ptr = &arg_num; } - connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); + connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, NULL, NULL, &error); if (!connection) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); - nmc->return_value = error->code; - goto finish; + NMC_RETURN (nmc, error->code); } if (nmc->complete) - goto finish; + return nmc->return_value; if (argv[0]) new_name = *argv; @@ -8094,14 +8284,12 @@ do_connection_clone (NmCli *nmc, int argc, char **argv) new_name = new_name_ask = nmc_readline (_("New connection name: ")); else { g_string_printf (nmc->return_text, _("Error: argument is missing.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } if (next_arg (nmc->ask ? NULL : nmc, argc_ptr, argv_ptr, NULL) == 0) { g_string_printf (nmc->return_text, _("Error: unknown extra argument: '%s'."), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } /* Copy the connection */ @@ -8133,11 +8321,6 @@ do_connection_clone (NmCli *nmc, int argc, char **argv) info); nmc->should_wait++; -finish: - if (new_connection) - g_object_unref (new_connection); - g_free (new_name_ask); - return nmc->return_value; } @@ -8167,12 +8350,12 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) { NMConnection *connection; ConnectionCbInfo *info = NULL; - GSList *queue = NULL, *iter; - char **arg_arr = NULL, *old_arg; + gs_strfreev char **arg_arr = NULL; char **arg_ptr; + guint i; int arg_num; - GString *invalid_cons = NULL; - int pos = 0; + nm_auto_free_gstring GString *invalid_cons = NULL; + gs_unref_ptrarray GPtrArray *found_cons = NULL; GError *error = NULL; if (nmc->timeout == -1) @@ -8202,15 +8385,10 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) } while (arg_num > 0) { - old_arg = *arg_ptr; - connection = get_connection (nmc, &arg_num, &arg_ptr, &pos, &error); - if (connection) { - /* Check if the connection is unique. */ - /* Calling delete for the same connection repeatedly would result in - * NM responding for the last D-Bus call only and we would stall. */ - if (!g_slist_find (queue, connection)) - queue = g_slist_prepend (queue, g_object_ref (connection)); - } else { + const char *cur_selector, *cur_value; + + connection = get_connection (nmc, &arg_num, &arg_ptr, &cur_selector, &cur_value, &found_cons, &error); + if (!connection) { if (!nmc->complete) g_printerr (_("Error: %s.\n"), error->message); g_string_printf (nmc->return_text, _("Error: not all connections found.")); @@ -8222,23 +8400,31 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) if (!invalid_cons) invalid_cons = g_string_new (NULL); - g_string_append_printf (invalid_cons, "'%s', ", old_arg); + if (cur_selector) + g_string_append_printf (invalid_cons, "%s '%s', ", cur_selector, cur_value); + else + g_string_append_printf (invalid_cons, "'%s', ", cur_value); } } - if (!queue) { - g_string_printf (nmc->return_text, _("Error: No connection specified.")); - nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - goto finish; - } else if (nmc->complete) { - g_slist_free (queue); + if (!found_cons) { + if (!invalid_cons) { + g_string_printf (nmc->return_text, _("Error: No connection specified.")); + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + } goto finish; } - queue = g_slist_reverse (queue); + + if (nmc->complete) + goto finish; info = g_slice_new0 (ConnectionCbInfo); info->nmc = nmc; - info->queue = queue; + info->obj_list = g_ptr_array_sized_new (found_cons->len); + for (i = 0; i < found_cons->len; i++) { + connection = found_cons->pdata[i]; + g_ptr_array_add (info->obj_list, g_object_ref (connection)); + } info->timeout_id = g_timeout_add_seconds (nmc->timeout, connection_op_timeout_cb, info); info->cancellable = g_cancellable_new (); @@ -8248,10 +8434,10 @@ do_connection_delete (NmCli *nmc, int argc, char **argv) g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_REMOVED, G_CALLBACK (connection_removed_cb), info); - /* Now delete the connections */ - for (iter = queue; iter; iter = g_slist_next (iter)) - nm_remote_connection_delete_async (NM_REMOTE_CONNECTION (iter->data), + for (i = 0; i < found_cons->len; i++) { + nm_remote_connection_delete_async (NM_REMOTE_CONNECTION (found_cons->pdata[i]), info->cancellable, delete_cb, info); + } finish: if (invalid_cons) { @@ -8259,9 +8445,7 @@ finish: g_string_printf (nmc->return_text, _("Error: cannot delete unknown connection(s): %s."), invalid_cons->str); nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; - g_string_free (invalid_cons, TRUE); } - g_strfreev (arg_arr); return nmc->return_value; } @@ -8311,31 +8495,21 @@ static NMCResultCode do_connection_monitor (NmCli *nmc, int argc, char **argv) { GError *error = NULL; + guint i; + gs_unref_ptrarray GPtrArray *found_cons = NULL; + const GPtrArray *connections = NULL; next_arg (nmc, &argc, &argv, NULL); if (argc == 0) { /* No connections specified. Monitor all. */ - const GPtrArray *connections; - int i; /* nmc_do_cmd() should not call this with argc=0. */ g_assert (!nmc->complete); connections = nm_client_get_connections (nmc->client); - for (i = 0; i < connections->len; i++) - connection_watch (nmc, g_ptr_array_index (connections, i)); - - /* We'll watch the connection additions too, never exit. */ - nmc->should_wait++; - g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_ADDED, G_CALLBACK (connection_added), nmc); } else { - /* Look up the specified connections and watch them. */ - NMConnection *connection; - int pos = 0; - - do { - connection = get_connection (nmc, &argc, &argv, &pos, &error); - if (!connection) { + while (argc > 0) { + if (!get_connection (nmc, &argc, &argv, NULL, NULL, &found_cons, &error)) { if (!nmc->complete) g_printerr (_("Error: %s.\n"), error->message); g_string_printf (nmc->return_text, _("Error: not all connections found.")); @@ -8345,8 +8519,17 @@ do_connection_monitor (NmCli *nmc, int argc, char **argv) if (nmc->complete) continue; - connection_watch (nmc, connection); - } while (argc > 0); + connections = found_cons; + } + } + + for (i = 0; i < connections->len; i++) + connection_watch (nmc, connections->pdata[i]); + + if (argc == 0) { + /* We'll watch the connection additions too, never exit. */ + nmc->should_wait++; + g_signal_connect (nmc->client, NM_CLIENT_CONNECTION_ADDED, G_CALLBACK (connection_added), nmc); } if (nmc->complete) @@ -8419,11 +8602,12 @@ do_connection_load (NmCli *nmc, int argc, char **argv) static NMCResultCode do_connection_import (NmCli *nmc, int argc, char **argv) { - GError *error = NULL; + gs_free_error GError *error = NULL; const char *type = NULL, *filename = NULL; - char *type_ask = NULL, *filename_ask = NULL; + gs_free char *type_ask = NULL; + gs_free char *filename_ask = NULL; AddConnectionInfo *info; - NMConnection *connection = NULL; + gs_unref_object NMConnection *connection = NULL; NMVpnEditorPlugin *plugin; gs_free char *service_type = NULL; gboolean temporary = FALSE; @@ -8434,7 +8618,6 @@ do_connection_import (NmCli *nmc, int argc, char **argv) next_arg (nmc, &argc, &argv, NULL); } - if (argc == 0) { /* nmc_do_cmd() should not call this with argc=0. */ g_assert (!nmc->complete); @@ -8446,8 +8629,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv) filename = filename_ask = filename_ask ? g_strstrip (filename_ask) : NULL; } else { g_string_printf (nmc->return_text, _("Error: No arguments provided.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } } @@ -8460,8 +8642,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv) argv++; if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } if (argc == 1 && nmc->complete) @@ -8477,8 +8658,7 @@ do_connection_import (NmCli *nmc, int argc, char **argv) argv++; if (!argc) { g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } if (argc == 1 && nmc->complete) nmc->return_value = NMC_RESULT_COMPLETE_FILE; @@ -8488,32 +8668,28 @@ do_connection_import (NmCli *nmc, int argc, char **argv) g_printerr (_("Warning: 'file' already specified, ignoring extra one.\n")); } else { g_string_printf (nmc->return_text, _("Unknown parameter: %s"), *argv); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } next_arg (nmc, &argc, &argv, NULL); } if (nmc->complete) - goto finish; + return nmc->return_value; if (!type) { g_string_printf (nmc->return_text, _("Error: 'type' argument is required.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } if (!filename) { g_string_printf (nmc->return_text, _("Error: 'file' argument is required.")); - nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_USER_INPUT); } service_type = nm_vpn_plugin_info_list_find_service_type (nm_vpn_get_plugin_infos (), type); if (!service_type) { g_string_printf (nmc->return_text, _("Error: failed to find VPN plugin for %s."), type); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN); } /* Import VPN configuration */ @@ -8521,16 +8697,14 @@ do_connection_import (NmCli *nmc, int argc, char **argv) if (!plugin) { g_string_printf (nmc->return_text, _("Error: failed to load VPN plugin: %s."), error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN); } connection = nm_vpn_editor_plugin_import (plugin, filename, &error); if (!connection) { g_string_printf (nmc->return_text, _("Error: failed to import '%s': %s."), filename, error->message); - nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; - goto finish; + NMC_RETURN (nmc, NMC_RESULT_ERROR_UNKNOWN); } info = g_malloc0 (sizeof (AddConnectionInfo)); @@ -8545,12 +8719,6 @@ do_connection_import (NmCli *nmc, int argc, char **argv) info); nmc->should_wait++; -finish: - if (connection) - g_object_unref (connection); - g_clear_error (&error); - g_free (type_ask); - g_free (filename_ask); return nmc->return_value; } @@ -8559,12 +8727,11 @@ do_connection_export (NmCli *nmc, int argc, char **argv) { NMConnection *connection = NULL; const char *out_name = NULL; - char *name_ask = NULL; - char *out_name_ask = NULL; + gs_free char *out_name_ask = NULL; const char *path = NULL; const char *type = NULL; NMVpnEditorPlugin *plugin; - GError *error = NULL; + gs_free_error GError *error = NULL; char tmpfile[] = "/tmp/nmcli-export-temp-XXXXXX"; char **arg_arr = NULL; int arg_num; @@ -8588,7 +8755,7 @@ do_connection_export (NmCli *nmc, int argc, char **argv) argc_ptr = &arg_num; } - connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, &error); + connection = get_connection (nmc, argc_ptr, argv_ptr, NULL, NULL, NULL, &error); if (!connection) { g_string_printf (nmc->return_text, _("Error: %s."), error->message); nmc->return_value = error->code; @@ -8629,14 +8796,14 @@ do_connection_export (NmCli *nmc, int argc, char **argv) if (out_name) path = out_name; else { - int fd; + nm_auto_close int fd = -1; + fd = g_mkstemp (tmpfile); if (fd == -1) { g_string_printf (nmc->return_text, _("Error: failed to create temporary file %s."), tmpfile); nmc->return_value = NMC_RESULT_ERROR_UNKNOWN; goto finish; } - nm_close (fd); path = tmpfile; } @@ -8649,8 +8816,9 @@ do_connection_export (NmCli *nmc, int argc, char **argv) /* No output file -> copy data to stdout */ if (!out_name) { - char *contents = NULL; + gs_free char *contents = NULL; gsize len = 0; + if (!g_file_get_contents (path, &contents, &len, &error)) { g_string_printf (nmc->return_text, _("Error: failed to read temporary file '%s': %s."), path, error->message); @@ -8658,15 +8826,11 @@ do_connection_export (NmCli *nmc, int argc, char **argv) goto finish; } g_print ("%s", contents); - g_free (contents); } finish: if (!out_name && path) unlink (path); - g_clear_error (&error); - g_free (name_ask); - g_free (out_name_ask); return nmc->return_value; } diff --git a/clients/cli/connections.h b/clients/cli/connections.h index 01e78b02..43cd97f6 100644 --- a/clients/cli/connections.h +++ b/clients/cli/connections.h @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 - 2014 Red Hat, Inc. + * (C) Copyright 2010 - 2018 Red Hat, Inc. */ #ifndef NMC_CONNECTIONS_H @@ -33,10 +33,10 @@ nmc_read_connection_properties (NmCli *nmc, char ***argv, GError **error); -void nmc_active_connection_state_to_color (NMActiveConnectionState state, NMMetaTermColor *color); +NMMetaColor nmc_active_connection_state_to_color (NMActiveConnectionState state); -extern const NmcMetaGenericInfo *const nmc_fields_con_show[]; -extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_general[]; +extern const NmcMetaGenericInfo *const metagen_con_show[]; +extern const NmcMetaGenericInfo *const metagen_con_active_general[]; extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_vpn[]; extern const NmcMetaGenericInfo *const nmc_fields_con_active_details_groups[]; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index da969fbe..aa28678f 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2014 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -51,7 +51,6 @@ const NmcMetaGenericInfo *const nmc_fields_dev_status[] = { }; #define NMC_FIELDS_DEV_STATUS_COMMON "DEVICE,TYPE,STATE,CONNECTION" - const NmcMetaGenericInfo *const nmc_fields_dev_show_general[] = { NMC_META_GENERIC ("NAME"), /* 0 */ NMC_META_GENERIC ("DEVICE"), /* 1 */ @@ -210,9 +209,9 @@ const NmcMetaGenericInfo *const nmc_fields_dev_show_sections[] = { NMC_META_GENERIC_WITH_NESTED ("WIMAX-PROPERTIES", nmc_fields_dev_show_wimax_prop + 1), /* 5 */ NMC_META_GENERIC_WITH_NESTED ("NSP", nmc_fields_dev_wimax_list + 1), /* 6 */ NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config), /* 7 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp4_config + 1), /* 8 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP4", nmc_fields_dhcp_config + 1), /* 8 */ NMC_META_GENERIC_WITH_NESTED ("IP6", nmc_fields_ip6_config + 1), /* 9 */ - NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp6_config + 1), /* 10 */ + NMC_META_GENERIC_WITH_NESTED ("DHCP6", nmc_fields_dhcp_config + 1), /* 10 */ NMC_META_GENERIC_WITH_NESTED ("BOND", nmc_fields_dev_show_master_prop + 1), /* 11 */ NMC_META_GENERIC_WITH_NESTED ("TEAM", nmc_fields_dev_show_team_prop + 1), /* 12 */ NMC_META_GENERIC_WITH_NESTED ("BRIDGE", nmc_fields_dev_show_master_prop + 1), /* 13 */ @@ -451,11 +450,8 @@ usage_device_lldp (void) static void quit (void) { - if (progress_id) { - g_source_remove (progress_id); + if (nm_clear_g_source (&progress_id)) nmc_terminal_erase_line (); - } - g_main_loop_quit (loop); } @@ -711,22 +707,19 @@ sort_access_points (const GPtrArray *aps) return sorted; } -static void -wifi_signal_to_color (guint8 strength, NMMetaTermColor *color, NMMetaTermFormat *color_fmt) +static NMMetaColor +wifi_signal_to_color (guint8 strength) { - *color = NM_META_TERM_COLOR_NORMAL; - *color_fmt = NM_META_TERM_FORMAT_NORMAL; - if (strength > 80) - *color = NM_META_TERM_COLOR_GREEN; + return NM_META_COLOR_WIFI_SIGNAL_EXCELLENT; else if (strength > 55) - *color = NM_META_TERM_COLOR_YELLOW; + return NM_META_COLOR_WIFI_SIGNAL_GOOD; else if (strength > 30) - *color = NM_META_TERM_COLOR_MAGENTA; + return NM_META_COLOR_WIFI_SIGNAL_FAIR; else if (strength > 5) - *color = NM_META_TERM_COLOR_CYAN; + return NM_META_COLOR_WIFI_SIGNAL_POOR; else - *color_fmt = NM_META_TERM_FORMAT_DIM; + return NM_META_COLOR_WIFI_SIGNAL_UNKNOWN; } static char * @@ -799,8 +792,7 @@ fill_output_access_point (gpointer data, gpointer user_data) GString *security_str; char *ap_name; const char *sig_bars; - NMMetaTermColor color; - NMMetaTermFormat color_fmt; + NMMetaColor color; if (info->active_bssid) { const char *current_bssid = nm_access_point_get_bssid (ap); @@ -834,7 +826,7 @@ fill_output_access_point (gpointer data, gpointer user_data) strength_str = g_strdup_printf ("%u", strength); wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags); rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags); - sig_bars = nm_utils_wifi_strength_bars (strength); + sig_bars = nmc_wifi_strength_bars (strength); security_str = g_string_new (NULL); @@ -886,11 +878,10 @@ fill_output_access_point (gpointer data, gpointer user_data) set_val_strc (arr, 16, nm_object_get_path (NM_OBJECT (ap))); /* Set colors */ - wifi_signal_to_color (strength, &color, &color_fmt); + color = wifi_signal_to_color (strength); set_val_color_all (arr, color); - set_val_color_fmt_all (arr, color_fmt); if (active) - arr[15].color = NM_META_TERM_COLOR_GREEN; + arr[15].color = NM_META_COLOR_CONNECTION_ACTIVATED; g_ptr_array_add (info->output_data, arr); @@ -1164,7 +1155,7 @@ show_device_info (NMDevice *device, NmCli *nmc) set_val_strc (arr, 6, nm_device_get_driver (device) ? nm_device_get_driver (device) : _("(unknown)")); set_val_strc (arr, 7, nm_device_get_driver_version (device)); set_val_strc (arr, 8, nm_device_get_firmware_version (device)); - set_val_strc (arr, 9, hwaddr ? hwaddr : _("(unknown)")); + set_val_strc (arr, 9, hwaddr ?: _("(unknown)")); set_val_str (arr, 10, mtu_str); set_val_str (arr, 11, state_str); set_val_str (arr, 12, reason_str); @@ -1272,7 +1263,7 @@ show_device_info (NMDevice *device, NmCli *nmc) } tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dev_wifi_list; - out_indices = parse_output_fields (section_fld ? section_fld : NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST, + out_indices = parse_output_fields (section_fld ?: NMC_FIELDS_DEV_WIFI_LIST_FOR_DEV_LIST, tmpl, FALSE, NULL, NULL); arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES); g_ptr_array_add (out.output_data, arr); @@ -1332,7 +1323,7 @@ show_device_info (NMDevice *device, NmCli *nmc) /* DHCP4 */ if (dhcp4 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[8]->name)) - was_output = print_dhcp4_config (dhcp4, &nmc->nmc_config, nmc_fields_dev_show_sections[8]->name, section_fld); + was_output = print_dhcp_config (dhcp4, &nmc->nmc_config, nmc_fields_dev_show_sections[8]->name, section_fld); /* IP6 */ if (cfg6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[9]->name)) @@ -1340,7 +1331,7 @@ show_device_info (NMDevice *device, NmCli *nmc) /* DHCP6 */ if (dhcp6 && !strcasecmp (nmc_fields_dev_show_sections[section_idx]->name, nmc_fields_dev_show_sections[10]->name)) - was_output = print_dhcp6_config (dhcp6, &nmc->nmc_config, nmc_fields_dev_show_sections[10]->name, section_fld); + was_output = print_dhcp_config (dhcp6, &nmc->nmc_config, nmc_fields_dev_show_sections[10]->name, section_fld); /* Bond specific information */ if (NM_IS_DEVICE_BOND (device)) { @@ -1467,20 +1458,19 @@ show_device_info (NMDevice *device, NmCli *nmc) return TRUE; } -void -nmc_device_state_to_color (NMDeviceState state, NMMetaTermColor *color, NMMetaTermFormat *color_fmt) +NMMetaColor +nmc_device_state_to_color (NMDeviceState state) { - *color = NM_META_TERM_COLOR_NORMAL; - *color_fmt = NM_META_TERM_FORMAT_NORMAL; - if (state <= NM_DEVICE_STATE_UNAVAILABLE) - *color_fmt= NM_META_TERM_FORMAT_DIM; + return NM_META_COLOR_DEVICE_UNAVAILABLE; else if (state == NM_DEVICE_STATE_DISCONNECTED) - *color = NM_META_TERM_COLOR_RED; + return NM_META_COLOR_DEVICE_DISCONNECTED; else if (state >= NM_DEVICE_STATE_PREPARE && state <= NM_DEVICE_STATE_SECONDARIES) - *color = NM_META_TERM_COLOR_YELLOW; + return NM_META_COLOR_DEVICE_ACTIVATING; else if (state == NM_DEVICE_STATE_ACTIVATED) - *color = NM_META_TERM_COLOR_GREEN; + return NM_META_COLOR_DEVICE_ACTIVATED; + + g_return_val_if_reached (NM_META_COLOR_DEVICE_UNKNOWN); } static void @@ -1488,8 +1478,7 @@ fill_output_device_status (NMDevice *device, GPtrArray *output_data) { NMActiveConnection *ac; NMDeviceState state; - NMMetaTermColor color; - NMMetaTermFormat color_fmt; + NMMetaColor color; NmcOutputField *arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_status, 0); @@ -1497,9 +1486,8 @@ fill_output_device_status (NMDevice *device, GPtrArray *output_data) ac = nm_device_get_active_connection (device); /* Show devices in color */ - nmc_device_state_to_color (state, &color, &color_fmt); + color = nmc_device_state_to_color (state); set_val_color_all (arr, color); - set_val_color_fmt_all (arr, color_fmt); set_val_strc (arr, 0, nm_device_get_iface (device)); set_val_strc (arr, 1, nm_device_get_type_description (device)); @@ -1737,7 +1725,7 @@ add_and_activate_cb (GObject *client, if (state == NM_ACTIVE_CONNECTION_STATE_ACTIVATED) { if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); - if (info->hotspot) + if (!info->hotspot) g_print (_("Connection with UUID '%s' created and activated on device '%s'\n"), nm_active_connection_get_uuid (active), nm_device_get_iface (device)); else @@ -2410,12 +2398,11 @@ static void device_state (NMDevice *device, GParamSpec *pspec, NmCli *nmc) { NMDeviceState state = nm_device_get_state (device); - NMMetaTermColor color; - NMMetaTermFormat color_fmt; + NMMetaColor color; char *str; - nmc_device_state_to_color (state, &color, &color_fmt); - str = nmc_colorize (nmc->nmc_config.use_colors, color, color_fmt, "%s: %s\n", + color = nmc_device_state_to_color (state); + str = nmc_colorize (&nmc->nmc_config, color, "%s: %s\n", nm_device_get_iface (device), nmc_device_state_to_string (state)); @@ -2501,41 +2488,6 @@ do_devices_monitor (NmCli *nmc, int argc, char **argv) return nmc->return_value; } -static void -show_access_point_info (NMDevice *device, NmCli *nmc, NmcOutputData *out) -{ - NMAccessPoint *active_ap = NULL; - const char *active_bssid = NULL; - GPtrArray *aps; - NmcOutputField *arr; - - if (nm_device_get_state (device) == NM_DEVICE_STATE_ACTIVATED) { - active_ap = nm_device_wifi_get_active_access_point (NM_DEVICE_WIFI (device)); - active_bssid = active_ap ? nm_access_point_get_bssid (active_ap) : NULL; - } - - arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_wifi_list, - NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out->output_data, arr); - - { - APInfo info = { - .nmc = nmc, - .index = 1, - .output_flags = 0, - .active_bssid = active_bssid, - .device = nm_device_get_iface (device), - .output_data = out->output_data, - }; - - aps = sort_access_points (nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device))); - g_ptr_array_foreach (aps, fill_output_access_point, &info); - g_ptr_array_free (aps, FALSE); - } - - print_data_prepare_width (out->output_data); -} - /* * Find a Wi-Fi device with 'iface' in 'devices' array. If 'iface' is NULL, * the first Wi-Fi device is returned. 'idx' parameter is updated to the point @@ -2628,6 +2580,228 @@ find_ap_on_device (NMDevice *device, const char *bssid, const char *ssid, gboole return ap; } +static void +show_access_point_info (NMDeviceWifi *wifi, NmCli *nmc, NmcOutputData *out) +{ + NMAccessPoint *active_ap = NULL; + const char *active_bssid = NULL; + GPtrArray *aps; + NmcOutputField *arr; + + if (nm_device_get_state (NM_DEVICE (wifi)) == NM_DEVICE_STATE_ACTIVATED) { + active_ap = nm_device_wifi_get_active_access_point (wifi); + active_bssid = active_ap ? nm_access_point_get_bssid (active_ap) : NULL; + } + + arr = nmc_dup_fields_array ((const NMMetaAbstractInfo *const*) nmc_fields_dev_wifi_list, + NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (out->output_data, arr); + + { + APInfo info = { + .nmc = nmc, + .index = 1, + .output_flags = 0, + .active_bssid = active_bssid, + .device = nm_device_get_iface (NM_DEVICE (wifi)), + .output_data = out->output_data, + }; + + aps = sort_access_points (nm_device_wifi_get_access_points (wifi)); + g_ptr_array_foreach (aps, fill_output_access_point, &info); + g_ptr_array_free (aps, FALSE); + } + + print_data_prepare_width (out->output_data); +} + +static void +wifi_print_aps (NMDeviceWifi *wifi, + NmCli *nmc, + GArray *_out_indices, + const NMMetaAbstractInfo *const*tmpl, + const char *bssid_user) +{ + NMAccessPoint *ap = NULL; + const GPtrArray *aps; + APInfo *info; + guint i; + NmcOutputField *arr; + const char *base_hdr = _("Wi-Fi scan list"); + NMC_OUTPUT_DATA_DEFINE_SCOPED (out); + gs_free char *header_name = NULL; + static gboolean empty_line = FALSE; + + if (empty_line) + g_print ("\n"); /* Empty line between devices' APs */ + + /* Main header name */ + header_name = construct_header_name (base_hdr, nm_device_get_iface (NM_DEVICE (wifi))); + + out_indices = g_array_ref (_out_indices); + + if (bssid_user) { + /* Specific AP requested - list only that */ + aps = nm_device_wifi_get_access_points (wifi); + for (i = 0; i < aps->len; i++) { + char *bssid_up; + NMAccessPoint *candidate_ap = g_ptr_array_index (aps, i); + const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); + + bssid_up = g_ascii_strup (bssid_user, -1); + if (!strcmp (bssid_up, candidate_bssid)) + ap = candidate_ap; + g_free (bssid_up); + } + if (ap) { + /* Add headers (field names) */ + arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); + g_ptr_array_add (out.output_data, arr); + + info = g_malloc0 (sizeof (APInfo)); + info->nmc = nmc; + info->index = 1; + info->output_flags = 0; + info->active_bssid = NULL; + info->device = nm_device_get_iface (NM_DEVICE (wifi)); + info->output_data = out.output_data; + + fill_output_access_point (ap, info); + + print_data_prepare_width (out.output_data); + print_data (&nmc->nmc_config, out_indices, header_name, 0, &out); + g_free (info); + + nmc->return_value = NMC_RESULT_SUCCESS; + empty_line = TRUE; + } + } else { + show_access_point_info (wifi, nmc, &out); + print_data (&nmc->nmc_config, out_indices, header_name, 0, &out); + empty_line = TRUE; + } +} + +typedef struct { + NmCli *nmc; + NMDeviceWifi *wifi; + const NMMetaAbstractInfo *const*tmpl; + + const char *bssid_user; + gulong last_scan_id; + guint timeout_id; + GCancellable *scan_cancellable; + GArray *out_indices; +} WifiListData; + +static void +wifi_list_finish (WifiListData *data) +{ + NmCli *nmc = data->nmc; + + wifi_print_aps (data->wifi, data->nmc, data->out_indices, + data->tmpl, data->bssid_user); + + if (--nmc->should_wait == 0) { + if (nmc->return_value == NMC_RESULT_ERROR_NOT_FOUND) { + g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), + data->bssid_user); + } + g_main_loop_quit (loop); + } + + g_signal_handler_disconnect (data->wifi, data->last_scan_id); + nm_clear_g_source (&data->timeout_id); + nm_clear_g_cancellable (&data->scan_cancellable); + g_array_unref (data->out_indices); + g_object_unref (data->wifi); + g_slice_free (WifiListData, data); +} + +static void +wifi_last_scan_updated (GObject *gobject, GParamSpec *pspec, gpointer user_data) +{ + WifiListData *data = user_data; + + wifi_list_finish (data); +} + +static void +wifi_list_rescan_cb (GObject *source_object, GAsyncResult *res, gpointer user_data) +{ + NMDeviceWifi *wifi = NM_DEVICE_WIFI (source_object); + WifiListData *data = user_data; + gs_free_error GError *error = NULL; + + if (!nm_device_wifi_request_scan_finish (wifi, res, &error)) { + if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) + return; + + if (g_error_matches (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_NOT_ALLOWED)) { + /* This likely means that scanning is already in progress. There's + * a good chance we'll get updated results soon; wait for them. */ + return; + } + + /* Scanning could not be initiated for unknown reason, + * no point in waiting for results. */ + wifi_list_finish (data); + } +} + +static gboolean +wifi_list_scan_timeout (gpointer user_data) +{ + WifiListData *data = user_data; + + wifi_list_finish (data); + + return G_SOURCE_REMOVE; +} + +static void +wifi_list_aps (NMDeviceWifi *wifi, + NmCli *nmc, + GArray *out_indices, + const NMMetaAbstractInfo *const*tmpl, + const char *bssid_user, + gint64 rescan_cutoff) +{ + gboolean needs_rescan; + WifiListData *data; + + needs_rescan = rescan_cutoff < 0 || (rescan_cutoff > 0 && nm_device_wifi_get_last_scan (wifi) < rescan_cutoff); + + /* FIXME: nmcli should either + * - don't request any new scan for any device and print the full AP list right + * away. + * - or, when requesting a scan on one or more devices, don't print the result + * before all requests complete. + * + * Otherwise: + * - the printed output is not self consistent. E.g. it will print the result + * on one device at a certain time, while printing the result for another + * device at a later point in time. + * - the order in which we print the AP list per-device, is unstable. */ + if (needs_rescan) { + data = g_slice_new0 (WifiListData); + data->nmc = nmc; + data->wifi = g_object_ref (wifi); + data->tmpl = tmpl; + data->out_indices = g_array_ref (out_indices);; + data->bssid_user = bssid_user; + data->last_scan_id = g_signal_connect (wifi, "notify::" NM_DEVICE_WIFI_LAST_SCAN, + G_CALLBACK (wifi_last_scan_updated), data); + data->scan_cancellable = g_cancellable_new (); + data->timeout_id = g_timeout_add_seconds (15, wifi_list_scan_timeout, data); + nm_device_wifi_request_scan_async (wifi, data->scan_cancellable, wifi_list_rescan_cb, data); + + nmc->should_wait++; + } else { + wifi_print_aps (wifi, nmc, out_indices, tmpl, bssid_user); + } +} + static void complete_aps (NMDevice **devices, const char *ifname, const char *bssid_prefix, const char *ssid_prefix) @@ -2653,28 +2827,22 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) { GError *error = NULL; NMDevice *device = NULL; - NMAccessPoint *ap = NULL; const char *ifname = NULL; const char *bssid_user = NULL; + const char *rescan = NULL; gs_free NMDevice **devices = NULL; - const GPtrArray *aps; - APInfo *info; - int i, j; + guint i; const char *fields_str = NULL; const NMMetaAbstractInfo *const*tmpl; - NmcOutputField *arr; - const char *base_hdr = _("Wi-Fi scan list"); - NMC_OUTPUT_DATA_DEFINE_SCOPED (out); - gs_free char *header_name = NULL; + gs_unref_array GArray *out_indices = NULL; + int option; + guint64 rescan_cutoff; devices = nmc_get_devices_sorted (nmc->client); - next_arg (nmc, &argc, &argv, NULL); - while (argc > 0) { - if (argc == 1 && nmc->complete) - nmc_complete_strings (*argv, "ifname", "bssid", NULL); - - if (strcmp (*argv, "ifname") == 0) { + while ((option = next_arg (nmc, &argc, &argv, "ifname", "hwaddr", "bssid", "--rescan", NULL)) > 0) { + switch (option) { + case 1: /* ifname */ argc--; argv++; if (!argc) { @@ -2684,8 +2852,9 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) ifname = *argv; if (argc == 1 && nmc->complete) complete_device (devices, ifname, TRUE); - } else if (strcmp (*argv, "bssid") == 0 || strcmp (*argv, "hwaddr") == 0) { - /* hwaddr is deprecated and will be removed later */ + break; + case 2: /* hwaddr is deprecated and will be removed later */ + case 3: /* bssid */ argc--; argv++; if (!argc) { @@ -2695,11 +2864,24 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) bssid_user = *argv; if (argc == 1 && nmc->complete) complete_aps (devices, NULL, bssid_user, NULL); - } else if (!nmc->complete) { - g_printerr (_("Unknown parameter: %s\n"), *argv); + /* We'll switch this to NMC_RESULT_SUCCESS if we find an access point. */ + nmc->return_value = NMC_RESULT_ERROR_NOT_FOUND; + break; + case 4: /* --rescan */ + argc--; + argv++; + if (!argc) { + g_string_printf (nmc->return_text, _("Error: %s argument is missing."), *(argv-1)); + return NMC_RESULT_ERROR_USER_INPUT; + } + rescan = *argv; + if (argc == 1 && nmc->complete) + nmc_complete_strings (rescan, "auto", "no", "yes", NULL); + break; + default: + g_assert_not_reached(); + break; } - - next_arg (nmc, &argc, &argv, NULL); } if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) @@ -2720,55 +2902,29 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) if (nmc->complete) return nmc->return_value; - if (ifname) { + if (argc) + g_printerr (_("Unknown parameter: %s\n"), *argv); + + if (rescan == NULL || strcmp (rescan, "auto") == 0) { + rescan_cutoff = NM_MAX (nm_utils_get_timestamp_msec () - 30 * NM_UTILS_MSEC_PER_SECOND, 0); + } else if (strcmp (rescan, "no") == 0) { + rescan_cutoff = 0; + } else if (strcmp (rescan, "yes") == 0) { + rescan_cutoff = -1; + } else { + g_string_printf (nmc->return_text, _("Error: invalid rescan argument: '%s' not among [auto, no, yes]"), rescan); + return NMC_RESULT_ERROR_USER_INPUT; + } + if (ifname) { device = find_wifi_device_by_iface (devices, ifname, NULL); if (!device) { g_string_printf (nmc->return_text, _("Error: Device '%s' not found."), ifname); return NMC_RESULT_ERROR_NOT_FOUND; } - /* Main header name */ - header_name = construct_header_name (base_hdr, ifname); if (NM_IS_DEVICE_WIFI (device)) { - if (bssid_user) { - /* Specific AP requested - list only that */ - aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (device)); - for (j = 0; j < aps->len; j++) { - char *bssid_up; - NMAccessPoint *candidate_ap = g_ptr_array_index (aps, j); - const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); - - bssid_up = g_ascii_strup (bssid_user, -1); - if (!strcmp (bssid_up, candidate_bssid)) - ap = candidate_ap; - g_free (bssid_up); - } - if (!ap) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), - bssid_user); - return NMC_RESULT_ERROR_NOT_FOUND; - } - /* Add headers (field names) */ - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out.output_data, arr); - - info = g_malloc0 (sizeof (APInfo)); - info->nmc = nmc; - info->index = 1; - info->output_flags = 0; - info->active_bssid = NULL; - info->device = nm_device_get_iface (device); - - fill_output_access_point (ap, info); - - print_data_prepare_width (out.output_data); - print_data (&nmc->nmc_config, out_indices, header_name, 0, &out); - g_free (info); - } else { - show_access_point_info (device, nmc, &out); - print_data (&nmc->nmc_config, out_indices, NULL, 0, &out); - } + wifi_list_aps (NM_DEVICE_WIFI (device), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); } else { if ( nm_device_get_device_type (device) == NM_DEVICE_TYPE_GENERIC && g_strcmp0 (nm_device_get_type_description (device), "wifi") == 0) { @@ -2783,76 +2939,11 @@ do_device_wifi_list (NmCli *nmc, int argc, char **argv) return NMC_RESULT_ERROR_UNKNOWN; } } else { - gboolean empty_line = FALSE; - - /* List APs for all devices */ - if (bssid_user) { - /* Specific AP requested - list only that */ - for (i = 0; devices[i]; i++) { - NMDevice *dev = devices[i]; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out2); - gs_free char *header_name2 = NULL; - - if (!NM_IS_DEVICE_WIFI (dev)) - continue; - - /* Main header name */ - header_name2 = construct_header_name (base_hdr, nm_device_get_iface (dev)); - out2_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, NULL); - - arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_MAIN_HEADER_ADD | NMC_OF_FLAG_FIELD_NAMES); - g_ptr_array_add (out2.output_data, arr); - - aps = nm_device_wifi_get_access_points (NM_DEVICE_WIFI (dev)); - for (j = 0; j < aps->len; j++) { - char *bssid_up; - NMAccessPoint *candidate_ap = g_ptr_array_index (aps, j); - const char *candidate_bssid = nm_access_point_get_bssid (candidate_ap); - - bssid_up = g_ascii_strup (bssid_user, -1); - if (!strcmp (bssid_up, candidate_bssid)) { - ap = candidate_ap; - - info = g_malloc0 (sizeof (APInfo)); - info->nmc = nmc; - info->index = 1; - info->output_flags = 0; - info->active_bssid = NULL; - info->device = nm_device_get_iface (dev); - fill_output_access_point (ap, info); - g_free (info); - } - g_free (bssid_up); - } - if (empty_line) - g_print ("\n"); /* Empty line between devices' APs */ - print_data_prepare_width (out2.output_data); - print_data (&nmc->nmc_config, out2_indices, header_name2, 0, &out2); - empty_line = TRUE; - } - if (!ap) { - g_string_printf (nmc->return_text, _("Error: Access point with bssid '%s' not found."), - bssid_user); - return NMC_RESULT_ERROR_NOT_FOUND; - } - } else { - for (i = 0; devices[i]; i++) { - NMDevice *dev = devices[i]; - NMC_OUTPUT_DATA_DEFINE_SCOPED (out2); - gs_free char *header_name2 = NULL; - - /* Main header name */ - header_name2 = construct_header_name (base_hdr, - nm_device_get_iface (dev)); - out2_indices = parse_output_fields (fields_str, tmpl, FALSE, NULL, NULL); - - if (NM_IS_DEVICE_WIFI (dev)) { - if (empty_line) - g_print ("\n"); /* Empty line between devices' APs */ - show_access_point_info (dev, nmc, &out2); - print_data (&nmc->nmc_config, out2_indices, header_name2, 0, &out2); - empty_line = TRUE; - } + for (i = 0; devices[i]; i++) { + NMDevice *dev = devices[i]; + + if (NM_IS_DEVICE_WIFI (dev)) { + wifi_list_aps (NM_DEVICE_WIFI (dev), nmc, out_indices, tmpl, bssid_user, rescan_cutoff); } } } @@ -2865,9 +2956,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) { NMDevice *device = NULL; NMAccessPoint *ap = NULL; - NM80211ApFlags ap_flags = NM_802_11_AP_FLAGS_NONE; - NM80211ApSecurityFlags ap_wpa_flags = NM_802_11_AP_SEC_NONE; - NM80211ApSecurityFlags ap_rsn_flags = NM_802_11_AP_SEC_NONE; + NM80211ApFlags ap_flags; + NM80211ApSecurityFlags ap_wpa_flags; + NM80211ApSecurityFlags ap_rsn_flags; NMConnection *connection = NULL; NMSettingConnection *s_con; NMSettingWireless *s_wifi; @@ -2910,7 +3001,7 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) if (nmc->ask) { ssid_ask = nmc_readline (_("SSID or BSSID: ")); - param_user = ssid_ask ? ssid_ask : ""; + param_user = ssid_ask ?: ""; bssid1_arr = nm_utils_hwaddr_atoba (param_user, ETH_ALEN); } if (!ssid_ask) { @@ -3164,7 +3255,9 @@ do_device_wifi_connect_network (NmCli *nmc, int argc, char **argv) ap_rsn_flags = nm_access_point_get_rsn_flags (ap); /* Set password for WEP or WPA-PSK. */ - if (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) { + if ( (ap_flags & NM_802_11_AP_FLAGS_PRIVACY) + || ap_wpa_flags != NM_802_11_AP_SEC_NONE + || ap_rsn_flags != NM_802_11_AP_SEC_NONE) { /* Ask for missing password when one is expected and '--ask' is used */ if (!password && nmc->ask) password = passwd_ask = nmc_readline_echo (nmc->nmc_config.show_secrets, _("Password: ")); @@ -3661,7 +3754,6 @@ do_device_wifi_rescan (NmCli *nmc, int argc, char **argv) goto finish; } - if (ssids->len) { g_variant_builder_init (&builder, G_VARIANT_TYPE_VARDICT); g_variant_builder_init (&array_builder, G_VARIANT_TYPE ("aay")); diff --git a/clients/cli/devices.h b/clients/cli/devices.h index 2c261bc7..c78680da 100644 --- a/clients/cli/devices.h +++ b/clients/cli/devices.h @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * (C) Copyright 2010 Red Hat, Inc. + * (C) Copyright 2010 - 2018 Red Hat, Inc. */ #ifndef NMC_DEVICES_H @@ -32,7 +32,7 @@ void monitor_devices (NmCli *nmc); NMDevice ** nmc_get_devices_sorted (NMClient *client); -void nmc_device_state_to_color (NMDeviceState state, NMMetaTermColor *color, NMMetaTermFormat *color_fmt); +NMMetaColor nmc_device_state_to_color (NMDeviceState state); extern const NmcMetaGenericInfo *const nmc_fields_dev_status[]; extern const NmcMetaGenericInfo *const nmc_fields_dev_show_general[]; diff --git a/clients/cli/general.c b/clients/cli/general.c index 7ac6b22c..de743970 100644 --- a/clients/cli/general.c +++ b/clients/cli/general.c @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -55,23 +55,26 @@ nm_state_to_string (NMState state) return _(nm_state_to_string_no_l10n (state)); } -static NMMetaTermColor +static NMMetaColor state_to_color (NMState state) { switch (state) { case NM_STATE_CONNECTING: - return NM_META_TERM_COLOR_YELLOW; + return NM_META_COLOR_STATE_CONNECTING; case NM_STATE_CONNECTED_LOCAL: + return NM_META_COLOR_STATE_CONNECTED_LOCAL; case NM_STATE_CONNECTED_SITE: + return NM_META_COLOR_STATE_CONNECTED_SITE; case NM_STATE_CONNECTED_GLOBAL: - return NM_META_TERM_COLOR_GREEN; + return NM_META_COLOR_STATE_CONNECTED_GLOBAL; case NM_STATE_DISCONNECTING: - return NM_META_TERM_COLOR_YELLOW; + return NM_META_COLOR_STATE_DISCONNECTING; case NM_STATE_ASLEEP: + return NM_META_COLOR_STATE_ASLEEP; case NM_STATE_DISCONNECTED: - return NM_META_TERM_COLOR_RED; + return NM_META_COLOR_STATE_DISCONNECTED; default: - return NM_META_TERM_COLOR_NORMAL; + return NM_META_COLOR_STATE_UNKNOWN; } } @@ -90,19 +93,20 @@ nm_connectivity_to_string (NMConnectivityState connectivity) return _(nm_connectivity_to_string_no_l10n (connectivity)); } -static NMMetaTermColor +static NMMetaColor connectivity_to_color (NMConnectivityState connectivity) { switch (connectivity) { case NM_CONNECTIVITY_NONE: - return NM_META_TERM_COLOR_RED; + return NM_META_COLOR_CONNECTIVITY_NONE; case NM_CONNECTIVITY_PORTAL: + return NM_META_COLOR_CONNECTIVITY_PORTAL; case NM_CONNECTIVITY_LIMITED: - return NM_META_TERM_COLOR_YELLOW; + return NM_META_COLOR_CONNECTIVITY_LIMITED; case NM_CONNECTIVITY_FULL: - return NM_META_TERM_COLOR_GREEN; + return NM_META_COLOR_CONNECTIVITY_FULL; default: - return NM_META_TERM_COLOR_NORMAL; + return NM_META_COLOR_CONNECTIVITY_UNKNOWN; } } @@ -155,11 +159,11 @@ NM_UTILS_LOOKUP_STR_DEFINE_STATIC (permission_result_to_string_no_l10n, NMClient NM_UTILS_LOOKUP_ITEM_IGNORE (NM_CLIENT_PERMISSION_RESULT_UNKNOWN), ); -_NM_UTILS_LOOKUP_DEFINE (static, permission_result_to_color, NMClientPermissionResult, NMMetaTermColor, - NM_UTILS_LOOKUP_DEFAULT (NM_META_TERM_COLOR_NORMAL), - NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_YES, NM_META_TERM_COLOR_GREEN), - NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_NO, NM_META_TERM_COLOR_RED), - NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_AUTH, NM_META_TERM_COLOR_YELLOW), +_NM_UTILS_LOOKUP_DEFINE (static, permission_result_to_color, NMClientPermissionResult, NMMetaColor, + NM_UTILS_LOOKUP_DEFAULT (NM_META_COLOR_PERMISSION_UNKNOWN), + NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_YES, NM_META_COLOR_PERMISSION_YES), + NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_NO, NM_META_COLOR_PERMISSION_NO), + NM_UTILS_LOOKUP_ITEM (NM_CLIENT_PERMISSION_RESULT_AUTH, NM_META_COLOR_PERMISSION_AUTH), NM_UTILS_LOOKUP_ITEM_IGNORE (NM_CLIENT_PERMISSION_RESULT_UNKNOWN), ); @@ -168,14 +172,7 @@ _NM_UTILS_LOOKUP_DEFINE (static, permission_result_to_color, NMClientPermissionR static const NmcMetaGenericInfo *const metagen_general_status[]; static gconstpointer -_metagen_general_status_get_fcn (const NMMetaEnvironment *environment, - gpointer environment_user_data, - const NmcMetaGenericInfo *info, - gpointer target, - NMMetaAccessorGetType get_type, - NMMetaAccessorGetFlags get_flags, - NMMetaAccessorGetOutFlags *out_flags, - gpointer *out_to_free) +_metagen_general_status_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { NmCli *nmc = target; const char *value; @@ -185,26 +182,26 @@ _metagen_general_status_get_fcn (const NMMetaEnvironment *environment, switch (info->info_type) { case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_RUNNING: - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); value = N_("running"); goto translate_and_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_VERSION: - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); value = nm_client_get_version (nmc->client); goto clone_and_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_STATE: state = nm_client_get_state (nmc->client); - NMC_HANDLE_TERMFORMAT (state_to_color (state)); + NMC_HANDLE_COLOR (state_to_color (state)); value = nm_state_to_string_no_l10n (state); goto translate_and_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_STARTUP: v_bool = nm_client_get_startup (nmc->client); - NMC_HANDLE_TERMFORMAT (v_bool ? NM_META_TERM_COLOR_YELLOW : NM_META_TERM_COLOR_GREEN); + NMC_HANDLE_COLOR (v_bool ? NM_META_COLOR_MANAGER_STARTING : NM_META_COLOR_MANAGER_RUNNING); value = v_bool ? N_("starting") : N_("started"); goto translate_and_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_CONNECTIVITY: connectivity = nm_client_get_connectivity (nmc->client); - NMC_HANDLE_TERMFORMAT (connectivity_to_color (connectivity)); + NMC_HANDLE_COLOR (connectivity_to_color (connectivity)); value = nm_connectivity_to_string_no_l10n (connectivity); goto translate_and_out; case NMC_GENERIC_INFO_TYPE_GENERAL_STATUS_NETWORKING: @@ -233,7 +230,7 @@ _metagen_general_status_get_fcn (const NMMetaEnvironment *environment, g_return_val_if_reached (NULL); enabled_out: - NMC_HANDLE_TERMFORMAT (v_bool ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED); + NMC_HANDLE_COLOR (v_bool ? NM_META_COLOR_ENABLED : NM_META_COLOR_DISABLED); value = v_bool ? N_("enabled") : N_("disabled"); goto translate_and_out; @@ -275,14 +272,7 @@ static const NmcMetaGenericInfo *const metagen_general_status[_NMC_GENERIC_INFO_ /*****************************************************************************/ static gconstpointer -_metagen_general_permissions_get_fcn (const NMMetaEnvironment *environment, - gpointer environment_user_data, - const NmcMetaGenericInfo *info, - gpointer target, - NMMetaAccessorGetType get_type, - NMMetaAccessorGetFlags get_flags, - NMMetaAccessorGetOutFlags *out_flags, - gpointer *out_to_free) +_metagen_general_permissions_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { NMClientPermission perm = GPOINTER_TO_UINT (target); NmCli *nmc = environment_user_data; @@ -291,11 +281,11 @@ _metagen_general_permissions_get_fcn (const NMMetaEnvironment *environment, switch (info->info_type) { case NMC_GENERIC_INFO_TYPE_GENERAL_PERMISSIONS_PERMISSION: - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); return permission_to_string (perm); case NMC_GENERIC_INFO_TYPE_GENERAL_PERMISSIONS_VALUE: perm_result = nm_client_get_permission_result (nmc->client, perm); - NMC_HANDLE_TERMFORMAT (permission_result_to_color (perm_result)); + NMC_HANDLE_COLOR (permission_result_to_color (perm_result)); s = permission_result_to_string_no_l10n (perm_result); if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) return _(s); @@ -323,21 +313,14 @@ typedef struct { } GetGeneralLoggingData; static gconstpointer -_metagen_general_logging_get_fcn (const NMMetaEnvironment *environment, - gpointer environment_user_data, - const NmcMetaGenericInfo *info, - gpointer target, - NMMetaAccessorGetType get_type, - NMMetaAccessorGetFlags get_flags, - NMMetaAccessorGetOutFlags *out_flags, - gpointer *out_to_free) +_metagen_general_logging_get_fcn (NMC_META_GENERIC_INFO_GET_FCN_ARGS) { NmCli *nmc = environment_user_data; GetGeneralLoggingData *d = target; nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_GENERAL_LOGGING_NUM); - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); if (!d->initialized) { d->initialized = TRUE; @@ -513,8 +496,8 @@ show_nm_status (NmCli *nmc, const char *pretty_header_name, const char *print_fl { gs_free_error GError *error = NULL; const char *fields_str; - const char *fields_all = print_flds ? print_flds : NMC_FIELDS_NM_STATUS_ALL; - const char *fields_common = print_flds ? print_flds : NMC_FIELDS_NM_STATUS_COMMON; + const char *fields_all = print_flds ?: NMC_FIELDS_NM_STATUS_ALL; + const char *fields_common = print_flds ?: NMC_FIELDS_NM_STATUS_COMMON; if (!nmc->required_fields || strcasecmp (nmc->required_fields, "common") == 0) fields_str = fields_common; @@ -577,6 +560,9 @@ print_permissions (void *user_data) permissions[i++] = GINT_TO_POINTER (perm); permissions[i++] = NULL; + /* Optionally start paging the output. */ + nmc_terminal_spawn_pager (&nmc->nmc_config); + if (!nmc_print (&nmc->nmc_config, permissions, _("NetworkManager permissions"), @@ -1083,9 +1069,8 @@ networkmanager_running (NMClient *client, GParamSpec *param, NmCli *nmc) char *str; running = nm_client_get_nm_running (client); - str = nmc_colorize (nmc->nmc_config.use_colors, - running ? NM_META_TERM_COLOR_GREEN : NM_META_TERM_COLOR_RED, - NM_META_TERM_FORMAT_NORMAL, + str = nmc_colorize (&nmc->nmc_config, + running ? NM_META_COLOR_MANAGER_RUNNING : NM_META_COLOR_MANAGER_STOPPED, running ? _("NetworkManager has started") : _("NetworkManager has stopped")); g_print ("%s\n", str); g_free (str); @@ -1125,7 +1110,7 @@ client_connectivity (NMClient *client, GParamSpec *param, NmCli *nmc) char *str; g_object_get (client, NM_CLIENT_CONNECTIVITY, &connectivity, NULL); - str = nmc_colorize (nmc->nmc_config.use_colors, connectivity_to_color (connectivity), NM_META_TERM_FORMAT_NORMAL, + str = nmc_colorize (&nmc->nmc_config, connectivity_to_color (connectivity), _("Connectivity is now '%s'\n"), nm_connectivity_to_string (connectivity)); g_print ("%s", str); g_free (str); @@ -1138,14 +1123,13 @@ client_state (NMClient *client, GParamSpec *param, NmCli *nmc) char *str; g_object_get (client, NM_CLIENT_STATE, &state, NULL); - str = nmc_colorize (nmc->nmc_config.use_colors, state_to_color (state), NM_META_TERM_FORMAT_NORMAL, + str = nmc_colorize (&nmc->nmc_config, state_to_color (state), _("Networkmanager is now in the '%s' state\n"), nm_state_to_string (state)); g_print ("%s", str); g_free (str); } - static void device_overview (NmCli *nmc, NMDevice *device) { @@ -1182,12 +1166,12 @@ device_overview (NmCli *nmc, NMDevice *device) if (!nm_device_get_autoconnect (device)) g_string_append_printf (outbuf, "%s, ", _("autoconnect")); if (nm_device_get_firmware_missing (device)) { - tmp = nmc_colorize (nmc->nmc_config.use_colors, NM_META_TERM_COLOR_RED, NM_META_TERM_FORMAT_NORMAL, _("fw missing")); + tmp = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_DEVICE_FIRMWARE_MISSING, _("fw missing")); g_string_append_printf (outbuf, "%s, ", tmp); g_free (tmp); } if (nm_device_get_nm_plugin_missing (device)) { - tmp = nmc_colorize (nmc->nmc_config.use_colors, NM_META_TERM_COLOR_RED, NM_META_TERM_FORMAT_NORMAL, _("plugin missing")); + tmp = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_DEVICE_PLUGIN_MISSING, _("plugin missing")); g_string_append_printf (outbuf, "%s, ", tmp); g_free (tmp); } @@ -1288,7 +1272,7 @@ do_overview (NmCli *nmc, int argc, char **argv) NMDevice **devices; const GPtrArray *p; NMActiveConnection *ac; - NMMetaTermColor color; + NMMetaColor color; NMDnsEntry *dns; char *tmp; int i; @@ -1312,8 +1296,8 @@ do_overview (NmCli *nmc, int argc, char **argv) continue; state = nm_active_connection_get_state (ac); - nmc_active_connection_state_to_color (state, &color); - tmp = nmc_colorize (nmc->nmc_config.use_colors, color, NM_META_TERM_FORMAT_NORMAL, _("%s VPN connection"), + color = nmc_active_connection_state_to_color (state); + tmp = nmc_colorize (&nmc->nmc_config, color, _("%s VPN connection"), nm_active_connection_get_id (ac)); g_print ("%s\n", tmp); g_free (tmp); @@ -1324,14 +1308,13 @@ do_overview (NmCli *nmc, int argc, char **argv) devices = nmc_get_devices_sorted (nmc->client); for (i = 0; devices[i]; i++) { - NMMetaTermFormat color_fmt; NMDeviceState state; ac = nm_device_get_active_connection (devices[i]); state = nm_device_get_state (devices[i]); - nmc_device_state_to_color (state, &color, &color_fmt); - tmp = nmc_colorize (nmc->nmc_config.use_colors, color, color_fmt, "%s: %s%s%s", + color = nmc_device_state_to_color (state); + tmp = nmc_colorize (&nmc->nmc_config, color, "%s: %s%s%s", nm_device_get_iface (devices[i]), nmc_device_state_to_string (state), ac ? " to " : "", @@ -1342,7 +1325,6 @@ do_overview (NmCli *nmc, int argc, char **argv) if (nm_device_get_description (devices[i]) && strcmp (nm_device_get_description (devices[i]), "")) g_print ("\t\"%s\"\n", nm_device_get_description (devices[i])); - device_overview (nmc, devices[i]); if (ac) ac_overview (nmc, ac); @@ -1415,7 +1397,7 @@ do_monitor (NmCli *nmc, int argc, char **argv) if (!nm_client_get_nm_running (nmc->client)) { char *str; - str = nmc_colorize (nmc->nmc_config.use_colors, NM_META_TERM_COLOR_RED, NM_META_TERM_FORMAT_NORMAL, + str = nmc_colorize (&nmc->nmc_config, NM_META_COLOR_MANAGER_STOPPED, _("Networkmanager is not running (waiting for it)\n")); g_print ("%s", str); g_free (str); diff --git a/clients/cli/meson.build b/clients/cli/meson.build new file mode 100644 index 00000000..9449ce63 --- /dev/null +++ b/clients/cli/meson.build @@ -0,0 +1,49 @@ +name = 'nmcli' + +# FIXME: nmcli-completion should be renamed to nmcli +install_data( + 'nmcli-completion', + install_dir: join_paths(nm_datadir, 'bash-completion', 'completions') +) + +sources = files( + 'agent.c', + 'common.c', + 'connections.c', + 'devices.c', + 'general.c', + 'nmcli.c', + 'polkit-agent.c', + 'settings.c', + 'utils.c' +) + +deps = [ + libnm_dep, + libnmc_base_dep, + libnmc_dep, + nm_core_dep, + readline_dep +] + +cflags = clients_cflags + [ + '-DSYSCONFDIR="@0@"'.format(nm_sysconfdir), + '-DG_LOG_DOMAIN="@0@"'.format(name), + '-DNMLOCALEDIR="@0@"'.format(nm_localedir) +] + +if enable_polkit_agent + sources += nm_polkit_listener + + deps += polkit_agent_dep +endif + +executable( + name, + sources, + dependencies: deps, + c_args: cflags, + link_args: ldflags_linker_script_binary, + link_depends: linker_script_binary, + install: true +) diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index f5a66cdd..6407f50b 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -16,7 +16,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -36,8 +36,6 @@ #include "nm-client-utils.h" -#include "nm-utils/nm-hash-utils.h" - #include "polkit-agent.h" #include "utils.h" #include "common.h" @@ -53,8 +51,67 @@ # define NMCLI_VERSION VERSION #endif -/* Global NmCli object */ -NmCli nm_cli; +NmCli nm_cli = { + .client = NULL, + + .return_value = NMC_RESULT_SUCCESS, + + .timeout = -1, + + .secret_agent = NULL, + .pwds_hash = NULL, + .pk_listener = NULL, + + .should_wait = 0, + .nowait_flag = TRUE, + .nmc_config.print_output = NMC_PRINT_NORMAL, + .nmc_config.multiline_output = FALSE, + .mode_specified = FALSE, + .nmc_config.escape_values = TRUE, + .required_fields = NULL, + .ask = FALSE, + .complete = FALSE, + .nmc_config.show_secrets = FALSE, + .nmc_config.in_editor = FALSE, + .nmc_config.palette = { + [NM_META_COLOR_CONNECTION_ACTIVATED] = "32", + [NM_META_COLOR_CONNECTION_ACTIVATING] = "33", + [NM_META_COLOR_CONNECTION_DISCONNECTING] = "31", + [NM_META_COLOR_CONNECTION_INVISIBLE] = "2", + [NM_META_COLOR_CONNECTIVITY_FULL] = "32", + [NM_META_COLOR_CONNECTIVITY_LIMITED] = "33", + [NM_META_COLOR_CONNECTIVITY_NONE] = "31", + [NM_META_COLOR_CONNECTIVITY_PORTAL] = "33", + [NM_META_COLOR_DEVICE_ACTIVATED] = "32", + [NM_META_COLOR_DEVICE_ACTIVATING] = "33", + [NM_META_COLOR_DEVICE_DISCONNECTED] = "31", + [NM_META_COLOR_DEVICE_FIRMWARE_MISSING] = "31", + [NM_META_COLOR_DEVICE_PLUGIN_MISSING] = "31", + [NM_META_COLOR_DEVICE_UNAVAILABLE] = "2", + [NM_META_COLOR_MANAGER_RUNNING] = "32", + [NM_META_COLOR_MANAGER_STARTING] = "33", + [NM_META_COLOR_MANAGER_STOPPED] = "31", + [NM_META_COLOR_PERMISSION_AUTH] = "33", + [NM_META_COLOR_PERMISSION_NO] = "31", + [NM_META_COLOR_PERMISSION_YES] = "32", + [NM_META_COLOR_STATE_ASLEEP] = "31", + [NM_META_COLOR_STATE_CONNECTED_GLOBAL] = "32", + [NM_META_COLOR_STATE_CONNECTED_LOCAL] = "32", + [NM_META_COLOR_STATE_CONNECTED_SITE] = "32", + [NM_META_COLOR_STATE_CONNECTING] = "33", + [NM_META_COLOR_STATE_DISCONNECTED] = "31", + [NM_META_COLOR_STATE_DISCONNECTING] = "33", + [NM_META_COLOR_WIFI_SIGNAL_EXCELLENT] = "32", + [NM_META_COLOR_WIFI_SIGNAL_FAIR] = "35", + [NM_META_COLOR_WIFI_SIGNAL_GOOD] = "33", + [NM_META_COLOR_WIFI_SIGNAL_POOR] = "36", + [NM_META_COLOR_WIFI_SIGNAL_UNKNOWN] = "2", + [NM_META_COLOR_ENABLED] = "32", + [NM_META_COLOR_DISABLED] = "31", + }, + .editor_status_line = FALSE, + .editor_save_confirmation = TRUE, +}; /*****************************************************************************/ @@ -129,11 +186,10 @@ complete_fields (const char *option, const char *prefix) h = g_hash_table_new_full (nm_str_hash, g_str_equal, g_free, NULL); complete_field (h, metagen_ip4_config); - complete_field (h, nmc_fields_dhcp4_config); + complete_field (h, nmc_fields_dhcp_config); complete_field (h, nmc_fields_ip6_config); - complete_field (h, nmc_fields_dhcp6_config); - complete_field (h, nmc_fields_con_show); - complete_field (h, nmc_fields_con_active_details_general); + complete_field (h, metagen_con_show); + complete_field (h, metagen_con_active_general); complete_field (h, nmc_fields_con_active_details_vpn); complete_field (h, nmc_fields_con_active_details_groups); complete_field (h, nmc_fields_dev_status); @@ -186,6 +242,7 @@ usage (void) g_printerr (_("Usage: nmcli [OPTIONS] OBJECT { COMMAND | help }\n" "\n" "OPTIONS\n" + " -o[verview] overview mode (hide default values)\n" " -t[erse] terse output\n" " -p[retty] pretty output\n" " -m[ode] tabular|multiline output mode\n" @@ -272,9 +329,299 @@ matches_arg (NmCli *nmc, int *argc, char ***argv, const char *pattern, char **ar return TRUE; } +/*************************************************************************************/ + +typedef enum { + NMC_USE_COLOR_AUTO, + NMC_USE_COLOR_YES, + NMC_USE_COLOR_NO, +} NmcColorOption; + +/* Checks whether a particular terminal-colors.d(5) file (.enabled, .disabled or .schem) + * exists. If contents is non-NULL, it returns the content. */ +static gboolean +check_colors_file (NmCli *nmc, NmcColorOption *color_option, + const char *base_dir, const char *name, const char *term, const char *type, + char **contents) +{ + char *filename; + gboolean exists; + + filename = g_strdup_printf ("%s/terminal-colors.d/%s%s%s%s%s", + base_dir, + name ? name : "", + term ? "@" : "", term ? term : "", + (name || term) ? "." : "", + type); + if (contents) + exists = g_file_get_contents (filename, contents, NULL, NULL); + else + exists = g_file_test (filename, G_FILE_TEST_EXISTS); + g_free (filename); + + return exists; +} + +static void +check_colors_files_for_term (NmCli *nmc, NmcColorOption *color_option, + const char *base_dir, const char *name, const char *term) +{ + if ( *color_option == NMC_USE_COLOR_AUTO + && check_colors_file (nmc, color_option, base_dir, name, term, "enable", NULL)) { + *color_option = NMC_USE_COLOR_YES; + } + + if ( *color_option == NMC_USE_COLOR_AUTO + && check_colors_file (nmc, color_option, base_dir, name, term, "disable", NULL)) { + *color_option = NMC_USE_COLOR_NO; + } + + if (*color_option == NMC_USE_COLOR_NO) { + /* No need to bother any further. */ + return; + } + + if (nmc->palette_buffer == NULL) + check_colors_file (nmc, color_option, base_dir, name, term, "schem", &nmc->palette_buffer); +} + +static void +check_colors_files_for_name (NmCli *nmc, NmcColorOption *color_option, + const char *base_dir, const char *name) +{ + const gchar *term; + + /* Take a shortcut if the directory is not there. */ + if (!g_file_test (base_dir, G_FILE_TEST_EXISTS)) + return; + + term = g_getenv ("TERM"); + if (term) + check_colors_files_for_term (nmc, color_option, base_dir, name, term); + check_colors_files_for_term (nmc, color_option, base_dir, name, NULL); +} + +static void +check_colors_files_for_base_dir (NmCli *nmc, NmcColorOption *color_option, + const char *base_dir) +{ + check_colors_files_for_name (nmc, color_option, base_dir, "nmcli"); + check_colors_files_for_name (nmc, color_option, base_dir, NULL); +} + +static const char * +resolve_color_alias (const char *color) +{ + static const struct { + const char *name; + const char *alias; + } aliases[] = { + { "reset", "0" }, + { "bold", "1" }, + { "white", "1;37" }, + { "halfbright", "2" }, + { "underscore", "4" }, + { "blink", "5" }, + { "reverse", "7" }, + { "black", "30" }, + { "red", "31" }, + { "green", "32" }, + { "brown", "33" }, + { "yellow", "33" }, /* well, yellow */ + { "blue", "34" }, + { "magenta", "35" }, + { "cyan", "36" }, + { "gray", "37" }, + { "darkgray", "90" }, + { "lightred", "91" }, + { "lightgreen", "92" }, + { "lightblue", "94" }, + { "lightmagenta", "95" }, + { "lightcyan", "96" }, + { "lightgray", "97" }, + }; + int i; + + /* Shortcut literal sequences. */ + if (g_ascii_isdigit (*color)) + return color; + + for (i = 0; i < G_N_ELEMENTS (aliases); i++) { + if (strcmp (color, aliases[i].name) == 0) + return aliases[i].alias; + } + + return color; +} + +static gboolean +parse_color_scheme (NmCli *nmc, GError **error) +{ + char *p = nmc->palette_buffer; + const char *name; + const char *color; + const char *map[_NM_META_COLOR_NUM] = { + [NM_META_COLOR_NONE] = NULL, + [NM_META_COLOR_CONNECTION_ACTIVATED] = "connection-activated", + [NM_META_COLOR_CONNECTION_ACTIVATING] = "connection-activating", + [NM_META_COLOR_CONNECTION_DISCONNECTING] = "connection-disconnecting", + [NM_META_COLOR_CONNECTION_INVISIBLE] = "connection-invisible", + [NM_META_COLOR_CONNECTION_UNKNOWN] = "connection-unknown", + [NM_META_COLOR_CONNECTIVITY_FULL] = "connectivity-full", + [NM_META_COLOR_CONNECTIVITY_LIMITED] = "connectivity-limited", + [NM_META_COLOR_CONNECTIVITY_NONE] = "connectivity-none", + [NM_META_COLOR_CONNECTIVITY_PORTAL] = "connectivity-portal", + [NM_META_COLOR_CONNECTIVITY_UNKNOWN] = "connectivity-unknown", + [NM_META_COLOR_DEVICE_ACTIVATED] = "device-activated", + [NM_META_COLOR_DEVICE_ACTIVATING] = "device-activating", + [NM_META_COLOR_DEVICE_DISCONNECTED] = "device-disconnected", + [NM_META_COLOR_DEVICE_FIRMWARE_MISSING] = "device-firmware-missing", + [NM_META_COLOR_DEVICE_PLUGIN_MISSING] = "device-plugin-missing", + [NM_META_COLOR_DEVICE_UNAVAILABLE] = "device-unavailable", + [NM_META_COLOR_DEVICE_UNKNOWN] = "device-unknown", + [NM_META_COLOR_MANAGER_RUNNING] = "manager-running", + [NM_META_COLOR_MANAGER_STARTING] = "manager-starting", + [NM_META_COLOR_MANAGER_STOPPED] = "manager-stopped", + [NM_META_COLOR_PERMISSION_AUTH] = "permission-auth", + [NM_META_COLOR_PERMISSION_NO] = "permission-no", + [NM_META_COLOR_PERMISSION_UNKNOWN] = "permission-unknown", + [NM_META_COLOR_PERMISSION_YES] = "permission-yes", + [NM_META_COLOR_PROMPT] = "prompt", + [NM_META_COLOR_STATE_ASLEEP] = "state-asleep", + [NM_META_COLOR_STATE_CONNECTED_GLOBAL] = "state-connected-global", + [NM_META_COLOR_STATE_CONNECTED_LOCAL] = "state-connected-local", + [NM_META_COLOR_STATE_CONNECTED_SITE] = "state-connected-site", + [NM_META_COLOR_STATE_CONNECTING] = "state-connecting", + [NM_META_COLOR_STATE_DISCONNECTED] = "state-disconnected", + [NM_META_COLOR_STATE_DISCONNECTING] = "state-disconnecting", + [NM_META_COLOR_STATE_UNKNOWN] = "state-unknown", + [NM_META_COLOR_WIFI_SIGNAL_EXCELLENT] = "wifi-signal-excellent", + [NM_META_COLOR_WIFI_SIGNAL_FAIR] = "wifi-signal-fair", + [NM_META_COLOR_WIFI_SIGNAL_GOOD] = "wifi-signal-good", + [NM_META_COLOR_WIFI_SIGNAL_POOR] = "wifi-signal-poor", + [NM_META_COLOR_WIFI_SIGNAL_UNKNOWN] = "wifi-signal-unknown", + [NM_META_COLOR_DISABLED] = "disabled", + [NM_META_COLOR_ENABLED] = "enabled", + }; + int i; + + /* This reads through the raw color scheme file contents, identifying the + * color names and sequences, putting in terminating NULs in place, so that + * pointers into the buffer can readily be used as strings in the palette. */ + while (1) { + /* Leading whitespace. */ + while (nm_utils_is_separator (*p) || *p == '\n') + p++; + + if (*p == '\0') + break; + + /* Comments. */ + if (*p == '#') { + while (*p != '\n' && *p != '\0') + p++; + continue; + } + + /* Color name. */ + name = p; + while (g_ascii_isgraph (*p)) + p++; + if (*p == '\0') { + g_set_error (error, NMCLI_ERROR, 0, + _("Unexpected end of file following '%s'\n"), name); + return FALSE; + } + + /* Separating whitespace. */ + if (!nm_utils_is_separator (*p)) { + *p = '\0'; + g_set_error (error, NMCLI_ERROR, 0, + _("Expected whitespace following '%s'\n"), name); + return FALSE; + } + while (nm_utils_is_separator (*p)) { + *p = '\0'; + p++; + } + + /* Color sequence. */ + color = p; + if (!g_ascii_isgraph (*p)) { + g_set_error (error, NMCLI_ERROR, 0, + _("Expected a value for '%s'\n"), name); + return FALSE; + } + while (g_ascii_isgraph (*p)) + p++; + + /* Trailing whitespace. */ + while (nm_utils_is_separator (*p)) { + *p = '\0'; + p++; + } + if (*p != '\0') { + if (*p != '\n') { + g_set_error (error, NMCLI_ERROR, 0, + _("Expected a line break following '%s'\n"), color); + return FALSE; + } + *p = '\0'; + p++; + } + + /* All good, set the palette entry. */ + for (i = NM_META_COLOR_NONE + 1; i < _NM_META_COLOR_NUM; i++) { + if (strcmp (map[i], name) == 0) { + nmc->nmc_config_mutable.palette[i] = resolve_color_alias (color); + break; + } + } + if (i == _NM_META_COLOR_NUM) + g_debug ("Ignoring an unrecognized color: '%s'\n", name); + } + + return TRUE; +} + +static void +set_colors (NmCli *nmc, NmcColorOption color_option) +{ + GError *error = NULL; + + if (color_option == NMC_USE_COLOR_AUTO) { + if ( g_strcmp0 (g_getenv ("TERM"), "dumb") == 0 + || !isatty (STDOUT_FILENO)) + color_option = NMC_USE_COLOR_NO; + } + + check_colors_files_for_base_dir (nmc, &color_option, g_get_user_config_dir ()); + check_colors_files_for_base_dir (nmc, &color_option, SYSCONFDIR); + + switch (color_option) { + case NMC_USE_COLOR_YES: + case NMC_USE_COLOR_AUTO: + nmc->nmc_config_mutable.use_colors = TRUE; + break; + case NMC_USE_COLOR_NO: + nmc->nmc_config_mutable.use_colors = FALSE; + break; + } + + if (nmc->nmc_config_mutable.use_colors && nmc->palette_buffer) { + if (!parse_color_scheme (nmc, &error)) { + g_debug ("Error parsing color scheme: %s", error->message); + g_error_free (error); + } + } +} + +/*************************************************************************************/ + static gboolean process_command_line (NmCli *nmc, int argc, char **argv) { + NmcColorOption colors = NMC_USE_COLOR_AUTO; char *base; base = strrchr (argv[0], '/'); @@ -297,9 +644,10 @@ process_command_line (NmCli *nmc, int argc, char **argv) break; if (argc == 1 && nmc->complete) { - nmc_complete_strings (argv[0], "--terse", "--pretty", "--mode", "--colors", "--escape", - "--fields", "--nocheck", "--get-values", - "--wait", "--version", "--help", NULL); + nmc_complete_strings (argv[0], "--terse", "--pretty", "--mode", "--overview", + "--colors", "--escape", + "--fields", "--nocheck", "--get-values", + "--wait", "--version", "--help", NULL); } if (argv[0][1] == '-' && argv[0][2] == '\0') { @@ -308,7 +656,9 @@ process_command_line (NmCli *nmc, int argc, char **argv) break; } - if (matches_arg (nmc, &argc, &argv, "-terse", NULL)) { + if (matches_arg (nmc, &argc, &argv, "-overview", NULL)) { + nmc->nmc_config_mutable.overview = TRUE; + } else if (matches_arg (nmc, &argc, &argv, "-terse", NULL)) { if (nmc->nmc_config.print_output == NMC_PRINT_TERSE) { g_string_printf (nmc->return_text, _("Error: Option '--terse' is specified the second time.")); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -351,11 +701,11 @@ process_command_line (NmCli *nmc, int argc, char **argv) if (argc == 1 && nmc->complete) complete_option_with_value (argv[0], value, "yes", "no", "auto", NULL); if (matches (value, "auto")) - nmc->nmc_config_mutable.use_colors = NMC_USE_COLOR_AUTO; + colors = NMC_USE_COLOR_AUTO; else if (matches (value, "yes")) - nmc->nmc_config_mutable.use_colors = NMC_USE_COLOR_YES; + colors = NMC_USE_COLOR_YES; else if (matches (value, "no")) - nmc->nmc_config_mutable.use_colors = NMC_USE_COLOR_NO; + colors = NMC_USE_COLOR_NO; else { g_string_printf (nmc->return_text, _("Error: '%s' is not valid argument for '%s' option."), value, argv[0]); nmc->return_value = NMC_RESULT_ERROR_USER_INPUT; @@ -382,8 +732,8 @@ process_command_line (NmCli *nmc, int argc, char **argv) complete_fields (argv[0], value); nmc->required_fields = g_strdup (value); nmc->nmc_config_mutable.print_output = NMC_PRINT_TERSE; - /* We want fixed tabular mode here, but just set the mode specified and rely on the initialization - * in nmc_init: in this way we allow use of "-m multiline" to swap the output mode also if placed + /* We want fixed tabular mode here, but just set the mode specified and rely on defaults: + * in this way we allow use of "-m multiline" to swap the output mode also if placed * before the "-g " option (-g may be still more practical and easy to remember than -t -f). */ nmc->mode_specified = TRUE; @@ -417,6 +767,12 @@ process_command_line (NmCli *nmc, int argc, char **argv) next_arg (nmc, &argc, &argv, NULL); } + /* Ignore --overview when fields are set explicitly */ + if (nmc->required_fields) + nmc->nmc_config_mutable.overview = FALSE; + + set_colors (nmc, colors); + /* Now run the requested command */ nmc_do_cmd (nmc, nmcli_cmds, *argv, argc, argv); @@ -553,38 +909,6 @@ nmc_value_transforms_register (void) nmc_convert_bytes_to_string); } -/* Initialize NmCli structure - set default values */ -static void -nmc_init (NmCli *nmc) -{ - nmc->client = NULL; - - nmc->return_value = NMC_RESULT_SUCCESS; - nmc->return_text = g_string_new (_("Success")); - - nmc->timeout = -1; - - nmc->secret_agent = NULL; - nmc->pwds_hash = NULL; - nmc->pk_listener = NULL; - - nmc->should_wait = 0; - nmc->nowait_flag = TRUE; - nmc->nmc_config_mutable.print_output = NMC_PRINT_NORMAL; - nmc->nmc_config_mutable.multiline_output = FALSE; - nmc->mode_specified = FALSE; - nmc->nmc_config_mutable.escape_values = TRUE; - nmc->required_fields = NULL; - nmc->ask = FALSE; - nmc->complete = FALSE; - nmc->nmc_config_mutable.show_secrets = FALSE; - nmc->nmc_config_mutable.use_colors = NMC_USE_COLOR_AUTO; - nmc->nmc_config_mutable.in_editor = FALSE; - nmc->editor_status_line = FALSE; - nmc->editor_save_confirmation = TRUE; - nmc->editor_prompt_color = NM_META_TERM_COLOR_NORMAL; -} - static void nmc_cleanup (NmCli *nmc) { @@ -602,7 +926,7 @@ nmc_cleanup (NmCli *nmc) if (nmc->pwds_hash) g_hash_table_destroy (nmc->pwds_hash); - g_free (nmc->required_fields); + nm_clear_g_free (&nmc->required_fields); if (nmc->pager_pid > 0) { fclose (stdout); @@ -613,6 +937,8 @@ nmc_cleanup (NmCli *nmc) nmc->pager_pid = 0; } + nm_clear_g_free (&nmc->palette_buffer); + nmc_polkit_agent_fini (nmc); } @@ -624,19 +950,17 @@ main (int argc, char *argv[]) #ifdef GETTEXT_PACKAGE /* Set i18n stuff */ - bindtextdomain (GETTEXT_PACKAGE, NMCLI_LOCALEDIR); + bindtextdomain (GETTEXT_PACKAGE, NMLOCALEDIR); bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); #endif - nm_g_type_init (); - /* Save terminal settings */ tcgetattr (STDIN_FILENO, &termios_orig); nmc_value_transforms_register (); - nmc_init (&nm_cli); + nm_cli.return_text = g_string_new (_("Success")); loop = g_main_loop_new (NULL, FALSE); g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM)); diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 874bca21..bcf1c01b 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -14,23 +14,16 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #ifndef NMC_NMCLI_H #define NMC_NMCLI_H -#include "NetworkManager.h" #include "nm-secret-agent-old.h" - #include "nm-meta-setting-desc.h" -#if WITH_POLKIT_AGENT -#include "nm-polkit-listener.h" -#else -/* polkit agent is not available; define fake NMPolkitListener */ -typedef gpointer NMPolkitListener; -#endif +struct _NMPolkitListener; typedef char *(*NmcCompEntryFunc) (const char *, int); @@ -79,6 +72,14 @@ typedef enum { NMC_PRINT_PRETTY = 2 } NMCPrintOutput; +static inline NMMetaAccessorGetType +nmc_print_output_to_accessor_get_type (NMCPrintOutput print_output) +{ + return (print_output != NMC_PRINT_TERSE) + ? NM_META_ACCESSOR_GET_TYPE_PRETTY + : NM_META_ACCESSOR_GET_TYPE_PARSABLE; +} + /* === Output fields === */ typedef enum { @@ -100,23 +101,18 @@ struct _NmcOutputField { gboolean value_is_array; /* Whether value is char** instead of char* */ gboolean free_value; /* Whether to free the value */ NmcOfFlags flags; /* Flags - whether and how to print values/field names/headers */ - NMMetaTermColor color; /* Use this color to print value */ - NMMetaTermFormat color_fmt; /* Use this terminal format to print value */ + NMMetaColor color; /* Use this color to print value */ }; -typedef enum { - NMC_USE_COLOR_AUTO, - NMC_USE_COLOR_YES, - NMC_USE_COLOR_NO, -} NmcColorOption; - typedef struct _NmcConfig { NMCPrintOutput print_output; /* Output mode */ - NmcColorOption use_colors; /* Whether to use colors for output: option '--color' */ + gboolean use_colors; /* Whether to use colors for output: option '--color' */ bool multiline_output; /* Multiline output instead of default tabular */ bool escape_values; /* Whether to escape ':' and '\' in terse tabular mode */ bool in_editor; /* Whether running the editor - nmcli con edit' */ bool show_secrets; /* Whether to display secrets (both input and output): option '--show-secrets' */ + bool overview; /* Overview mode (hide default values) */ + const char *palette[_NM_META_COLOR_NUM]; /* Color palette */ } NmcConfig; typedef struct _NmcOutputData { @@ -135,7 +131,7 @@ typedef struct _NmCli { NMSecretAgentOld *secret_agent; /* Secret agent */ GHashTable *pwds_hash; /* Hash table with passwords in passwd-file */ - NMPolkitListener *pk_listener ; /* polkit agent listener */ + struct _NMPolkitListener *pk_listener; /* polkit agent listener */ int should_wait; /* Semaphore indicating whether nmcli should not end or not yet */ gboolean nowait_flag; /* '--nowait' option; used for passing to callbacks */ @@ -149,9 +145,15 @@ typedef struct _NmCli { gboolean complete; /* Autocomplete the command line */ gboolean editor_status_line; /* Whether to display status line in connection editor */ gboolean editor_save_confirmation; /* Whether to ask for confirmation on saving connections with 'autoconnect=yes' */ - NMMetaTermColor editor_prompt_color; /* Color of prompt in connection editor */ + + char *palette_buffer; /* Buffer with sequences for terminal-colors.d(5)-based coloring. */ } NmCli; +#define NMC_RETURN(nmc, rvalue) \ + G_STMT_START { \ + return ((nmc)->return_value = (rvalue)); \ + } G_STMT_END + extern NmCli nm_cli; /* Error quark for GError domain */ diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c index ecd58ba5..338f0b15 100644 --- a/clients/cli/polkit-agent.c +++ b/clients/cli/polkit-agent.c @@ -19,8 +19,6 @@ #include "nm-default.h" -#if WITH_POLKIT_AGENT - #include "polkit-agent.h" #include @@ -29,17 +27,18 @@ #include #include "nm-polkit-listener.h" - #include "common.h" +#if WITH_POLKIT_AGENT static char * -polkit_request (const char *request, +polkit_request (NMPolkitListener *listener, + const char *request, const char *action_id, const char *message, const char *icon_name, const char *user, gboolean echo_on, - gpointer user_data) + gpointer user_data) { char *response, *tmp, *p; @@ -62,28 +61,42 @@ polkit_request (const char *request, } static void -polkit_show_info (const char *text) +polkit_show_info (NMPolkitListener *listener, + const char *text, + gpointer user_data) { g_print (_("Authentication message: %s\n"), text); } static void -polkit_show_error (const char *text) +polkit_show_error (NMPolkitListener *listener, + const char *text, + gpointer user_data) { g_print (_("Authentication error: %s\n"), text); } static void -polkit_completed (gboolean gained_authorization) +polkit_completed (NMPolkitListener *listener, + gboolean gained_authorization, + gpointer user_data) { /* We don't print anything here. The outcome will be evident from * the operation result anyway. */ } +#endif gboolean nmc_polkit_agent_init (NmCli* nmc, gboolean for_session, GError **error) { - PolkitAgentListener *listener; +#if WITH_POLKIT_AGENT + static const NMPolkitListenVtable vtable = { + .on_request = polkit_request, + .on_show_info = polkit_show_info, + .on_show_error = polkit_show_error, + .on_completed = polkit_completed, + }; + NMPolkitListener *listener; g_return_val_if_fail (error == NULL || *error == NULL, FALSE); @@ -91,24 +104,28 @@ nmc_polkit_agent_init (NmCli* nmc, gboolean for_session, GError **error) if (!listener) return FALSE; - nm_polkit_listener_set_request_callback (NM_POLKIT_LISTENER (listener), polkit_request, nmc); - nm_polkit_listener_set_show_info_callback (NM_POLKIT_LISTENER (listener), polkit_show_info); - nm_polkit_listener_set_show_error_callback (NM_POLKIT_LISTENER (listener), polkit_show_error); - nm_polkit_listener_set_completed_callback (NM_POLKIT_LISTENER (listener), polkit_completed); + nm_polkit_listener_set_vtable (listener, &vtable, nmc); - nmc->pk_listener = NM_POLKIT_LISTENER (listener); + nmc->pk_listener = listener; +#endif return TRUE; } void nmc_polkit_agent_fini (NmCli* nmc) { - g_clear_object (&nmc->pk_listener); +#if WITH_POLKIT_AGENT + if (nmc->pk_listener) { + nm_polkit_listener_set_vtable (nmc->pk_listener, NULL, NULL); + g_clear_object (&nmc->pk_listener); + } +#endif } gboolean nmc_start_polkit_agent_start_try (NmCli *nmc) { +#if WITH_POLKIT_AGENT GError *error = NULL; /* We don't register polkit agent at all when running non-interactively */ @@ -121,30 +138,6 @@ nmc_start_polkit_agent_start_try (NmCli *nmc) g_error_free (error); return FALSE; } +#endif return TRUE; } - -#else -/* polkit agent is not avalable; implement stub functions. */ - -#include "nmcli.h" -#include "polkit-agent.h" - -gboolean -nmc_polkit_agent_init (NmCli* nmc, gboolean for_session, GError **error) -{ - return TRUE; -} - -void -nmc_polkit_agent_fini (NmCli* nmc) -{ -} - -gboolean -nmc_start_polkit_agent_start_try (NmCli *nmc) -{ - return TRUE; -} - -#endif /* #if WITH_POLKIT_AGENT */ diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 69275aad..01142ba2 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -313,16 +313,18 @@ _set_fcn_precheck_connection_secondaries (const char *value, { const GPtrArray *connections; NMConnection *con; + gs_free const char **strv0 = NULL; gs_strfreev char **strv = NULL; char **iter; - gboolean modified; + gboolean modified = FALSE; - strv = nmc_strsplit_set (value, " \t,", 0); - if (!strv) + strv0 = nm_utils_strsplit_set (value, " \t,"); + if (!strv0) return TRUE; connections = nm_client_get_connections (nm_cli.client); + strv = g_strdupv ((char **) strv0); for (iter = strv; *iter; iter++) { if (nm_utils_is_uuid (*iter)) { con = nmc_find_connection (connections, "uuid", *iter, NULL, FALSE); @@ -472,6 +474,7 @@ get_property_val (NMSetting *setting, const char *prop, NMMetaAccessorGetType ge get_type, show_secrets ? NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS : 0, &out_flags, + NULL, (gpointer *) &to_free); nm_assert (!out_flags); return to_free ?: g_strdup (value); @@ -746,9 +749,9 @@ nmc_setting_get_property_desc (NMSetting *setting, const char *prop) return g_strdup_printf ("%s\n%s\n%s%s%s%s", setting_desc_title, - setting_desc ? setting_desc : "", + setting_desc ?: "", nmcli_nl, nmcli_desc_title, nmcli_nl, - nmcli_desc ? nmcli_desc : ""); + nmcli_desc ?: ""); } /* diff --git a/clients/cli/utils.c b/clients/cli/utils.c index f20e24ce..365a0303 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright 2010 Lennart Poettering - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #include "nm-default.h" @@ -75,6 +75,7 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, + gboolean *out_is_default, gpointer *out_to_free) { const NmcMetaGenericInfo *info = (const NmcMetaGenericInfo *) abstract_info; @@ -85,23 +86,25 @@ _meta_type_nmc_generic_info_get_fcn (const NMMetaAbstractInfo *abstract_info, if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PARSABLE, NM_META_ACCESSOR_GET_TYPE_PRETTY, - NM_META_ACCESSOR_GET_TYPE_TERMFORMAT)) + NM_META_ACCESSOR_GET_TYPE_COLOR)) g_return_val_if_reached (NULL); - /* omitting the out_to_free value is only allowed for TERMFORMAT. */ - nm_assert (out_to_free || NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_TERMFORMAT)); + /* omitting the out_to_free value is only allowed for COLOR. */ + nm_assert (out_to_free || NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_COLOR)); if (info->get_fcn) { - return info->get_fcn (environment, environment_user_data, + return info->get_fcn (environment, + environment_user_data, info, target, get_type, get_flags, out_flags, + out_is_default, out_to_free); } if (info->nested) { - NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL); + NMC_HANDLE_COLOR (NM_META_COLOR_NONE); return info->name; } @@ -117,37 +120,16 @@ const NMMetaType nmc_meta_type_generic_info = { /*****************************************************************************/ -static gboolean -use_colors (NmcColorOption color_option) -{ - if (color_option == NMC_USE_COLOR_AUTO) { - static NmcColorOption cached = NMC_USE_COLOR_AUTO; - - if (G_UNLIKELY (cached == NMC_USE_COLOR_AUTO)) { - if ( g_strcmp0 (g_getenv ("TERM"), "dumb") == 0 - || !isatty (STDOUT_FILENO)) - cached = NMC_USE_COLOR_NO; - else - cached = NMC_USE_COLOR_YES; - } - return cached == NMC_USE_COLOR_YES; - } - - return color_option == NMC_USE_COLOR_YES; -} - static const char * -colorize_string (NmcColorOption color_option, - NMMetaTermColor color, - NMMetaTermFormat color_fmt, +colorize_string (const NmcConfig *nmc_config, + NMMetaColor color, const char *str, char **out_to_free) { const char *out = str; - if ( use_colors (color_option) - && (color != NM_META_TERM_COLOR_NORMAL || color_fmt != NM_META_TERM_FORMAT_NORMAL)) { - *out_to_free = nmc_colorize (color_option, color, color_fmt, "%s", str); + if (nmc_config && nmc_config->use_colors) { + *out_to_free = nmc_colorize (nmc_config, color, "%s", str); out = *out_to_free; } @@ -202,7 +184,6 @@ next_arg (NmCli *nmc, int *argc, char ***argv, ...) if (*argc == 0) return -1; - va_start (args, argv); if (nmc && nmc->complete && *argc == 1) { @@ -218,10 +199,18 @@ next_arg (NmCli *nmc, int *argc, char ***argv, ...) /* Check command dependent options first */ while ((cmd_option = va_arg (args, const char *))) { - /* strip heading "--" form cmd_option */ - if (nmc_arg_is_option (**argv, cmd_option + 2)) { - va_end (args); - return cmd_option_pos; + if (cmd_option[0] == '-' && cmd_option[1] == '-') { + /* Match as an option (leading "--" stripped) */ + if (nmc_arg_is_option (**argv, cmd_option + 2)) { + va_end (args); + return cmd_option_pos; + } + } else { + /* Match literally. */ + if (strcmp (**argv, cmd_option) == 0) { + va_end (args); + return cmd_option_pos; + } } cmd_option_pos++; } @@ -389,118 +378,30 @@ nmc_terminal_show_progress (const char *str) const char slashes[4] = {'|', '/', '-', '\\'}; nmc_terminal_erase_line (); - g_print ("%c %s", slashes[idx++], str ? str : ""); + g_print ("%c %s", slashes[idx++], str ?: ""); fflush (stdout); if (idx == 4) idx = 0; } -const char * -nmc_term_color_sequence (NMMetaTermColor color) -{ - switch (color) { - case NM_META_TERM_COLOR_BLACK: - return "\33[30m"; - break; - case NM_META_TERM_COLOR_RED: - return "\33[31m"; - break; - case NM_META_TERM_COLOR_GREEN: - return "\33[32m"; - break; - case NM_META_TERM_COLOR_YELLOW: - return "\33[33m"; - break; - case NM_META_TERM_COLOR_BLUE: - return "\33[34m"; - break; - case NM_META_TERM_COLOR_MAGENTA: - return "\33[35m"; - break; - case NM_META_TERM_COLOR_CYAN: - return "\33[36m"; - break; - case NM_META_TERM_COLOR_WHITE: - return "\33[37m"; - break; - default: - return ""; - break; - } -} - -/* Parses @str for color as string or number */ -NMMetaTermColor -nmc_term_color_parse_string (const char *str, GError **error) -{ - unsigned long color_int; - static const char *colors[] = { "normal", "black", "red", "green", "yellow", - "blue", "magenta", "cyan", "white", NULL }; - - if (nmc_string_to_uint (str, TRUE, 0, 8, &color_int)) { - return (NMMetaTermColor) color_int; - } else { - const char *color, **p; - int i; - - color = nmc_string_is_valid (str, colors, error); - for (p = colors, i = 0; *p != NULL; p++, i++) { - if (*p == color) - return (NMMetaTermColor) i; - } - return -1; - } -} - -const char * -nmc_term_format_sequence (NMMetaTermFormat format) -{ - switch (format) { - case NM_META_TERM_FORMAT_BOLD: - return "\33[1m"; - break; - case NM_META_TERM_FORMAT_DIM: - return "\33[2m"; - break; - case NM_META_TERM_FORMAT_UNDERLINE: - return "\33[4m"; - break; - case NM_META_TERM_FORMAT_BLINK: - return "\33[5m"; - break; - case NM_META_TERM_FORMAT_REVERSE: - return "\33[7m"; - break; - case NM_META_TERM_FORMAT_HIDDEN: - return "\33[8m"; - break; - default: - return ""; - break; - } -} - char * -nmc_colorize (NmcColorOption color_option, NMMetaTermColor color, NMMetaTermFormat format, const char *fmt, ...) +nmc_colorize (const NmcConfig *nmc_config, NMMetaColor color, const char *fmt, ...) { va_list args; char *str, *colored; - const char *ansi_color, *color_end, *ansi_fmt, *format_end; - static const char *end_seq = "\33[0m"; + const char *ansi_seq = NULL; va_start (args, fmt); str = g_strdup_vprintf (fmt, args); va_end (args); - if (!use_colors (color_option)) - return str; + if (nmc_config->use_colors) + ansi_seq = nmc_config->palette[color]; - ansi_color = nmc_term_color_sequence (color); - ansi_fmt = nmc_term_format_sequence (format); - color_end = *ansi_color ? end_seq : ""; - format_end = *ansi_fmt ? end_seq : ""; + if (ansi_seq == NULL) + return str; - colored = g_strdup_printf ("%s%s%s%s%s", ansi_fmt, ansi_color, str, color_end, format_end); + colored = g_strdup_printf ("\33[%sm%s\33[0m", ansi_seq, str); g_free (str); return colored; } @@ -524,7 +425,7 @@ nmc_count_color_escape_chars (const char *start, const char *end) inside = TRUE; if (inside) num++; - if (*start == 'm') + if (*start == 'm') inside = FALSE; start++; } @@ -603,9 +504,14 @@ int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, char ***argv, int *argc) { + gs_free const char **arr0 = NULL; char **arr; - arr = nmc_strsplit_set (line ? line : "", delim ? delim : " \t", 0); + arr0 = nm_utils_strsplit_set (line ?: "", delim ?: " \t"); + if (!arr0) + arr = g_new0 (char *, 1); + else + arr = g_strdupv ((char **) arr0); if (unquote) { int i = 0; @@ -613,7 +519,7 @@ nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, size_t l; const char *quotes = "\"'"; - while (arr && arr[i]) { + while (arr[i]) { s = arr[i]; l = strlen (s); if (l >= 2) { @@ -628,7 +534,6 @@ nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquote, *argv = arr; *argc = g_strv_length (arr); - return 0; } @@ -713,7 +618,7 @@ set_val_arrc (NmcOutputField fields_array[], guint32 idx, const char **value) } void -set_val_color_all (NmcOutputField fields_array[], NMMetaTermColor color) +set_val_color_all (NmcOutputField fields_array[], NMMetaColor color) { int i; @@ -722,16 +627,6 @@ set_val_color_all (NmcOutputField fields_array[], NMMetaTermColor color) } } -void -set_val_color_fmt_all (NmcOutputField fields_array[], NMMetaTermFormat format) -{ - int i; - - for (i = 0; fields_array[i].info; i++) { - fields_array[i].color_fmt = format; - } -} - /* * Free 'value' members in array of NmcOutputField */ @@ -998,6 +893,7 @@ typedef struct { const PrintDataCol *col; const char *title; bool title_to_free:1; + bool skip:1; int width; } PrintDataHeaderCell; @@ -1009,8 +905,7 @@ typedef enum { typedef struct { guint row_idx; const PrintDataHeaderCell *header_cell; - NMMetaTermColor term_color; - NMMetaTermFormat term_format; + NMMetaColor color; union { const char *plain; const char *const*strv; @@ -1096,6 +991,7 @@ _print_fill (const NmcConfig *nmc_config, header_cell->col_idx = col_idx; header_cell->col = col; + header_cell->skip = FALSE; header_cell->title = nm_meta_abstract_info_get_name (info, TRUE); if ( nmc_config->multiline_output @@ -1116,9 +1012,7 @@ _print_fill (const NmcConfig *nmc_config, g_array_set_clear_func (cells, _print_data_cell_clear); g_array_set_size (cells, targets_len * header_row->len); - text_get_type = pretty - ? NM_META_ACCESSOR_GET_TYPE_PRETTY - : NM_META_ACCESSOR_GET_TYPE_PARSABLE; + text_get_type = nmc_print_output_to_accessor_get_type (nmc_config->print_output); text_get_flags = NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV; if (nmc_config->show_secrets) text_get_flags |= NM_META_ACCESSOR_GET_FLAGS_SHOW_SECRETS; @@ -1130,10 +1024,11 @@ _print_fill (const NmcConfig *nmc_config, for (i_col = 0; i_col < header_row->len; i_col++) { char *to_free = NULL; PrintDataCell *cell = &cells_line[i_col]; - const PrintDataHeaderCell *header_cell; + PrintDataHeaderCell *header_cell; const NMMetaAbstractInfo *info; NMMetaAccessorGetOutFlags text_out_flags, color_out_flags; gconstpointer value; + gboolean is_default; header_cell = &g_array_index (header_row, PrintDataHeaderCell, i_col); info = header_cell->col->selection_item->info; @@ -1148,35 +1043,40 @@ _print_fill (const NmcConfig *nmc_config, text_get_type, text_get_flags, &text_out_flags, + &is_default, (gpointer *) &to_free); + + nm_assert (!to_free || value == to_free); + + header_cell->skip = nmc_config->overview && is_default; + if (NM_FLAGS_HAS (text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_STRV)) { - if (value) { - if (nmc_config->multiline_output) { - cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; - cell->text.strv = value; - cell->text_to_free = !!to_free; - } else { + if (nmc_config->multiline_output) { + cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; + cell->text.strv = value; + cell->text_to_free = !!to_free; + } else { + if (value && ((const char *const*) value)[0]) { cell->text.plain = g_strjoinv (" | ", (char **) value); cell->text_to_free = TRUE; - if (to_free) - g_strfreev ((char **) to_free); } + if (to_free) + g_strfreev ((char **) to_free); } } else { cell->text.plain = value; cell->text_to_free = !!to_free; } - nm_meta_termformat_unpack (nm_meta_abstract_info_get (info, - nmc_meta_environment, - nmc_meta_environment_arg, - target, - NM_META_ACCESSOR_GET_TYPE_TERMFORMAT, - NM_META_ACCESSOR_GET_FLAGS_NONE, - &color_out_flags, - NULL), - &cell->term_color, - &cell->term_format); + cell->color = GPOINTER_TO_INT (nm_meta_abstract_info_get (info, + nmc_meta_environment, + nmc_meta_environment_arg, + target, + NM_META_ACCESSOR_GET_TYPE_COLOR, + NM_META_ACCESSOR_GET_FLAGS_NONE, + &color_out_flags, + NULL, + NULL)); if (cell->text_format == PRINT_DATA_CELL_FORMAT_TYPE_PLAIN) { if (pretty && (!cell->text.plain|| !cell->text.plain[0])) { @@ -1231,6 +1131,9 @@ _print_skip_column (const NmcConfig *nmc_config, selection_item = header_cell->col->selection_item; info = selection_item->info; + if (header_cell->skip) + return TRUE; + if (nmc_config->multiline_output) { if (info->meta_type == &nm_meta_type_setting_info_editor) { /* we skip the "name" entry for the setting in multiline output. */ @@ -1270,7 +1173,7 @@ _print_do (const NmcConfig *nmc_config, guint i_row, i_col; nm_auto_free_gstring GString *str = NULL; - g_assert (col_len && row_len); + g_assert (col_len); /* Main header */ if (pretty && header_name_no_l10n) { @@ -1358,9 +1261,7 @@ _print_do (const NmcConfig *nmc_config, gs_free char *text_to_free = NULL; const char *text; - text = colorize_string (nmc_config->use_colors, - cell->term_color, cell->term_format, - lines[i_lines], &text_to_free); + text = colorize_string (nmc_config, cell->color, lines[i_lines], &text_to_free); if (multiline) { gs_free char *prefix = NULL; @@ -1408,8 +1309,7 @@ _print_do (const NmcConfig *nmc_config, } if ( pretty - && ( i_row < row_len - 1 - || multiline)) { + && multiline) { gs_free char *line = NULL; g_print ("%s\n", (line = g_strnfill (ML_HEADER_WIDTH, '-'))); @@ -1489,7 +1389,7 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config) if ( nm_cli.nmc_config.in_editor || nm_cli.pager_pid > 0 || nmc_config->print_output == NMC_PRINT_TERSE - || !use_colors (nmc_config->use_colors) + || !nmc_config->use_colors || g_strcmp0 (pager, "") == 0 || getauxval (AT_SECURE)) return; @@ -1560,7 +1460,7 @@ nmc_terminal_spawn_pager (const NmcConfig *nmc_config) /*****************************************************************************/ static const char * -get_value_to_print (NmcColorOption color_option, +get_value_to_print (const NmcConfig *nmc_config, const NmcOutputField *field, gboolean field_name, const char *not_set_str, @@ -1586,7 +1486,7 @@ get_value_to_print (NmcColorOption color_option, } /* colorize the value */ - out = colorize_string (color_option, field->color, field->color_fmt, value, out_to_free); + out = colorize_string (nmc_config, field->color, value, out_to_free); if (out && out == free_value) { nm_assert (!*out_to_free); @@ -1680,7 +1580,7 @@ print_required_fields (const NmcConfig *nmc_config, gs_free char *tmp = NULL; val = *p ?: not_set_str; - print_val = colorize_string (nmc_config->use_colors, field_values[idx].color, field_values[idx].color_fmt, + print_val = colorize_string (nmc_config, field_values[idx].color, val, &val_to_free); tmp = g_strdup_printf ("%s%s%s[%d]:", section_prefix ? (const char*) field_values[0].value : "", @@ -1701,7 +1601,7 @@ print_required_fields (const NmcConfig *nmc_config, /* value is a string */ val = val && *val ? val : not_set_str; - print_val = colorize_string (nmc_config->use_colors, field_values[idx].color, field_values[idx].color_fmt, + print_val = colorize_string (nmc_config, field_values[idx].color, val, &val_to_free); tmp = g_strdup_printf ("%s%s%s:", section_prefix ? hdr_name : "", @@ -1732,7 +1632,7 @@ print_required_fields (const NmcConfig *nmc_config, idx = g_array_index (indices, int, i); - value = get_value_to_print (nmc_config->use_colors, (NmcOutputField *) field_values+idx, field_names, + value = get_value_to_print (nmc_config, (NmcOutputField *) field_values+idx, field_names, not_set_str, &val_to_free); if (terse) { @@ -1805,7 +1705,7 @@ print_data_prepare_width (GPtrArray *output_data) row = g_ptr_array_index (output_data, j); field_names = row[0].flags & NMC_OF_FLAG_FIELD_NAMES; - value = get_value_to_print (NMC_USE_COLOR_NO, row+i, field_names, "--", &val_to_free); + value = get_value_to_print (NULL, row+i, field_names, "--", &val_to_free); len = nmc_string_screen_width (value, NULL); max_width = len > max_width ? len : max_width; } diff --git a/clients/cli/utils.h b/clients/cli/utils.h index ffc5b6f3..19694d11 100644 --- a/clients/cli/utils.h +++ b/clients/cli/utils.h @@ -14,7 +14,7 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * - * Copyright 2010 - 2017 Red Hat, Inc. + * Copyright 2010 - 2018 Red Hat, Inc. */ #ifndef NMC_UTILS_H @@ -41,11 +41,7 @@ char *ssid_to_hex (const char *str, gsize len); void nmc_terminal_erase_line (void); void nmc_terminal_show_progress (const char *str); void nmc_terminal_spawn_pager (const NmcConfig *nmc_config); -gboolean nmc_term_use_colors (NmcColorOption color_option); -const char *nmc_term_color_sequence (NMMetaTermColor color); -const char *nmc_term_format_sequence (NMMetaTermFormat format); -NMMetaTermColor nmc_term_color_parse_string (const char *str, GError **error); -char *nmc_colorize (NmcColorOption color_option, NMMetaTermColor color, NMMetaTermFormat format, const char * fmt, ...) _nm_printf (4, 5); +char *nmc_colorize (const NmcConfig *nmc_config, NMMetaColor color, const char * fmt, ...) _nm_printf (3, 4); void nmc_filter_out_colors_inplace (char *str); char *nmc_filter_out_colors (const char *str); char *nmc_get_user_input (const char *ask_str); @@ -53,14 +49,12 @@ int nmc_string_to_arg_array (const char *line, const char *delim, gboolean unquo char ***argv, int *argc); const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); char * nmc_util_strv_for_display (const char *const*strv, gboolean brackets); -char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); int nmc_string_screen_width (const char *start, const char *end); void set_val_str (NmcOutputField fields_array[], guint32 index, char *value); void set_val_strc (NmcOutputField fields_array[], guint32 index, const char *value); void set_val_arr (NmcOutputField fields_array[], guint32 index, char **value); void set_val_arrc (NmcOutputField fields_array[], guint32 index, const char **value); -void set_val_color_all (NmcOutputField fields_array[], NMMetaTermColor color); -void set_val_color_fmt_all (NmcOutputField fields_array[], NMMetaTermFormat format); +void set_val_color_all (NmcOutputField fields_array[], NMMetaColor color); void nmc_free_output_field_values (NmcOutputField fields_array[]); GArray *parse_output_fields (const char *fields_str, @@ -127,12 +121,43 @@ typedef enum { NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM, + NMC_GENERIC_INFO_TYPE_CON_SHOW_NAME = 0, + NMC_GENERIC_INFO_TYPE_CON_SHOW_UUID, + NMC_GENERIC_INFO_TYPE_CON_SHOW_TYPE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP, + NMC_GENERIC_INFO_TYPE_CON_SHOW_TIMESTAMP_REAL, + NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT, + NMC_GENERIC_INFO_TYPE_CON_SHOW_AUTOCONNECT_PRIORITY, + NMC_GENERIC_INFO_TYPE_CON_SHOW_READONLY, + NMC_GENERIC_INFO_TYPE_CON_SHOW_DBUS_PATH, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_DEVICE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_STATE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_ACTIVE_PATH, + NMC_GENERIC_INFO_TYPE_CON_SHOW_SLAVE, + NMC_GENERIC_INFO_TYPE_CON_SHOW_FILENAME, + _NMC_GENERIC_INFO_TYPE_CON_SHOW_NUM, + + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NAME = 0, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_UUID, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEVICES, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_STATE, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DEFAULT6, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_SPEC_OBJECT, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_VPN, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_DBUS_PATH, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_CON_PATH, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_ZONE, + NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_MASTER_PATH, + _NMC_GENERIC_INFO_TYPE_CON_ACTIVE_GENERAL_NUM, + } NmcGenericInfoType; -#define NMC_HANDLE_TERMFORMAT(color) \ +#define NMC_HANDLE_COLOR(color) \ G_STMT_START { \ - if (get_type == NM_META_ACCESSOR_GET_TYPE_TERMFORMAT) \ - return nm_meta_termformat_pack ((color), NM_META_TERM_FORMAT_NORMAL); \ + if (get_type == NM_META_ACCESSOR_GET_TYPE_COLOR) \ + return GINT_TO_POINTER (color); \ } G_STMT_END struct _NmcMetaGenericInfo { @@ -144,14 +169,19 @@ struct _NmcMetaGenericInfo { const char *name; const char *name_header; const NmcMetaGenericInfo *const*nested; - gconstpointer (*get_fcn) (const NMMetaEnvironment *environment, - gpointer environment_user_data, - const NmcMetaGenericInfo *info, - gpointer target, - NMMetaAccessorGetType get_type, - NMMetaAccessorGetFlags get_flags, - NMMetaAccessorGetOutFlags *out_flags, - gpointer *out_to_free); + +#define NMC_META_GENERIC_INFO_GET_FCN_ARGS \ + const NMMetaEnvironment *environment, \ + gpointer environment_user_data, \ + const NmcMetaGenericInfo *info, \ + gpointer target, \ + NMMetaAccessorGetType get_type, \ + NMMetaAccessorGetFlags get_flags, \ + NMMetaAccessorGetOutFlags *out_flags, \ + gboolean *out_is_default, \ + gpointer *out_to_free + + gconstpointer (*get_fcn) (NMC_META_GENERIC_INFO_GET_FCN_ARGS); }; #define NMC_META_GENERIC(n, ...) \ @@ -164,6 +194,52 @@ struct _NmcMetaGenericInfo { #define NMC_META_GENERIC_WITH_NESTED(n, nest, ...) \ NMC_META_GENERIC (n, .nested = (nest), __VA_ARGS__) +#define NMC_META_GENERIC_GROUP(_group_name, _nested, _name_header) \ + ((const NMMetaAbstractInfo *const*) ((const NmcMetaGenericInfo *const[]) { \ + NMC_META_GENERIC_WITH_NESTED (_group_name,_nested, .name_header = _name_header), \ + NULL, \ + })) + +static inline const char * +nmc_meta_generic_get_str_i18n (const char *s, NMMetaAccessorGetType get_type) +{ + if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, + NM_META_ACCESSOR_GET_TYPE_PARSABLE)) + g_return_val_if_reached (NULL); + + if (!s) + return NULL; + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return gettext (s); + return s; +} + +static inline const char * +nmc_meta_generic_get_bool (gboolean val, NMMetaAccessorGetType get_type) +{ + return nmc_meta_generic_get_str_i18n (val ? N_("yes") : N_("no"), get_type); +} + +static inline char * +nmc_meta_generic_get_enum_with_detail (gint64 enum_val, const char *str_val, NMMetaAccessorGetType get_type) +{ + if (!NM_IN_SET (get_type, NM_META_ACCESSOR_GET_TYPE_PRETTY, + NM_META_ACCESSOR_GET_TYPE_PARSABLE)) + g_return_val_if_reached (NULL); + + if (!str_val) { + /* Pass %NULL for only printing the numeric value. */ + return g_strdup_printf ("%lld", (long long) enum_val); + } + + /* note that this function will always print "$NUM ($NICK)", also in PARSABLE + * mode. That might not be desired, but it's done for certain properties to preserve + * previous behavior. */ + if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) + return g_strdup_printf (_("%lld (%s)"), (long long) enum_val, gettext (str_val)); + return g_strdup_printf ("%lld (%s)", (long long) enum_val, str_val); +} + /*****************************************************************************/ gboolean nmc_print (const NmcConfig *nmc_config, diff --git a/clients/common/meson.build b/clients/common/meson.build new file mode 100644 index 00000000..f0c81600 --- /dev/null +++ b/clients/common/meson.build @@ -0,0 +1,76 @@ +common_inc = include_directories('.') + +nm_polkit_listener = files('nm-polkit-listener.c') + +deps = [ + libnm_dep, + nm_core_dep +] + +cflags = clients_cflags + [ + '-DG_LOG_DOMAIN="libnmc"', +] + +libnmc_base = static_library( + 'nmc-base', + sources: shared_files_clients_common + files( + 'nm-client-utils.c', + 'nm-secret-agent-simple.c', + 'nm-vpn-helpers.c', + ), + dependencies: deps, + c_args: cflags +) + +libnmc_base_dep = declare_dependency( + include_directories: common_inc, + link_with: libnmc_base +) + +settings_docs = 'settings-docs.h' + +if enable_introspection + settings_docs_source = custom_target( + settings_docs, + input: nm_property_docs, + output: settings_docs, + command: [xsltproc, '--output', '@OUTPUT@', join_paths(meson.current_source_dir(), 'settings-docs.xsl'), '@INPUT@'] + ) + + # FIXME: if enabled the check happens even if the settings_docs_source is not set + ''' + if get_option('check_settings_docs') + res = run_command(find_program('cmp'), '-s', settings_docs + '.in', settings_docs_source.full_path()) + if res.returncode() != 0 + message('The generated file ' + settings_docs_source.full_path() + ' differs from the source file ' + settings_docs + '.in' + '. You probably should copy the generated file over to the source file. You can skip this test by setting -Dcheck_settings_docs=false') + endif + endif + ''' +else + settings_docs_source = configure_file( + input: settings_docs + '.in', + output: settings_docs, + configuration: configuration_data() + ) +endif + +libnmc = static_library( + 'nmc', + sources: files( + 'nm-meta-setting-access.c', + 'nm-meta-setting-desc.c' + ) + shared_nm_utils_nm_meta_setting_c + [settings_docs_source], + dependencies: deps, + c_args: cflags, + link_with: libnmc_base, + link_depends: settings_docs_source +) + +libnmc_dep = declare_dependency( + include_directories: common_inc, + link_with: libnmc +) + +if (enable_introspection or enable_nmtui) and enable_tests + subdir('tests') +endif diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index b6ec92de..fec6e33b 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -20,11 +20,53 @@ #include "nm-default.h" #include "nm-client-utils.h" +#include "nm-utils.h" #include "nm-device-bond.h" #include "nm-device-bridge.h" #include "nm-device-team.h" +/*****************************************************************************/ + +static int +_nmc_objects_sort_by_path_cmp (gconstpointer pa, gconstpointer pb, gpointer user_data) +{ + NMObject *a = *((NMObject **) pa); + NMObject *b = *((NMObject **) pb); + + NM_CMP_SELF (a, b); + NM_CMP_RETURN (nm_utils_dbus_path_cmp (nm_object_get_path (a), + nm_object_get_path (b))); + return 0; +} + +const NMObject ** +nmc_objects_sort_by_path (const NMObject *const* objs, gssize len) +{ + const NMObject **arr; + gsize i, l; + + if (len < 0) + l = NM_PTRARRAY_LEN (objs); + else + l = len; + + arr = g_new (const NMObject *, l + 1); + for (i = 0; i < l; i++) + arr[i] = objs[i]; + arr[l] = NULL; + + if (l > 1) { + g_qsort_with_data (arr, + l, + sizeof (gpointer), + _nmc_objects_sort_by_path_cmp, + NULL); + } + return arr; +} + +/*****************************************************************************/ /* * Convert string to unsigned integer. * If required, the resulting number is checked to be in the range. @@ -69,7 +111,7 @@ nmc_string_to_bool (const char *str, gboolean *val_bool, GError **error) if (g_strcmp0 (str, "o") == 0) { g_set_error (error, 1, 0, - /* Translators: the first %s is the partial value entered by + /* TRANSLATORS: the first %s is the partial value entered by * the user, the second %s a list of compatible values. */ _("'%s' is ambiguous (%s)"), str, "on x off"); @@ -100,7 +142,7 @@ nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError **error) if (g_strcmp0 (str, "o") == 0) { g_set_error (error, 1, 0, - /* Translators: the first %s is the partial value entered by + /* TRANSLATORS: the first %s is the partial value entered by * the user, the second %s a list of compatible values. */ _("'%s' is ambiguous (%s)"), str, "on x off"); @@ -133,10 +175,10 @@ nmc_string_is_valid (const char *input, const char **allowed, GError **error) { const char **p; size_t input_ln, p_len; - gboolean prev_match = FALSE; - const char *ret = NULL; + const char *partial_match = NULL; + gboolean ambiguous = FALSE; - g_return_val_if_fail (error == NULL || *error == NULL, NULL); + g_return_val_if_fail (!error || !*error, NULL); if (!input || !*input) goto finish; @@ -145,24 +187,34 @@ nmc_string_is_valid (const char *input, const char **allowed, GError **error) for (p = allowed; p && *p; p++) { p_len = strlen (*p); if (g_ascii_strncasecmp (input, *p, input_ln) == 0) { - if (input_ln == p_len) { - ret = *p; - break; - } - if (!prev_match) - ret = *p; - else { - g_set_error (error, 1, 1, _("'%s' is ambiguous (%s x %s)"), - input, ret, *p); - return NULL; - } - prev_match = TRUE; + if (input_ln == p_len) + return *p; + if (!partial_match) + partial_match = *p; + else + ambiguous = TRUE; } } + if (ambiguous) { + GString *candidates = g_string_new (""); + + for (p = allowed; *p; p++) { + if (g_ascii_strncasecmp (input, *p, input_ln) == 0) { + if (candidates->len > 0) + g_string_append (candidates, ", "); + g_string_append (candidates, *p); + } + } + g_set_error (error, 1, 1, _("'%s' is ambiguous: %s"), + input, candidates->str); + g_string_free (candidates, TRUE); + return NULL; + } finish: - if (ret == NULL) { + if (!partial_match) { char *valid_vals = g_strjoinv (", ", (char **) allowed); + if (!input || !*input) g_set_error (error, 1, 0, _("missing name, try one of [%s]"), valid_vals); else @@ -170,19 +222,8 @@ finish: g_free (valid_vals); } - return ret; -} -/* - * Wrapper function for g_strsplit_set() that removes empty strings - * from the vector as they are not useful in most cases. - */ -char ** -nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens) -{ - /* remove empty strings */ - return _nm_utils_strv_cleanup (g_strsplit_set (str, delimiter, max_tokens), - FALSE, TRUE, FALSE); + return partial_match; } gboolean @@ -518,3 +559,72 @@ nmc_activation_get_effective_state (NMActiveConnection *active, return ac_state; } + +static gboolean +can_show_graphics (void) +{ + static gboolean can_show_graphics_set = FALSE; + gboolean can_show_graphics = TRUE; + char *locale_str; + + if (G_LIKELY (can_show_graphics_set)) + return can_show_graphics; + + if (!g_get_charset (NULL)) { + /* Non-UTF-8 locale */ + locale_str = g_locale_from_utf8 ("\342\226\202\342\226\204\342\226\206\342\226\210", -1, NULL, NULL, NULL); + if (locale_str) + g_free (locale_str); + else + can_show_graphics = FALSE; + } + + /* The linux console font typically doesn't have characters we need */ + if (g_strcmp0 (g_getenv ("TERM"), "linux") == 0) + can_show_graphics = FALSE; + + return can_show_graphics; +} + +/** + * nmc_wifi_strength_bars: + * @strength: the access point strength, from 0 to 100 + * + * Converts @strength into a 4-character-wide graphical representation of + * strength suitable for printing to stdout. If the current locale and terminal + * support it, this will use unicode graphics characters to represent + * "bars". Otherwise it will use 0 to 4 asterisks. + * + * Returns: the graphical representation of the access point strength + */ +const char * +nmc_wifi_strength_bars (guint8 strength) +{ + if (!can_show_graphics ()) + return nm_utils_wifi_strength_bars (strength); + + if (strength > 80) + return /* ▂▄▆█ */ "\342\226\202\342\226\204\342\226\206\342\226\210"; + else if (strength > 55) + return /* ▂▄▆_ */ "\342\226\202\342\226\204\342\226\206_"; + else if (strength > 30) + return /* ▂▄__ */ "\342\226\202\342\226\204__"; + else if (strength > 5) + return /* ▂___ */ "\342\226\202___"; + else + return /* ____ */ "____"; +} + +/** + * nmc_utils_password_subst_char: + * + * Returns: the string substituted when hiding actual password glyphs + */ +const char * +nmc_password_subst_char (void) +{ + if (can_show_graphics ()) + return "\u2022"; /* Bullet */ + else + return "*"; +} diff --git a/clients/common/nm-client-utils.h b/clients/common/nm-client-utils.h index ac18fe94..cc0b7330 100644 --- a/clients/common/nm-client-utils.h +++ b/clients/common/nm-client-utils.h @@ -30,9 +30,9 @@ typedef enum { NMC_TRI_STATE_UNKNOWN, } NMCTriStateValue; -const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); +const NMObject **nmc_objects_sort_by_path (const NMObject *const*objs, gssize len); -char **nmc_strsplit_set (const char *str, const char *delimiter, int max_tokens); +const char *nmc_string_is_valid (const char *input, const char **allowed, GError **error); gboolean nmc_string_to_uint (const char *str, gboolean range_check, @@ -44,7 +44,7 @@ gboolean nmc_string_to_tristate (const char *str, NMCTriStateValue *val, GError gboolean matches (const char *cmd, const char *pattern); -/* FIXME: don't expose this function on it's own, at least not from this file. */ +/* FIXME: don't expose this function on its own, at least not from this file. */ const char *nmc_bond_validate_mode (const char *mode, GError **error); const char *nm_active_connection_state_reason_to_string (NMActiveConnectionStateReason reason); @@ -56,4 +56,8 @@ NMActiveConnectionState nmc_activation_get_effective_state (NMActiveConnection * NMDevice *device, const char **reason); +const char *nmc_wifi_strength_bars (guint8 strength); + +const char *nmc_password_subst_char (void); + #endif /* __NM_CLIENT_UTILS_H__ */ diff --git a/clients/common/nm-meta-setting-access.c b/clients/common/nm-meta-setting-access.c index cd7ef783..a1bfed47 100644 --- a/clients/common/nm-meta-setting-access.c +++ b/clients/common/nm-meta-setting-access.c @@ -232,6 +232,7 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, + gboolean *out_is_default, gpointer *out_to_free) { nm_assert (abstract_info); @@ -240,6 +241,7 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, nm_assert (out_flags); *out_flags = NM_META_ACCESSOR_GET_OUT_FLAGS_NONE; + NM_SET_OUT (out_is_default, FALSE); if (!abstract_info->meta_type->get_fcn) g_return_val_if_reached (NULL); @@ -251,6 +253,7 @@ nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info, get_type, get_flags, out_flags, + out_is_default, out_to_free); } diff --git a/clients/common/nm-meta-setting-access.h b/clients/common/nm-meta-setting-access.h index 54fc6c84..577cad78 100644 --- a/clients/common/nm-meta-setting-access.h +++ b/clients/common/nm-meta-setting-access.h @@ -58,6 +58,7 @@ gconstpointer nm_meta_abstract_info_get (const NMMetaAbstractInfo *abstract_info NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, + gboolean *out_is_default, gpointer *out_to_free); const char *const*nm_meta_abstract_info_complete (const NMMetaAbstractInfo *abstract_info, diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 94404e90..3e4bd1bb 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -25,10 +25,8 @@ #include #include "nm-common-macros.h" -#include "nm-utils/nm-hash-utils.h" #include "nm-utils/nm-enum-utils.h" -#include "NetworkManager.h" #include "nm-vpn-helpers.h" #include "nm-client-utils.h" #include "nm-meta-setting-access.h" @@ -118,7 +116,6 @@ _parse_ip_route (int family, GError **error) { const int MAX_PREFIX = (family == AF_INET) ? 32 : 128; - char *plen = NULL; const char *next_hop = NULL; const char *canon_dest; int prefix; @@ -126,9 +123,11 @@ _parse_ip_route (int family, GError *local = NULL; gint64 metric = -1; guint i; - gs_strfreev char **routev = NULL; + gs_free const char **routev = NULL; gs_free char *str_clean = NULL; - char *dest; + 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] ...]'") @@ -138,8 +137,8 @@ _parse_ip_route (int family, nm_assert (!error || !*error); str_clean = g_strstrip (g_strdup (str)); - routev = nmc_strsplit_set (str_clean, " \t", 0); - if (!routev || !routev[0]) { + routev = nm_utils_strsplit_set (str_clean, " \t"); + if (!routev) { g_set_error (error, 1, 0, "'%s' is not valid. %s", str, ROUTE_SYNTAX); @@ -148,8 +147,13 @@ _parse_ip_route (int family, dest = routev[0]; plen = strchr (dest, '/'); /* prefix delimiter */ - if (plen) - *plen++ = '\0'; + if (plen) { + dest_clone = g_strdup (dest); + plen = &dest_clone[plen - dest]; + dest = dest_clone; + *((char *) plen) = '\0'; + plen++; + } prefix = MAX_PREFIX; if (plen) { if ((prefix = _nm_utils_ascii_str_to_int64 (plen, 10, 1, MAX_PREFIX, -1)) == -1) { @@ -296,7 +300,7 @@ static NMTeamLinkWatcher * _parse_team_link_watcher (const char *str, GError **error) { - gs_strfreev char **watcherv = NULL; + gs_free const char **watcherv = NULL; gs_free char *str_clean = NULL; guint i; gs_free const char *name = NULL; @@ -309,17 +313,17 @@ _parse_team_link_watcher (const char *str, nm_assert (!error || !*error); str_clean = g_strstrip (g_strdup (str)); - watcherv = nmc_strsplit_set (str_clean, " \t", 0); - if (!watcherv || !watcherv[0]) { + watcherv = nm_utils_strsplit_set (str_clean, " \t"); + if (!watcherv) { g_set_error (error, 1, 0, "'%s' is not valid", str); return NULL; } for (i = 0; watcherv[i]; i++) { - gs_strfreev char **pair = NULL; + gs_free const char **pair = NULL; - pair = nmc_strsplit_set (watcherv[i], "=", 0); - if (!pair[0]) { + 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'"); return NULL; @@ -605,7 +609,6 @@ _get_text_hidden (NMMetaAccessorGetType get_type) return NM_META_TEXT_HIDDEN; } - /*****************************************************************************/ G_GNUC_PRINTF (4, 5) @@ -636,7 +639,7 @@ _env_warn_fcn (const NMMetaEnvironment *environment, const NMMetaPropertyInfo *property_info, char **out_to_free #define ARGS_GET_FCN \ - const NMMetaPropertyInfo *property_info, const NMMetaEnvironment *environment, gpointer environment_user_data, NMSetting *setting, NMMetaAccessorGetType get_type, NMMetaAccessorGetFlags get_flags, NMMetaAccessorGetOutFlags *out_flags, gpointer *out_to_free + 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 @@ -669,6 +672,33 @@ _env_warn_fcn (const NMMetaEnvironment *environment, return ((*(out_to_free)) = _val); \ } G_STMT_END +static gboolean +property_is_default (NMSetting *setting, const char *prop_name) +{ + nm_auto_unset_gvalue GValue v = G_VALUE_INIT; + GParamSpec *pspec; + GHashTable *ht; + char **strv; + + 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 (&v, pspec->value_type); + g_object_get_property (G_OBJECT (setting), prop_name, &v); + + if (pspec->value_type == G_TYPE_STRV) { + strv = g_value_get_boxed (&v); + return !strv || !strv[0]; + } else if (pspec->value_type == G_TYPE_HASH_TABLE) { + ht = g_value_get_boxed (&v); + return !ht || !g_hash_table_size (ht); + } + + return g_param_value_defaults (pspec, &v); +} + static gconstpointer _get_fcn_nmc_with_default (ARGS_GET_FCN) { @@ -677,6 +707,7 @@ _get_fcn_nmc_with_default (ARGS_GET_FCN) GValue val = G_VALUE_INIT; RETURN_UNSUPPORTED_GET_TYPE (); + NM_SET_OUT (out_is_default, property_is_default (setting, property_info->property_name)); if (property_info->property_typ_data->subtype.get_with_default.fcn (setting)) { if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) @@ -692,6 +723,7 @@ _get_fcn_nmc_with_default (ARGS_GET_FCN) else s_full = g_strdup (s && *s ? s : " "); g_value_unset (&val); + RETURN_STR_TO_FREE (s_full); } @@ -699,6 +731,7 @@ static gconstpointer _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, NMSetting *setting, NMMetaAccessorGetType get_type, + gboolean *out_is_default, gpointer *out_to_free) { char *s; @@ -707,6 +740,7 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, 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)); gtype_prop = _gobject_property_get_gtype (G_OBJECT (setting), property_info->property_name); @@ -732,13 +766,13 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, static gconstpointer _get_fcn_gobject (ARGS_GET_FCN) { - return _get_fcn_gobject_impl (property_info, setting, get_type, out_to_free); + return _get_fcn_gobject_impl (property_info, setting, get_type, out_is_default, out_to_free); } static gconstpointer _get_fcn_gobject_int (ARGS_GET_FCN) { - const GParamSpec *pspec; + GParamSpec *pspec; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; gint64 v; const NMMetaUtilsIntValueInfo *value_infos; @@ -751,6 +785,7 @@ _get_fcn_gobject_int (ARGS_GET_FCN) g_value_init (&gval, pspec->value_type); g_object_get_property (G_OBJECT (setting), property_info->property_name, &gval); + NM_SET_OUT (out_is_default, g_param_value_defaults (pspec, &gval)); switch (pspec->value_type) { case G_TYPE_INT: v = g_value_get_int (&gval); @@ -790,10 +825,11 @@ _get_fcn_gobject_mtu (ARGS_GET_FCN) if ( !property_info->property_typ_data || !property_info->property_typ_data->subtype.mtu.get_fcn) - return _get_fcn_gobject_impl (property_info, setting, get_type, out_to_free); + return _get_fcn_gobject_impl (property_info, setting, get_type, out_is_default, out_to_free); mtu = property_info->property_typ_data->subtype.mtu.get_fcn (setting); if (mtu == 0) { + NM_SET_OUT (out_is_default, TRUE); if (get_type == NM_META_ACCESSOR_GET_TYPE_PRETTY) return _("auto"); return "auto"; @@ -820,9 +856,9 @@ static gconstpointer _get_fcn_gobject_enum (ARGS_GET_FCN) { GType gtype = 0; - GType gtype_prop; nm_auto_unref_gtypeclass GTypeClass *gtype_class = NULL; nm_auto_unref_gtypeclass GTypeClass *gtype_prop_class = NULL; + const struct _NMUtilsEnumValueInfo *value_infos = NULL; gboolean has_gtype = FALSE; nm_auto_unset_gvalue GValue gval = G_VALUE_INIT; gint64 v; @@ -833,6 +869,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) gboolean format_text_l10n = FALSE; gs_free char *s = NULL; char s_numeric[64]; + GParamSpec *pspec; RETURN_UNSUPPORTED_GET_TYPE (); @@ -875,25 +912,26 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) nm_assert (format_text || format_numeric); - gtype_prop = _gobject_property_get_gtype (G_OBJECT (setting), property_info->property_name); - - g_value_init (&gval, gtype_prop); + pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (setting), property_info->property_name); + g_return_val_if_fail (pspec, NULL); + g_value_init (&gval, pspec->value_type); g_object_get_property (G_OBJECT (setting), property_info->property_name, &gval); + NM_SET_OUT (out_is_default, g_param_value_defaults (pspec, &gval)); - if ( gtype_prop == G_TYPE_INT - || ( G_TYPE_IS_CLASSED (gtype_prop) - && G_IS_ENUM_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (gtype_prop)))))) { - if (gtype_prop == G_TYPE_INT) { + if ( pspec->value_type == G_TYPE_INT + || ( G_TYPE_IS_CLASSED (pspec->value_type) + && G_IS_ENUM_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (pspec->value_type)))))) { + if (pspec->value_type == G_TYPE_INT) { if (!has_gtype) g_return_val_if_reached (NULL); v = g_value_get_int (&gval); } else v = g_value_get_enum (&gval); - } else if ( gtype_prop == G_TYPE_UINT - || ( G_TYPE_IS_CLASSED (gtype_prop) - && G_IS_FLAGS_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (gtype_prop)))))) { - if (gtype_prop == G_TYPE_UINT) { + } else if ( pspec->value_type == G_TYPE_UINT + || ( G_TYPE_IS_CLASSED (pspec->value_type) + && G_IS_FLAGS_CLASS ((gtype_prop_class ?: (gtype_prop_class = g_type_class_ref (pspec->value_type)))))) { + if (pspec->value_type == G_TYPE_UINT) { if (!has_gtype) g_return_val_if_reached (NULL); v = g_value_get_uint (&gval); @@ -903,7 +941,7 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) g_return_val_if_reached (NULL); if (!has_gtype) { - gtype = gtype_prop; + gtype = pspec->value_type; gtype_class = g_steal_pointer (>ype_prop_class); } @@ -927,7 +965,9 @@ _get_fcn_gobject_enum (ARGS_GET_FCN) /* the gobject_enum.value_infos are currently ignored for the getter. They * only declare additional aliases for the setter. */ - s = nm_utils_enum_to_str (gtype, (int) v); + if (property_info->property_typ_data) + value_infos = property_info->property_typ_data->subtype.gobject_enum.value_infos_get; + s = _nm_utils_enum_to_str_full (gtype, (int) v, ", ", value_infos); if (!format_numeric) RETURN_STR_TO_FREE (g_steal_pointer (&s)); @@ -1150,7 +1190,6 @@ _set_fcn_gobject_mac (ARGS_SET_FCN) else mode = NM_META_PROPERTY_TYPE_MAC_MODE_DEFAULT; - if (mode == NM_META_PROPERTY_TYPE_MAC_MODE_INFINIBAND) valid = nm_utils_hwaddr_valid (value, INFINIBAND_ALEN); else { @@ -1168,39 +1207,6 @@ _set_fcn_gobject_mac (ARGS_SET_FCN) return TRUE; } -static gboolean -_set_fcn_gobject_secret_flags (ARGS_SET_FCN) -{ - char **strv = NULL, **iter; - unsigned long flags = 0, val_int; - - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); - - strv = nmc_strsplit_set (value, " \t,", 0); - for (iter = strv; iter && *iter; iter++) { - if (!nmc_string_to_uint (*iter, TRUE, 0, ALL_SECRET_FLAGS, &val_int)) { - g_set_error (error, 1, 0, _("'%s' is not a valid flag number; use <0-%d>"), - *iter, ALL_SECRET_FLAGS); - g_strfreev (strv); - return FALSE; - } - flags += val_int; - } - g_strfreev (strv); - - /* Validate the flags number */ - if (flags > ALL_SECRET_FLAGS) { - flags = ALL_SECRET_FLAGS; - _env_warn_fcn (environment, environment_user_data, - NM_META_ENV_WARN_LEVEL_WARN, - N_("'%s' sum is higher than all flags => all flags set"), - value); - } - - g_object_set (setting, property_info->property_name, (guint) flags, NULL); - return TRUE; -} - static gboolean _set_fcn_gobject_enum (ARGS_SET_FCN) { @@ -1320,7 +1326,7 @@ _values_fcn_gobject_enum (ARGS_VALUES_FCN) gboolean has_minmax = FALSE; int min = G_MININT; int max = G_MAXINT; - char **v, **w; + char **v; if (property_info->property_typ_data) { if ( property_info->property_typ_data->subtype.gobject_enum.min @@ -1354,11 +1360,7 @@ _values_fcn_gobject_enum (ARGS_VALUES_FCN) /* the gobject_enum.value_infos are currently ignored for the list of * values. They only declare additional (hidden) aliases for the setter. */ - v = (char **) nm_utils_enum_get_values (gtype, min, max); - if (v) { - for (w = v; *w; w++) - *w = g_strdup (*w); - } + v = nm_utils_strv_make_deep_copied (nm_utils_enum_get_values (gtype, min, max)); return (const char *const*) (*out_to_free = v); } @@ -1505,24 +1507,6 @@ vlan_priorities_to_string (NMSettingVlan *s_vlan, NMVlanPriorityMap map) return g_string_free (priorities, FALSE); } -static char * -ip6_privacy_to_string (NMSettingIP6ConfigPrivacy ip6_privacy, NMMetaAccessorGetType get_type) -{ - if (get_type != NM_META_ACCESSOR_GET_TYPE_PRETTY) - return g_strdup_printf ("%d", ip6_privacy); - - switch (ip6_privacy) { - case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED: - return g_strdup_printf (_("%d (disabled)"), ip6_privacy); - case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR: - return g_strdup_printf (_("%d (enabled, prefer public IP)"), ip6_privacy); - case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR: - return g_strdup_printf (_("%d (enabled, prefer temporary IP)"), ip6_privacy); - default: - return g_strdup_printf (_("%d (unknown)"), ip6_privacy); - } -} - static char * secret_flags_to_string (guint32 flags, NMMetaAccessorGetType get_type) { @@ -1573,18 +1557,19 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) const char **valid_strv, \ GError **error) \ { \ - char **strv = NULL, **iter; \ + gs_free const char **strv = NULL; \ + gsize i; \ const char *item; \ - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \ - strv = nmc_strsplit_set (value, " \t,", 0); \ - for (iter = strv; iter && *iter; iter++) { \ - if (!(item = nmc_string_is_valid (g_strstrip (*iter), valid_strv, error))) { \ - g_strfreev (strv); \ - return FALSE; \ + nm_assert (!error || !*error); \ + strv = nm_utils_strsplit_set (value, " \t,"); \ + 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); \ } \ - set_func (s_macro (setting), item); \ } \ - g_strfreev (strv); \ return TRUE; \ } @@ -1592,43 +1577,42 @@ vpn_data_item (const char *key, const char *value, gpointer user_data) static gboolean \ def_func (ARGS_SET_FCN) \ { \ - char **strv = NULL, **iter; \ + 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; \ \ - g_return_val_if_fail (error == NULL || *error == NULL, FALSE); \ + nm_assert (!error || !*error); \ \ - strv = nmc_strsplit_set (value, ",", 0); \ + strv = nm_utils_strsplit_set (value, ","); \ for (iter = strv; iter && *iter; iter++) { \ - char *left = g_strstrip (*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