From 50f6b47074e01dffb8dc536c0a20961dcf28ae9b Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 7 Feb 2018 02:39:23 +0100 Subject: New upstream version 1.10.4 --- Makefile.am | 14 +- Makefile.in | 598 +-- NEWS | 17 + clients/cli/agent.c | 8 +- clients/cli/devices.c | 4 +- clients/cli/nmcli.c | 18 +- clients/common/nm-client-utils.c | 5 +- clients/common/nm-meta-setting-desc.c | 14 +- clients/common/settings-docs.c | 2 +- clients/common/settings-docs.c.in | 2 +- config.h.in | 3 + configure | 141 +- configure.ac | 14 +- docs/api/Makefile.in | 23 + docs/api/html/NetworkManager.conf.html | 4 +- docs/api/html/NetworkManager.devhelp2 | 2 + docs/api/html/NetworkManager.html | 4 +- docs/api/html/ch01.html | 4 +- docs/api/html/dbus-secret-agent.html | 4 +- docs/api/html/dbus-types.html | 4 +- docs/api/html/dbus-vpn-types.html | 4 +- ...org.freedesktop.NetworkManager.AccessPoint.html | 4 +- ...rg.freedesktop.NetworkManager.AgentManager.html | 4 +- ...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 | 4 +- ...g.freedesktop.NetworkManager.Device.Bridge.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Dummy.html | 4 +- ....freedesktop.NetworkManager.Device.Generic.html | 4 +- ...freedesktop.NetworkManager.Device.IPTunnel.html | 4 +- ...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 | 4 +- ...eedesktop.NetworkManager.Device.Statistics.html | 4 +- ...org.freedesktop.NetworkManager.Device.Team.html | 4 +- ...-org.freedesktop.NetworkManager.Device.Tun.html | 4 +- ...org.freedesktop.NetworkManager.Device.Veth.html | 4 +- ...org.freedesktop.NetworkManager.Device.Vlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Vxlan.html | 4 +- ...rg.freedesktop.NetworkManager.Device.WiMax.html | 4 +- ...rg.freedesktop.NetworkManager.Device.Wired.html | 4 +- ...freedesktop.NetworkManager.Device.Wireless.html | 4 +- ...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 | 4 +- ...org.freedesktop.NetworkManager.SecretAgent.html | 4 +- ...desktop.NetworkManager.Settings.Connection.html | 4 +- ...us-org.freedesktop.NetworkManager.Settings.html | 4 +- ....freedesktop.NetworkManager.VPN.Connection.html | 4 +- ...-org.freedesktop.NetworkManager.VPN.Plugin.html | 4 +- .../html/gdbus-org.freedesktop.NetworkManager.html | 4 +- docs/api/html/index.html | 6 +- docs/api/html/ix01.html | 1338 +++---- docs/api/html/license.html | 4 +- docs/api/html/manpages.html | 4 +- docs/api/html/nm-dbus-types.html | 34 +- docs/api/html/nm-online.html | 4 +- docs/api/html/nm-openvswitch.html | 24 +- docs/api/html/nm-settings-ifcfg-rh.html | 4 +- docs/api/html/nm-settings-keyfile.html | 4 +- docs/api/html/nm-settings.html | 6 +- docs/api/html/nm-vpn-dbus-types.html | 4 +- docs/api/html/nmcli-examples.html | 4 +- docs/api/html/nmcli.html | 4 +- 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-devices.html | 4 +- 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 | 4 +- 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 | 4 +- docs/api/html/settings-802-11-wireless.html | 4 +- docs/api/html/settings-802-1x.html | 4 +- docs/api/html/settings-802-3-ethernet.html | 4 +- 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 | 4 +- docs/api/html/settings-cdma.html | 4 +- docs/api/html/settings-connection.html | 4 +- docs/api/html/settings-dcb.html | 4 +- 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 | 4 +- docs/api/html/settings-ipv4.html | 4 +- docs/api/html/settings-ipv6.html | 4 +- docs/api/html/settings-macsec.html | 4 +- docs/api/html/settings-macvlan.html | 4 +- docs/api/html/settings-ovs-bridge.html | 4 +- docs/api/html/settings-ovs-interface.html | 4 +- docs/api/html/settings-ovs-patch.html | 4 +- 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 | 4 +- docs/api/html/vpn-plugins.html | 4 +- docs/api/settings-spec.xml | 2 +- docs/api/version.xml | 2 +- docs/libnm-glib/Makefile.in | 23 + docs/libnm-glib/html/NMAccessPoint.html | 4 +- docs/libnm-glib/html/NMActiveConnection.html | 4 +- docs/libnm-glib/html/NMClient.html | 4 +- docs/libnm-glib/html/NMDHCP4Config.html | 4 +- docs/libnm-glib/html/NMDHCP6Config.html | 4 +- docs/libnm-glib/html/NMDevice.html | 4 +- docs/libnm-glib/html/NMDeviceAdsl.html | 4 +- docs/libnm-glib/html/NMDeviceBond.html | 4 +- docs/libnm-glib/html/NMDeviceBridge.html | 4 +- docs/libnm-glib/html/NMDeviceBt.html | 4 +- docs/libnm-glib/html/NMDeviceEthernet.html | 4 +- docs/libnm-glib/html/NMDeviceGeneric.html | 4 +- docs/libnm-glib/html/NMDeviceInfiniband.html | 4 +- docs/libnm-glib/html/NMDeviceModem.html | 4 +- docs/libnm-glib/html/NMDeviceOlpcMesh.html | 4 +- docs/libnm-glib/html/NMDeviceTeam.html | 4 +- docs/libnm-glib/html/NMDeviceVlan.html | 4 +- docs/libnm-glib/html/NMDeviceWifi.html | 4 +- docs/libnm-glib/html/NMDeviceWimax.html | 4 +- docs/libnm-glib/html/NMIP4Config.html | 4 +- docs/libnm-glib/html/NMIP6Config.html | 4 +- docs/libnm-glib/html/NMObject.html | 4 +- docs/libnm-glib/html/NMRemoteConnection.html | 8 +- docs/libnm-glib/html/NMRemoteSettings.html | 4 +- docs/libnm-glib/html/NMSecretAgent.html | 4 +- docs/libnm-glib/html/NMVPNConnection.html | 4 +- docs/libnm-glib/html/NMWimaxNsp.html | 4 +- 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 | 4 +- .../html/libnm-glib-NMVpnPluginUiWidget.html | 4 +- docs/libnm-glib/html/libnm-glib-nm-types.html | 4 +- .../html/libnm-glib-nm-vpn-plugin-utils.html | 4 +- docs/libnm-glib/html/object-tree.html | 4 +- docs/libnm-glib/html/ref-overview.html | 4 +- docs/libnm-glib/version.xml | 2 +- docs/libnm-util/Makefile.in | 23 + docs/libnm-util/html/NMConnection.html | 4 +- docs/libnm-util/html/NMSetting.html | 4 +- docs/libnm-util/html/NMSetting8021x.html | 4 +- docs/libnm-util/html/NMSettingAdsl.html | 4 +- docs/libnm-util/html/NMSettingBluetooth.html | 4 +- docs/libnm-util/html/NMSettingBond.html | 4 +- docs/libnm-util/html/NMSettingBridge.html | 4 +- docs/libnm-util/html/NMSettingBridgePort.html | 4 +- docs/libnm-util/html/NMSettingCdma.html | 4 +- docs/libnm-util/html/NMSettingConnection.html | 4 +- docs/libnm-util/html/NMSettingDcb.html | 4 +- docs/libnm-util/html/NMSettingGeneric.html | 4 +- docs/libnm-util/html/NMSettingGsm.html | 4 +- docs/libnm-util/html/NMSettingIP4Config.html | 4 +- docs/libnm-util/html/NMSettingIP6Config.html | 4 +- docs/libnm-util/html/NMSettingInfiniband.html | 4 +- docs/libnm-util/html/NMSettingOlpcMesh.html | 4 +- docs/libnm-util/html/NMSettingPPP.html | 4 +- docs/libnm-util/html/NMSettingPPPOE.html | 4 +- docs/libnm-util/html/NMSettingSerial.html | 4 +- docs/libnm-util/html/NMSettingTeam.html | 4 +- docs/libnm-util/html/NMSettingTeamPort.html | 4 +- docs/libnm-util/html/NMSettingVPN.html | 4 +- docs/libnm-util/html/NMSettingVlan.html | 4 +- docs/libnm-util/html/NMSettingWimax.html | 4 +- docs/libnm-util/html/NMSettingWired.html | 4 +- docs/libnm-util/html/NMSettingWireless.html | 4 +- .../libnm-util/html/NMSettingWirelessSecurity.html | 4 +- docs/libnm-util/html/annotation-glossary.html | 4 +- docs/libnm-util/html/api-index-full.html | 4 +- docs/libnm-util/html/ch01.html | 4 +- docs/libnm-util/html/index.html | 6 +- .../libnm-util/html/libnm-util-NetworkManager.html | 4 +- .../html/libnm-util-NetworkManagerVPN.html | 4 +- docs/libnm-util/html/libnm-util-nm-utils.html | 4 +- docs/libnm-util/html/object-tree.html | 4 +- docs/libnm-util/version.xml | 2 +- docs/libnm/Makefile.in | 23 + docs/libnm/html/NMAccessPoint.html | 4 +- docs/libnm/html/NMActiveConnection.html | 4 +- docs/libnm/html/NMClient.html | 4 +- docs/libnm/html/NMConnection.html | 4 +- docs/libnm/html/NMDevice.html | 4 +- docs/libnm/html/NMDeviceAdsl.html | 4 +- docs/libnm/html/NMDeviceBond.html | 4 +- docs/libnm/html/NMDeviceBridge.html | 4 +- docs/libnm/html/NMDeviceBt.html | 4 +- docs/libnm/html/NMDeviceDummy.html | 4 +- docs/libnm/html/NMDeviceEthernet.html | 4 +- docs/libnm/html/NMDeviceGeneric.html | 4 +- docs/libnm/html/NMDeviceIPTunnel.html | 4 +- docs/libnm/html/NMDeviceInfiniband.html | 4 +- docs/libnm/html/NMDeviceMacsec.html | 4 +- docs/libnm/html/NMDeviceMacvlan.html | 4 +- docs/libnm/html/NMDeviceModem.html | 4 +- docs/libnm/html/NMDeviceOlpcMesh.html | 4 +- docs/libnm/html/NMDeviceTeam.html | 4 +- docs/libnm/html/NMDeviceTun.html | 4 +- docs/libnm/html/NMDeviceVlan.html | 4 +- docs/libnm/html/NMDeviceVxlan.html | 4 +- docs/libnm/html/NMDeviceWifi.html | 4 +- docs/libnm/html/NMDeviceWimax.html | 4 +- docs/libnm/html/NMDhcpConfig.html | 4 +- docs/libnm/html/NMIPConfig.html | 4 +- docs/libnm/html/NMObject.html | 4 +- docs/libnm/html/NMRemoteConnection.html | 4 +- docs/libnm/html/NMSecretAgentOld.html | 4 +- docs/libnm/html/NMSetting.html | 4 +- docs/libnm/html/NMSetting8021x.html | 4 +- docs/libnm/html/NMSettingAdsl.html | 4 +- docs/libnm/html/NMSettingBluetooth.html | 4 +- docs/libnm/html/NMSettingBond.html | 4 +- docs/libnm/html/NMSettingBridge.html | 4 +- docs/libnm/html/NMSettingBridgePort.html | 4 +- docs/libnm/html/NMSettingCdma.html | 4 +- docs/libnm/html/NMSettingConnection.html | 4 +- docs/libnm/html/NMSettingDcb.html | 4 +- docs/libnm/html/NMSettingDummy.html | 4 +- docs/libnm/html/NMSettingGeneric.html | 4 +- docs/libnm/html/NMSettingGsm.html | 4 +- docs/libnm/html/NMSettingIP4Config.html | 4 +- docs/libnm/html/NMSettingIP6Config.html | 4 +- docs/libnm/html/NMSettingIPConfig.html | 4 +- docs/libnm/html/NMSettingIPTunnel.html | 4 +- docs/libnm/html/NMSettingInfiniband.html | 4 +- docs/libnm/html/NMSettingMacsec.html | 4 +- docs/libnm/html/NMSettingMacvlan.html | 4 +- docs/libnm/html/NMSettingOlpcMesh.html | 4 +- docs/libnm/html/NMSettingPpp.html | 4 +- docs/libnm/html/NMSettingPppoe.html | 4 +- docs/libnm/html/NMSettingSerial.html | 4 +- docs/libnm/html/NMSettingTeam.html | 12 +- docs/libnm/html/NMSettingTeamPort.html | 4 +- docs/libnm/html/NMSettingTun.html | 4 +- docs/libnm/html/NMSettingVlan.html | 4 +- docs/libnm/html/NMSettingVpn.html | 4 +- docs/libnm/html/NMSettingVxlan.html | 4 +- docs/libnm/html/NMSettingWimax.html | 4 +- docs/libnm/html/NMSettingWired.html | 4 +- docs/libnm/html/NMSettingWireless.html | 4 +- docs/libnm/html/NMSettingWirelessSecurity.html | 4 +- docs/libnm/html/NMSimpleConnection.html | 4 +- docs/libnm/html/NMVpnConnection.html | 4 +- docs/libnm/html/NMVpnEditorPlugin.html | 4 +- docs/libnm/html/NMWimaxNsp.html | 4 +- docs/libnm/html/annotation-glossary.html | 4 +- docs/libnm/html/api-index-full.html | 109 +- docs/libnm/html/ch02.html | 4 +- docs/libnm/html/ch03.html | 4 +- docs/libnm/html/ch04.html | 4 +- docs/libnm/html/ch05.html | 4 +- docs/libnm/html/ch06.html | 4 +- docs/libnm/html/index.html | 6 +- docs/libnm/html/libnm-nm-dbus-interface.html | 18 +- docs/libnm/html/libnm-nm-errors.html | 4 +- docs/libnm/html/libnm-nm-utils.html | 4 +- docs/libnm/html/libnm-nm-version.html | 4 +- docs/libnm/html/libnm-nm-vpn-dbus-interface.html | 4 +- docs/libnm/html/libnm.devhelp2 | 2 + docs/libnm/html/object-tree.html | 4 +- docs/libnm/html/ref-overview.html | 4 +- docs/libnm/html/usage.html | 6 +- docs/libnm/libnm-sections.txt | 29 + docs/libnm/version.xml | 2 +- gtk-doc.make | 21 + libnm-core/nm-core-internal.h | 8 +- libnm-core/nm-dbus-interface.h | 4 + libnm-core/nm-dbus-types.xml | 10 + libnm-core/nm-json.c | 118 + libnm-core/nm-json.h | 50 + libnm-core/nm-setting-ip4-config.c | 2 +- libnm-core/nm-setting-tc-config.h | 3 - libnm-core/nm-setting-team.c | 10 +- libnm-core/nm-setting-team.h | 2 +- libnm-core/nm-setting-vpn.c | 23 +- libnm-core/nm-utils.c | 177 +- libnm-core/tests/test-general.c | 99 +- libnm-util/nm-setting-vpn.c | 23 +- libnm/nm-client.c | 6 +- libnm/nm-property-docs.xml | 2 +- libnm/nm-secret-agent-old.c | 4 +- libnm/nm-settings-docs.xml | 2 +- libnm/nm-vpn-service-plugin.c | 16 +- m4/gtk-doc.m4 | 27 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 6 +- man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 26 +- man/nm-openvswitch.xml | 20 +- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-ifcfg-rh.xml | 2 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-keyfile.xml | 2 +- man/nm-settings.5 | 8 +- man/nm-settings.xml | 4 +- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- po/de.po | 1822 +++++---- po/es.po | 1843 +++++---- po/fr.po | 2005 +++++----- po/it.po | 1845 +++++---- po/ja.po | 4077 ++++++++++--------- po/ko.po | 1840 +++++---- po/pl.po | 4096 +++++--------------- po/pt_BR.po | 1843 +++++---- po/ru.po | 1840 +++++---- po/zh_CN.po | 1842 +++++---- po/zh_TW.po | 1829 +++++---- shared/nm-utils/nm-macros-internal.h | 1 + shared/nm-version-macros.h | 8 +- shared/nm-version-macros.h.in | 6 +- src/devices/nm-device.c | 67 +- src/devices/nm-device.h | 2 + src/devices/ovs/nm-device-ovs-interface.c | 24 +- src/devices/tests/test-arping.c | 2 +- src/devices/wwan/nm-modem-broadband.c | 52 +- src/devices/wwan/nm-modem.c | 5 +- src/dhcp/nm-dhcp-client.c | 68 +- src/dhcp/nm-dhcp-client.h | 9 +- src/dhcp/nm-dhcp-dhclient-utils.c | 8 +- src/dhcp/nm-dhcp-systemd.c | 18 +- src/dhcp/nm-dhcp-utils.c | 9 +- src/nm-config.c | 266 +- src/nm-config.h | 23 +- src/nm-core-utils.c | 3 +- src/nm-manager.c | 264 +- src/nm-manager.h | 7 + src/nm-policy.c | 2 +- src/nm-types.h | 2 + src/platform/nm-linux-platform.c | 7 +- src/platform/nm-platform.c | 9 +- src/settings/nm-settings-connection.c | 24 +- src/settings/nm-settings-connection.h | 7 +- src/settings/nm-settings.c | 17 +- src/settings/plugins/ibft/nms-ibft-connection.c | 2 +- src/settings/plugins/ifcfg-rh/nm-inotify-helper.c | 13 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-connection.c | 2 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c | 6 +- .../plugins/ifcfg-rh/nms-ifcfg-rh-reader.c | 17 + .../plugins/ifcfg-rh/nms-ifcfg-rh-writer.c | 6 + src/settings/plugins/ifnet/nms-ifnet-connection.c | 2 +- src/settings/plugins/ifnet/nms-ifnet-plugin.c | 6 +- .../plugins/keyfile/nms-keyfile-connection.c | 2 +- src/settings/plugins/keyfile/nms-keyfile-plugin.c | 4 +- .../src/libsystemd-network/sd-dhcp-client.c | 1 + 376 files changed, 16127 insertions(+), 14023 deletions(-) create mode 100644 libnm-core/nm-json.c create mode 100644 libnm-core/nm-json.h diff --git a/Makefile.am b/Makefile.am index 941c1a25..639921d5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -142,7 +142,9 @@ DISTCLEANFILES += intltool-extract intltool-merge intltool-update ############################################################################### +if WITH_LEGACY_LIBRARIES pkgconfig_DATA += NetworkManager.pc +endif ############################################################################### @@ -516,6 +518,14 @@ libnm_core_lib_c_real = \ libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ libnm-core/nm-vpn-plugin-info.c + +if WITH_JANSSON +libnm_core_lib_h_priv += \ + libnm-core/nm-json.h +libnm_core_lib_c_real += \ + libnm-core/nm-json.c +endif + libnm_core_lib_c_mkenums = \ libnm-core/nm-core-enum-types.c @@ -596,10 +606,6 @@ libnm_core_libnm_core_la_LIBADD = \ $(UUID_LIBS) \ $(LIBUDEV_LIBS) -if WITH_JANSSON -libnm_core_libnm_core_la_LIBADD += $(JANSSON_LIBS) -endif - libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) diff --git a/Makefile.in b/Makefile.in index 53b8e1a9..45c5b28d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -153,39 +153,47 @@ TESTS = $(am__EXEEXT_12) @BUILD_DOCS_FALSE@am__append_3 = dist-configure-check @WITH_LEGACY_LIBRARIES_FALSE@am__append_4 = dist-configure-check -@WITH_JANSSON_TRUE@am__append_5 = $(JANSSON_CFLAGS) -@WITH_GNUTLS_TRUE@am__append_6 = $(GNUTLS_CFLAGS) -@WITH_NSS_TRUE@am__append_7 = $(NSS_CFLAGS) -@WITH_JANSSON_TRUE@am__append_8 = $(JANSSON_LIBS) -@WITH_GNUTLS_TRUE@am__append_9 = libnm-core/crypto_gnutls.c -@WITH_GNUTLS_TRUE@am__append_10 = $(GNUTLS_LIBS) -@WITH_NSS_TRUE@am__append_11 = libnm-core/crypto_nss.c -@WITH_NSS_TRUE@am__append_12 = $(NSS_LIBS) -@HAVE_INTROSPECTION_TRUE@am__append_13 = libnm/NM-1.0.gir -@HAVE_INTROSPECTION_TRUE@am__append_14 = $(libnm_noinst_data) -@HAVE_INTROSPECTION_TRUE@am__append_15 = $(libnm_noinst_data) -@WITH_WEXT_TRUE@am__append_16 = \ + +############################################################################### +@WITH_LEGACY_LIBRARIES_TRUE@am__append_5 = NetworkManager.pc +@WITH_JANSSON_TRUE@am__append_6 = \ +@WITH_JANSSON_TRUE@ libnm-core/nm-json.h + +@WITH_JANSSON_TRUE@am__append_7 = \ +@WITH_JANSSON_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_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 = \ @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_17 = \ +@WITH_CONCHECK_TRUE@am__append_19 = \ @WITH_CONCHECK_TRUE@ src/nm-connectivity.c -@REQUIRE_ROOT_TESTS_TRUE@am__append_18 = -DREQUIRE_ROOT_TESTS=1 +@REQUIRE_ROOT_TESTS_TRUE@am__append_20 = -DREQUIRE_ROOT_TESTS=1 ############################################################################### # src/ppp ############################################################################### -@WITH_PPP_TRUE@am__append_19 = src/ppp/libnm-ppp-plugin.la -@WITH_PPP_TRUE@am__append_20 = src/ppp/nm-pppd-plugin.la +@WITH_PPP_TRUE@am__append_21 = src/ppp/libnm-ppp-plugin.la +@WITH_PPP_TRUE@am__append_22 = src/ppp/nm-pppd-plugin.la ############################################################################### # src/settings/plugins/ibft ############################################################################### -@CONFIG_PLUGIN_IBFT_TRUE@am__append_21 = src/settings/plugins/ibft/libnm-settings-plugin-ibft.la -@CONFIG_PLUGIN_IBFT_TRUE@am__append_22 = src/settings/plugins/ibft/libnms-ibft-core.la -@CONFIG_PLUGIN_IBFT_TRUE@am__append_23 = src/settings/plugins/ibft/tests/test-ibft -@CONFIG_PLUGIN_IBFT_TRUE@am__append_24 = \ +@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@ 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 \ @@ -196,129 +204,129 @@ 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_25 = check-local-symbols-settings-ibft +@CONFIG_PLUGIN_IBFT_TRUE@am__append_27 = check-local-symbols-settings-ibft ############################################################################### # src/settings/plugins/ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_26 = src/settings/plugins/ifcfg-rh/libnm-settings-plugin-ifcfg-rh.la -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_27 = \ +@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@ 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_28 = $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES) -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_29 = check-local-symbols-settings-ifcfg-rh +@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 ############################################################################### # src/settings/plugins/ifcfg-rh/tests ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_30 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_32 = src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh ############################################################################### -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_31 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf +@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_33 = src/settings/plugins/ifcfg-rh/nm-ifcfg-rh.conf ############################################################################### # src/settings/plugins/ifupdown ############################################################################### -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_32 = src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_33 = src/settings/plugins/ifupdown/libnms-ifupdown-core.la -@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_34 = check-local-symbols-settings-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_IFUPDOWN_TRUE@am__append_35 = src/settings/plugins/ifupdown/tests/test-ifupdown +@CONFIG_PLUGIN_IFUPDOWN_TRUE@am__append_37 = src/settings/plugins/ifupdown/tests/test-ifupdown ############################################################################### # src/settings/plugins/ifnet ############################################################################### -@CONFIG_PLUGIN_IFNET_TRUE@am__append_36 = src/settings/plugins/ifnet/libnm-settings-plugin-ifnet.la -@CONFIG_PLUGIN_IFNET_TRUE@am__append_37 = src/settings/plugins/ifnet/libnms-ifnet-core.la -@CONFIG_PLUGIN_IFNET_TRUE@am__append_38 = check-local-symbols-settings-ifnet +@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_IFNET_TRUE@am__append_39 = src/settings/plugins/ifnet/tests/test-ifnet +@CONFIG_PLUGIN_IFNET_TRUE@am__append_41 = src/settings/plugins/ifnet/tests/test-ifnet ############################################################################### # src/devices/bluetooth ############################################################################### -@WITH_MODEM_MANAGER_1_TRUE@am__append_40 = \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_42 = \ @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_41 = \ +@WITH_MODEM_MANAGER_1_TRUE@@WITH_OFONO_TRUE@am__append_43 = \ @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_42 = check-local-devices-wwan \ +@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = check-local-devices-wwan \ @WITH_MODEM_MANAGER_1_TRUE@ check-local-devices-bluetooth -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_43 = $(BLUEZ5_CFLAGS) -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_44 = \ +@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@ 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_45 = $(BLUEZ5_LIBS) +@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__append_47 = $(BLUEZ5_LIBS) ############################################################################### # src/devices/wifi ############################################################################### -@WITH_WIFI_TRUE@am__append_46 = src/devices/wifi/libnm-device-plugin-wifi.la -@WITH_WIFI_TRUE@am__append_47 = check-local-devices-wifi -@WITH_WIFI_TRUE@am__append_48 = src/devices/wifi/tests/test-general +@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 ############################################################################### # src/devices/team ############################################################################### -@WITH_TEAMDCTL_TRUE@am__append_49 = src/devices/team/libnm-device-plugin-team.la -@WITH_TEAMDCTL_TRUE@am__append_50 = check-local-devices-team -@WITH_OPENVSWITCH_TRUE@am__append_51 = src/devices/ovs/libnm-device-plugin-ovs.la -@HAVE_INTROSPECTION_TRUE@am__append_52 = $(clients_common_settings_doc_c) -@HAVE_INTROSPECTION_TRUE@am__append_53 = check-local-settings-docs -@HAVE_INTROSPECTION_TRUE@am__append_54 = clients/common/libnmc.la -@HAVE_INTROSPECTION_FALSE@am__append_55 = clients/common/libnmc.la -@HAVE_INTROSPECTION_TRUE@am__append_56 = clients/common/tests/test-general -@BUILD_NMCLI_TRUE@@HAVE_INTROSPECTION_FALSE@am__append_57 = clients/common/tests/test-general +@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 ############################################################################### # clients/cli ############################################################################### -@BUILD_NMCLI_TRUE@am__append_58 = clients/cli/nmcli -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_59 = $(POLKIT_CFLAGS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__append_60 = \ +@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@@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_61 = $(POLKIT_LIBS) -@BUILD_NMCLI_TRUE@am__append_62 = install-data-hook-nmcli -@BUILD_NMCLI_TRUE@am__append_63 = uninstall-hook-nmcli +@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 ############################################################################### # clients/tui ############################################################################### -@BUILD_NMTUI_TRUE@am__append_64 = clients/tui/newt/libnmt-newt.a -@BUILD_NMTUI_TRUE@am__append_65 = clients/tui/nmtui -@BUILD_NMTUI_TRUE@am__append_66 = install-exec-hook-nmtui -@BUILD_NMTUI_TRUE@am__append_67 = uninstall-hook-nmtui -@HAVE_SYSTEMD_TRUE@am__append_68 = data/org.freedesktop.NetworkManager.service +@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 ############################################################################### # libnm-util ############################################################################### -@WITH_LEGACY_LIBRARIES_TRUE@am__append_69 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_71 = 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_70 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = \ @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_71 = $(GNUTLS_CFLAGS) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_72 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_73 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_74 = $(NSS_CFLAGS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_75 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_76 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_77 = \ +@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_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_gnutls.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/crypto_nss.c \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/COPYING \ @@ -328,26 +336,26 @@ TESTS = $(am__EXEEXT_12) @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_78 = libnm-util/libtest-crypto.la -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_79 = libnm-util/crypto_gnutls.c -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_80 = $(GNUTLS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_81 = libnm-util/crypto_nss.c -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__append_82 = $(NSS_LIBS) -@WITH_LEGACY_LIBRARIES_TRUE@am__append_83 = libnm-util/libnm-util.pc \ +@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.pc \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/libnm-glib-vpn.pc -@WITH_LEGACY_LIBRARIES_TRUE@am__append_84 = libnm-util/libnm-util.pc \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_86 = 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_85 = libnm-util/NetworkManager-1.0.gir \ +@HAVE_INTROSPECTION_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = 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_86 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_88 = \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-util \ @WITH_LEGACY_LIBRARIES_TRUE@ check-local-exports-libnm-glib -@WITH_LEGACY_LIBRARIES_TRUE@am__append_87 = libnm-util/libnm-util.la \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_89 = 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_88 = libnm-util/tests/test-settings-defaults \ +@WITH_LEGACY_LIBRARIES_TRUE@am__append_90 = 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 \ @@ -355,53 +363,53 @@ TESTS = $(am__EXEEXT_12) @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_89 = libnm-util/tests/test-libnm-linking \ +@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_90 = libnm-glib/libdeprecated-nm-glib.la -@WITH_LEGACY_LIBRARIES_TRUE@am__append_91 = \ +@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-glib/nm-vpn-plugin-glue.h \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-glib/nm-secret-agent-glue.h -@HAVE_INTROSPECTION_TRUE@am__append_92 = $(man_nm_settings_xml) -@WITH_OPENVSWITCH_TRUE@am__append_93 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_94 = man/nm-openvswitch.7 -@WITH_OPENVSWITCH_FALSE@am__append_95 = man/nm-openvswitch.7 -@CONFIG_PLUGIN_IFCFG_RH_TRUE@am__append_96 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_97 = man/nm-settings-ifcfg-rh.5 -@CONFIG_PLUGIN_IFCFG_RH_FALSE@am__append_98 = man/nm-settings-ifcfg-rh.5 -@HAVE_DOCS_TRUE@am__append_99 = install-data-hook-man -@HAVE_DOCS_TRUE@am__append_100 = uninstall-hook-man -@HAVE_DOCS_TRUE@am__append_101 = $(man_pages) $(man_pages_autogen) -@BUILD_DOCS_TRUE@am__append_102 = $(man_pages) $(man_pages_autogen) +@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) ############################################################################### # vapi ############################################################################### -@ENABLE_VAPIGEN_TRUE@am__append_103 = \ +@ENABLE_VAPIGEN_TRUE@am__append_105 = \ @ENABLE_VAPIGEN_TRUE@ vapi/libnm.vapi -@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_104 = \ +@ENABLE_VAPIGEN_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__append_106 = \ @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_105 = \ +@ENABLE_VAPIGEN_TRUE@am__append_107 = \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS) \ @ENABLE_VAPIGEN_TRUE@ $(VAPIGEN_VAPIS:.vapi=.deps) -@ENABLE_VAPIGEN_TRUE@am__append_106 = $(VAPIGEN_VAPIS) +@ENABLE_VAPIGEN_TRUE@am__append_108 = $(VAPIGEN_VAPIS) ############################################################################### -@ENABLE_TESTS_TRUE@am__append_107 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_TRUE@am__append_108 = $(check_ltlibraries) -@ENABLE_TESTS_FALSE@am__append_109 = $(check_programs) $(check_programs_norun) -@ENABLE_TESTS_FALSE@am__append_110 = $(check_ltlibraries) -@WITH_QT_TRUE@am__append_111 = \ +@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 = \ @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_112 = \ +@WITH_QT_TRUE@am__append_114 = \ @WITH_QT_TRUE@ examples/C/qt/monitor-nm-running.moc subdir = . @@ -642,13 +650,11 @@ am__objects_1 = introspection/introspection_libnmdbus_la-org.freedesktop.Network nodist_introspection_libnmdbus_la_OBJECTS = $(am__objects_1) introspection_libnmdbus_la_OBJECTS = \ $(nodist_introspection_libnmdbus_la_OBJECTS) -@WITH_JANSSON_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@WITH_GNUTLS_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1) -@WITH_NSS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@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) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \ - $(am__DEPENDENCIES_4) + $(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 \ @@ -697,7 +703,8 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ 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 \ - shared/nm-utils/c-list-util.c shared/nm-utils/nm-dedup-multi.c \ + 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 \ @@ -737,12 +744,14 @@ am__libnm_core_libnm_core_la_SOURCES_DIST = \ libnm-core/nm-setting-wireless.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/crypto_gnutls.c \ - libnm-core/crypto_nss.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 = -@WITH_GNUTLS_TRUE@am__objects_3 = libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo -@WITH_NSS_TRUE@am__objects_4 = libnm-core/libnm_core_libnm_core_la-crypto_nss.lo -am__objects_5 = \ +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 \ @@ -805,13 +814,13 @@ am__objects_5 = \ 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_3) $(am__objects_4) + $(am__objects_4) $(am__objects_5) $(am__objects_6) am_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \ - $(am__objects_2) $(am__objects_5) -am__objects_6 = \ + $(am__objects_3) $(am__objects_7) +am__objects_8 = \ libnm-core/libnm_core_libnm_core_la-nm-core-enum-types.lo nodist_libnm_core_libnm_core_la_OBJECTS = $(am__objects_2) \ - $(am__objects_6) + $(am__objects_8) libnm_core_libnm_core_la_OBJECTS = \ $(am_libnm_core_libnm_core_la_OBJECTS) \ $(nodist_libnm_core_libnm_core_la_OBJECTS) @@ -836,14 +845,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_7 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-plugin.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_9 = 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_7) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_8 = libnm-glib/libnm_glib_libnm_glib_vpn_la-nm-vpn-enum-types.lo +@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_8) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_10) libnm_glib_libnm_glib_vpn_la_OBJECTS = \ $(am_libnm_glib_libnm_glib_vpn_la_OBJECTS) \ $(nodist_libnm_glib_libnm_glib_vpn_la_OBJECTS) @@ -895,7 +904,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_9 = shared/nm-utils/libnm_glib_libnm_glib_la-nm-udev-utils.lo \ +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_11 = 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 \ @@ -927,11 +936,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_9) $(am__objects_2) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_11) $(am__objects_2) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_10 = libnm-glib/libnm_glib_libnm_glib_la-nm-glib-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_12 = 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_10) $(am__objects_2) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_12) $(am__objects_2) libnm_glib_libnm_glib_la_OBJECTS = \ $(am_libnm_glib_libnm_glib_la_OBJECTS) \ $(nodist_libnm_glib_libnm_glib_la_OBJECTS) @@ -941,14 +950,14 @@ libnm_glib_libnm_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(LDFLAGS) -o $@ @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_glib_libnm_glib_la_rpath = \ @WITH_LEGACY_LIBRARIES_TRUE@ -rpath $(libdir) -@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1) +@WITH_GNUTLS_TRUE@@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) +@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libnm_util_la_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_6) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_4) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) am__libnm_util_libnm_util_la_SOURCES_DIST = \ shared/nm-utils/nm-shared-utils.c libnm-util/crypto.c \ libnm-util/nm-connection.c \ @@ -996,9 +1005,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_11 = libnm-util/libnm_util_libnm_util_la-crypto_gnutls.lo -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_12 = libnm-util/libnm_util_libnm_util_la-crypto_nss.lo -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_13 = shared/nm-utils/libnm_util_libnm_util_la-nm-shared-utils.lo \ +@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_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 \ @@ -1031,14 +1040,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_11) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_12) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_13) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_14) @WITH_LEGACY_LIBRARIES_TRUE@am_libnm_util_libnm_util_la_OBJECTS = \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_13) $(am__objects_2) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_15) $(am__objects_2) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) -@WITH_LEGACY_LIBRARIES_TRUE@am__objects_14 = libnm-util/libnm_util_libnm_util_la-nm-utils-enum-types.lo +@WITH_LEGACY_LIBRARIES_TRUE@am__objects_16 = 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_14) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_2) $(am__objects_16) libnm_util_libnm_util_la_OBJECTS = \ $(am_libnm_util_libnm_util_la_OBJECTS) \ $(nodist_libnm_util_libnm_util_la_OBJECTS) @@ -1050,15 +1059,15 @@ libnm_util_libnm_util_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @WITH_LEGACY_LIBRARIES_TRUE@ -rpath $(libdir) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_libtest_crypto_la_DEPENDENCIES = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_5) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_6) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_4) \ +@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_15 = libnm-util/libnm_util_libtest_crypto_la-crypto_gnutls.lo -@WITH_LEGACY_LIBRARIES_TRUE@@WITH_NSS_TRUE@am__objects_16 = libnm-util/libnm_util_libtest_crypto_la-crypto_nss.lo +@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_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_15) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_16) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_17) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__objects_18) 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 = @@ -1071,7 +1080,7 @@ libnm_libnm_utils_la_OBJECTS = $(am_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_17 = libnm/libnm_libnm_la-nm-access-point.lo \ +am__objects_19 = libnm/libnm_libnm_la-nm-access-point.lo \ libnm/libnm_libnm_la-nm-active-connection.lo \ libnm/libnm_libnm_la-nm-client.lo \ libnm/libnm_libnm_la-nm-dbus-helpers.lo \ @@ -1117,9 +1126,9 @@ am__objects_17 = 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_17) -am__objects_18 = libnm/libnm_libnm_la-nm-enum-types.lo -nodist_libnm_libnm_la_OBJECTS = $(am__objects_2) $(am__objects_18) + $(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) libnm_libnm_la_OBJECTS = $(am_libnm_libnm_la_OBJECTS) \ $(nodist_libnm_libnm_la_OBJECTS) libnm_libnm_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ @@ -1149,12 +1158,12 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LINK = $(LIBTOOL) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS) \ $(LDFLAGS) -o $@ -@WITH_BLUEZ5_DUN_TRUE@@WITH_MODEM_MANAGER_1_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) +@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_7) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__DEPENDENCIES_6) am__src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES_DIST = \ src/devices/bluetooth/nm-bluez-manager.c \ src/devices/bluetooth/nm-bluez-common.h \ @@ -1172,7 +1181,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_19 = 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_21 = 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 \ @@ -1180,7 +1189,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_19) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_21) 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) \ @@ -1293,11 +1302,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_20 = src/devices/wwan/src_devices_wwan_libnm_wwan_la-nm-modem-ofono.lo +@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@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_20) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__objects_22) 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 \ @@ -1407,7 +1416,7 @@ am__src_libNetworkManager_la_SOURCES_DIST = \ 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_21 = src/src_libNetworkManager_la-nm-connectivity.lo +@WITH_CONCHECK_TRUE@am__objects_23 = src/src_libNetworkManager_la-nm-connectivity.lo am_src_libNetworkManager_la_OBJECTS = \ src/src_libNetworkManager_la-nm-checkpoint-manager.lo \ src/src_libNetworkManager_la-nm-checkpoint.lo \ @@ -1482,7 +1491,7 @@ am_src_libNetworkManager_la_OBJECTS = \ 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_21) + $(am__objects_23) src_libNetworkManager_la_OBJECTS = \ $(am_src_libNetworkManager_la_OBJECTS) src_libNetworkManagerBase_la_DEPENDENCIES = libnm-core/libnm-core.la \ @@ -1514,7 +1523,7 @@ am__src_libNetworkManagerBase_la_SOURCES_DIST = src/nm-core-utils.c \ 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_22 = src/platform/wifi/src_libNetworkManagerBase_la-wifi-utils-wext.lo +@WITH_WEXT_TRUE@am__objects_24 = 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 \ @@ -1536,7 +1545,7 @@ 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_22) + $(am__objects_24) src_libNetworkManagerBase_la_OBJECTS = \ $(am_src_libNetworkManagerBase_la_OBJECTS) src_libNetworkManagerTest_la_DEPENDENCIES = src/libNetworkManager.la \ @@ -1550,8 +1559,8 @@ src_libNetworkManagerTest_la_OBJECTS = \ $(am_src_libNetworkManagerTest_la_OBJECTS) @ENABLE_TESTS_FALSE@am_src_libNetworkManagerTest_la_rpath = @ENABLE_TESTS_TRUE@am_src_libNetworkManagerTest_la_rpath = -am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) -src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_8) +am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +src_libsystemd_nm_la_DEPENDENCIES = $(am__DEPENDENCIES_7) am_src_libsystemd_nm_la_OBJECTS = \ src/systemd/src_libsystemd_nm_la-nm-sd.lo \ src/systemd/sd-adapt/src_libsystemd_nm_la-nm-sd-adapt.lo \ @@ -1850,7 +1859,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_23 = clients/common/clients_cli_nmcli-nm-polkit-listener.$(OBJEXT) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__objects_25 = 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) \ @@ -1860,14 +1869,14 @@ 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_23) +@BUILD_NMCLI_TRUE@ $(am__objects_25) clients_cli_nmcli_OBJECTS = $(am_clients_cli_nmcli_OBJECTS) -@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) +@BUILD_NMCLI_TRUE@@WITH_POLKIT_AGENT_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) @BUILD_NMCLI_TRUE@clients_cli_nmcli_DEPENDENCIES = libnm/libnm.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc-base.la \ @BUILD_NMCLI_TRUE@ clients/common/libnmc.la \ @BUILD_NMCLI_TRUE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ -@BUILD_NMCLI_TRUE@ $(am__DEPENDENCIES_9) +@BUILD_NMCLI_TRUE@ $(am__DEPENDENCIES_8) clients_cli_nmcli_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(clients_cli_nmcli_LDFLAGS) $(LDFLAGS) \ @@ -1986,8 +1995,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_24 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) -nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_24) +am__objects_26 = dispatcher/dispatcher_nm_dispatcher-nmdbus-dispatcher.$(OBJEXT) +nodist_dispatcher_nm_dispatcher_OBJECTS = $(am__objects_26) dispatcher_nm_dispatcher_OBJECTS = \ $(am_dispatcher_nm_dispatcher_OBJECTS) \ $(nodist_dispatcher_nm_dispatcher_OBJECTS) @@ -2073,34 +2082,34 @@ examples_C_qt_monitor_nm_running_OBJECTS = \ libnm_core_tests_test_compare_SOURCES = \ libnm-core/tests/test-compare.c libnm_core_tests_test_compare_OBJECTS = libnm-core/tests/libnm_core_tests_test_compare-test-compare.$(OBJEXT) -am__DEPENDENCIES_10 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1) -libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_10) +am__DEPENDENCIES_9 = libnm-core/libnm-core.la $(am__DEPENDENCIES_1) +libnm_core_tests_test_compare_DEPENDENCIES = $(am__DEPENDENCIES_9) 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_10) +libnm_core_tests_test_crypto_DEPENDENCIES = $(am__DEPENDENCIES_9) 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_10) +libnm_core_tests_test_general_DEPENDENCIES = $(am__DEPENDENCIES_9) 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_10) +libnm_core_tests_test_keyfile_DEPENDENCIES = $(am__DEPENDENCIES_9) 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_10) +libnm_core_tests_test_secrets_DEPENDENCIES = $(am__DEPENDENCIES_9) 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_10) +libnm_core_tests_test_setting_DEPENDENCIES = $(am__DEPENDENCIES_9) 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_10) + $(am__DEPENDENCIES_9) 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 = \ @@ -2138,13 +2147,13 @@ libnm_glib_tests_test_remote_settings_client_OBJECTS = \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) libnm_util_tests_test_crypto_SOURCES = libnm-util/tests/test-crypto.c libnm_util_tests_test_crypto_OBJECTS = libnm-util/tests/libnm_util_tests_test_crypto-test-crypto.$(OBJEXT) -@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_11 = \ +@WITH_LEGACY_LIBRARIES_TRUE@am__DEPENDENCIES_10 = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/libnm-util.la \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) \ @WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_1) @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_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) 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) @@ -2153,50 +2162,50 @@ libnm_util_tests_test_libnm_linking_SOURCES = \ 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_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) 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_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) 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_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) 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_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) 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_11) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__DEPENDENCIES_10) am_libnm_tests_test_general_OBJECTS = \ libnm/tests/libnm_tests_test_general-test-general.$(OBJEXT) libnm_tests_test_general_OBJECTS = \ $(am_libnm_tests_test_general_OBJECTS) -am__DEPENDENCIES_12 = libnm/libnm.la $(am__DEPENDENCIES_1) +am__DEPENDENCIES_11 = libnm/libnm.la $(am__DEPENDENCIES_1) libnm_tests_test_general_DEPENDENCIES = libnm/libnm-utils.la \ - $(am__DEPENDENCIES_12) + $(am__DEPENDENCIES_11) 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_12) +libnm_tests_test_nm_client_DEPENDENCIES = $(am__DEPENDENCIES_11) 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_12) + $(am__DEPENDENCIES_11) 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_12) +libnm_tests_test_secret_agent_DEPENDENCIES = $(am__DEPENDENCIES_11) am_src_NetworkManager_OBJECTS = src/src_NetworkManager-main.$(OBJEXT) src_NetworkManager_OBJECTS = $(am_src_NetworkManager_OBJECTS) src_NetworkManager_DEPENDENCIES = src/libNetworkManager.la @@ -2259,9 +2268,9 @@ src_dnsmasq_tests_test_dnsmasq_utils_DEPENDENCIES = \ 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) -am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \ +am__DEPENDENCIES_12 = src/libNetworkManagerTest.la \ $(am__DEPENDENCIES_1) -src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_13) +src_ndisc_tests_test_ndisc_fake_DEPENDENCIES = $(am__DEPENDENCIES_12) src_ndisc_tests_test_ndisc_fake_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) \ @@ -2270,7 +2279,7 @@ src_ndisc_tests_test_ndisc_linux_SOURCES = \ src/ndisc/tests/test-ndisc-linux.c src_ndisc_tests_test_ndisc_linux_OBJECTS = src/ndisc/tests/src_ndisc_tests_test_ndisc_linux-test-ndisc-linux.$(OBJEXT) src_ndisc_tests_test_ndisc_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_13) + $(am__DEPENDENCIES_12) src_ndisc_tests_test_ndisc_linux_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) \ @@ -2288,10 +2297,10 @@ src_nm_iface_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(LDFLAGS) -o $@ 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_14 = src/libNetworkManagerTest.la \ +am__DEPENDENCIES_13 = src/libNetworkManagerTest.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -src_platform_tests_monitor_DEPENDENCIES = $(am__DEPENDENCIES_14) +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) \ $(AM_CFLAGS) $(CFLAGS) $(src_platform_tests_monitor_LDFLAGS) \ @@ -2300,7 +2309,7 @@ am_src_platform_tests_test_address_fake_OBJECTS = src/platform/tests/src_platfor src_platform_tests_test_address_fake_OBJECTS = \ $(am_src_platform_tests_test_address_fake_OBJECTS) src_platform_tests_test_address_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_address_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2310,7 +2319,7 @@ am_src_platform_tests_test_address_linux_OBJECTS = src/platform/tests/src_platfo src_platform_tests_test_address_linux_OBJECTS = \ $(am_src_platform_tests_test_address_linux_OBJECTS) src_platform_tests_test_address_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_address_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2320,7 +2329,7 @@ am_src_platform_tests_test_cleanup_fake_OBJECTS = src/platform/tests/src_platfor src_platform_tests_test_cleanup_fake_OBJECTS = \ $(am_src_platform_tests_test_cleanup_fake_OBJECTS) src_platform_tests_test_cleanup_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_cleanup_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2330,7 +2339,7 @@ am_src_platform_tests_test_cleanup_linux_OBJECTS = src/platform/tests/src_platfo src_platform_tests_test_cleanup_linux_OBJECTS = \ $(am_src_platform_tests_test_cleanup_linux_OBJECTS) src_platform_tests_test_cleanup_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_cleanup_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2349,7 +2358,7 @@ am_src_platform_tests_test_link_fake_OBJECTS = src/platform/tests/src_platform_t src_platform_tests_test_link_fake_OBJECTS = \ $(am_src_platform_tests_test_link_fake_OBJECTS) src_platform_tests_test_link_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_link_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2358,7 +2367,7 @@ am_src_platform_tests_test_link_linux_OBJECTS = src/platform/tests/src_platform_ src_platform_tests_test_link_linux_OBJECTS = \ $(am_src_platform_tests_test_link_linux_OBJECTS) src_platform_tests_test_link_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_link_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2376,7 +2385,7 @@ am_src_platform_tests_test_route_fake_OBJECTS = src/platform/tests/src_platform_ src_platform_tests_test_route_fake_OBJECTS = \ $(am_src_platform_tests_test_route_fake_OBJECTS) src_platform_tests_test_route_fake_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_route_fake_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2385,7 +2394,7 @@ am_src_platform_tests_test_route_linux_OBJECTS = src/platform/tests/src_platform src_platform_tests_test_route_linux_OBJECTS = \ $(am_src_platform_tests_test_route_linux_OBJECTS) src_platform_tests_test_route_linux_DEPENDENCIES = \ - $(am__DEPENDENCIES_14) + $(am__DEPENDENCIES_13) src_platform_tests_test_route_linux_LINK = $(LIBTOOL) $(AM_V_lt) \ --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -2506,7 +2515,7 @@ am_src_tests_test_systemd_OBJECTS = \ 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_8) + $(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) @@ -3311,6 +3320,7 @@ PYTHON_VERSION = @PYTHON_VERSION@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ +READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ @@ -3351,6 +3361,7 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_NM = @ac_ct_NM@ ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_READELF = @ac_ct_READELF@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -3433,43 +3444,43 @@ 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_22) $(am__append_27) \ - $(am__append_33) $(am__append_37) \ - dispatcher/libnm-dispatcher-core.la $(am__append_90) \ - $(am__append_108) -check_LTLIBRARIES = $(am__append_110) -noinst_LIBRARIES = $(am__append_64) -noinst_DATA = $(am__append_14) + 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) ############################################################################### -lib_LTLIBRARIES = libnm/libnm.la $(am__append_69) +lib_LTLIBRARIES = libnm/libnm.la $(am__append_71) pkglib_LTLIBRARIES = $(core_plugins) ############################################################################### # src/devices/adsl ############################################################################### -core_plugins = $(am__append_19) $(am__append_21) $(am__append_26) \ - $(am__append_32) $(am__append_36) \ - src/devices/adsl/libnm-device-plugin-adsl.la $(am__append_40) \ - $(am__append_46) $(am__append_49) $(am__append_51) -service_DATA = $(am__append_68) -man_MANS = $(am__append_101) +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) examples_DATA = data/server.conf CLEANFILES = $(introspection_sources) $(DBUS_INTERFACE_DOCS) \ - src/NetworkManager.ver $(am__append_28) \ + src/NetworkManager.ver $(am__append_30) \ $(dispatcher_nmdbus_dispatcher_sources) \ dispatcher/org.freedesktop.nm_dispatcher.service \ data/NetworkManager.service \ data/NetworkManager-wait-online.service \ data/NetworkManager-dispatcher.service \ data/org.freedesktop.NetworkManager.service data/server.conf \ - $(am__append_91) $(am__append_92) man/common.ent \ - $(am__append_102) $(am__append_106) $(GLIB_GENERATED) \ + $(am__append_93) $(am__append_94) man/common.ent \ + $(am__append_104) $(am__append_108) $(GLIB_GENERATED) \ $(INTROSPECTION_GIRS) $(typelib_DATA) cscope.in.out cscope.out \ - cscope.po.out $(NULL) $(am__append_112) + cscope.po.out $(NULL) $(am__append_114) DISTCLEANFILES = intltool-extract intltool-merge intltool-update \ - $(polkit_policy_DATA) libnm/libnm.pc $(am__append_52) \ - $(am__append_84) + $(polkit_policy_DATA) libnm/libnm.pc $(am__append_54) \ + $(am__append_86) # test-cert.p12 created with: # @@ -3504,7 +3515,7 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ 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_15) \ + libnm/libnm.ver $(am__append_17) \ libnm/generate-setting-docs.py libnm/generate-plugin-docs.pl \ src/org.freedesktop.NetworkManager.conf \ src/nm-test-utils-core.h \ @@ -3551,7 +3562,7 @@ 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_24) \ + $(am__append_26) \ 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 \ @@ -3799,8 +3810,8 @@ EXTRA_DIST = $(dbusinterfaces_DATA) libnm-core/crypto_gnutls.c \ 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_77) $(am__append_94) \ - $(am__append_97) man/common.ent.in $(man_nm_settings_xml) \ + 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 \ @@ -3882,16 +3893,16 @@ 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_55) +EXTRA_LTLIBRARIES = $(am__append_57) 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_87) $(am__append_95) \ - $(am__append_98) $(man_pages) $(man_pages_autogen) + libnm-core/nm-dbus-types.xml $(am__append_89) $(am__append_97) \ + $(am__append_100) $(man_pages) $(man_pages_autogen) dist_configure_check = $(am__append_3) $(am__append_4) -install_data_hook = install-data-hook-dispatcher $(am__append_62) \ - $(am__append_99) -install_exec_hook = $(am__append_66) -uninstall_hook = $(am__append_63) $(am__append_67) $(am__append_100) +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) 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) \ @@ -3899,12 +3910,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_70) + $(am__append_72) 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_93) + $(am__append_95) man_pages_autogen = man/nm-settings-keyfile.5 man/nm-settings.5 \ - $(am__append_96) + $(am__append_98) ############################################################################### @@ -3935,8 +3946,8 @@ check_programs = libnm-core/tests/test-compare \ $(libnm_tests_programs) src/dhcp/tests/test-dhcp-dhclient \ src/dhcp/tests/test-dhcp-utils \ src/settings/plugins/keyfile/tests/test-keyfile \ - $(am__append_23) $(am__append_30) $(am__append_35) \ - $(am__append_39) $(am__append_48) \ + $(am__append_25) $(am__append_32) $(am__append_37) \ + $(am__append_41) $(am__append_50) \ src/dnsmasq/tests/test-dnsmasq-utils \ src/platform/tests/test-link-fake \ src/platform/tests/test-link-linux \ @@ -3956,10 +3967,10 @@ check_programs = libnm-core/tests/test-compare \ 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_56) \ - $(am__append_57) $(am__append_88) + 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_89) \ + src/ndisc/tests/test-ndisc-linux $(am__append_91) \ examples/C/glib/add-connection-gdbus \ examples/C/glib/add-connection-libnm \ examples/C/glib/get-active-connections-gdbus \ @@ -3967,7 +3978,7 @@ check_programs_norun = src/platform/tests/monitor \ 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_111) + examples/C/glib/monitor-nm-state-gdbus $(am__append_113) ############################################################################### @@ -3976,17 +3987,17 @@ 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_54) $(am__append_78) -check_local = check-local-exports-libnm $(am__append_25) \ - $(am__append_29) $(am__append_34) $(am__append_38) \ - check-local-devices-adsl $(am__append_42) $(am__append_47) \ - $(am__append_50) $(am__append_53) $(am__append_86) -VAPIGEN_VAPIS = $(am__append_103) $(am__append_104) -dbusservice_DATA = $(am__append_31) dispatcher/nm-dispatcher.conf \ + $(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 \ src/org.freedesktop.NetworkManager.conf dbusactivation_DATA = \ dispatcher/org.freedesktop.nm_dispatcher.service -INTROSPECTION_GIRS = $(am__append_13) $(am__append_85) +INTROSPECTION_GIRS = $(am__append_15) $(am__append_87) INTROSPECTION_SCANNER_ARGS = INTROSPECTION_COMPILER_ARGS = # Pass SANITIZER_ENV where a command that uses built libraries is @@ -3998,13 +4009,11 @@ libnminclude_HEADERS = $(libnm_core_lib_h_pub_real) \ nodist_libnminclude_HEADERS = $(libnm_core_lib_h_pub_mkenums) \ $(libnm_lib_h_pub_mkenums) pkgconfigdir = $(libdir)/pkgconfig - -############################################################################### -pkgconfig_DATA = NetworkManager.pc libnm/libnm.pc $(am__append_83) +pkgconfig_DATA = $(am__append_5) libnm/libnm.pc $(am__append_85) pppd_plugindir = $(PPPD_PLUGIN_DIR) -pppd_plugin_LTLIBRARIES = $(am__append_20) +pppd_plugin_LTLIBRARIES = $(am__append_22) vapidir = $(datadir)/vala/vapi -vapi_DATA = $(am__append_105) +vapi_DATA = $(am__append_107) examplesdir = $(docdir)/examples rundir = $(runstatedir)/NetworkManager statedir = $(localstatedir)/lib/NetworkManager @@ -4292,26 +4301,21 @@ libnm_core_lib_h_pub_real = \ libnm_core_lib_h_pub_mkenums = \ libnm-core/nm-core-enum-types.h -libnm_core_lib_h_priv = \ - shared/nm-utils/c-list-util.h \ +libnm_core_lib_h_priv = shared/nm-utils/c-list-util.h \ shared/nm-utils/nm-dedup-multi.h \ shared/nm-utils/nm-enum-utils.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 \ + 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 \ 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-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-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 \ @@ -4353,8 +4357,8 @@ libnm_core_lib_c_real = shared/nm-utils/c-list-util.c \ libnm-core/nm-setting-wireless.c libnm-core/nm-setting.c \ libnm-core/nm-simple-connection.c libnm-core/nm-utils.c \ libnm-core/nm-vpn-editor-plugin.c \ - libnm-core/nm-vpn-plugin-info.c $(am__append_9) \ - $(am__append_11) + libnm-core/nm-vpn-plugin-info.c $(am__append_7) \ + $(am__append_11) $(am__append_13) libnm_core_lib_c_mkenums = \ libnm-core/nm-core-enum-types.c @@ -4363,7 +4367,7 @@ 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_5) $(am__append_6) $(am__append_7) + $(am__append_8) $(am__append_9) $(am__append_10) 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 = \ @@ -4386,8 +4390,7 @@ nodist_libnm_core_libnm_core_la_SOURCES = \ $(libnm_core_lib_c_mkenums) libnm_core_libnm_core_la_LIBADD = $(GLIB_LIBS) $(UUID_LIBS) \ - $(LIBUDEV_LIBS) $(am__append_8) $(am__append_10) \ - $(am__append_12) + $(LIBUDEV_LIBS) $(am__append_12) $(am__append_14) libnm_core_libnm_core_la_LDFLAGS = \ $(CODE_COVERAGE_LDFLAGS) @@ -4915,7 +4918,7 @@ src_libNetworkManagerBase_la_SOURCES = src/nm-core-utils.c \ 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_16) + src/main-utils.c src/main-utils.h $(NULL) $(am__append_18) src_libNetworkManagerBase_la_LIBADD = \ libnm-core/libnm-core.la \ introspection/libnmdbus.la \ @@ -5019,7 +5022,7 @@ src_libNetworkManager_la_SOURCES = src/nm-checkpoint-manager.c \ 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_17) + $(NULL) $(am__append_19) src_libNetworkManager_la_LIBADD = \ src/libNetworkManagerBase.la \ src/libsystemd-nm.la \ @@ -5034,7 +5037,7 @@ src_libNetworkManager_la_LIBADD = \ $(LIBPSL_LIBS) \ $(LIBCURL_LIBS) -src_tests_cppflags = $(src_cppflags) $(am__append_18) +src_tests_cppflags = $(src_cppflags) $(am__append_20) 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) @@ -5483,7 +5486,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_41) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_43) @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 \ @@ -5526,7 +5529,7 @@ 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_44) +@WITH_MODEM_MANAGER_1_TRUE@ $(am__append_46) @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 \ @@ -5535,7 +5538,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @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_43) +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_CFLAGS) $(am__append_45) @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" @@ -5543,7 +5546,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_LIBADD = \ @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_45) +@WITH_MODEM_MANAGER_1_TRUE@ $(GLIB_LIBS) $(am__append_47) @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 \ @@ -5983,16 +5986,16 @@ 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_60) +@BUILD_NMCLI_TRUE@ $(am__append_62) @BUILD_NMCLI_TRUE@clients_cli_nmcli_CPPFLAGS = \ @BUILD_NMCLI_TRUE@ -I$(srcdir)/clients/cli $(clients_cppflags) \ @BUILD_NMCLI_TRUE@ -DG_LOG_DOMAIN=\""nmcli"\" \ @BUILD_NMCLI_TRUE@ -DNMCLI_LOCALEDIR=\"$(datadir)/locale\" \ -@BUILD_NMCLI_TRUE@ $(am__append_59) +@BUILD_NMCLI_TRUE@ $(am__append_61) @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_61) +@BUILD_NMCLI_TRUE@ $(READLINE_LIBS) $(am__append_63) @BUILD_NMCLI_TRUE@clients_cli_nmcli_LDFLAGS = \ @BUILD_NMCLI_TRUE@ -Wl,--version-script="$(srcdir)/linker-script-binary.ver" @@ -6194,8 +6197,8 @@ data_edit = sed \ @WITH_LEGACY_LIBRARIES_TRUE@ -DLOCALEDIR=\"$(datadir)/locale\" \ @WITH_LEGACY_LIBRARIES_TRUE@ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \ @WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_71) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_CFLAGS) $(am__append_73) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) @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 \ @@ -6283,7 +6286,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_72) $(am__append_75) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_74) $(am__append_77) @WITH_LEGACY_LIBRARIES_TRUE@libnm_util_lib_c_mkenums = \ @WITH_LEGACY_LIBRARIES_TRUE@ libnm-util/nm-utils-enum-types.c @@ -6300,19 +6303,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_73) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_76) +@WITH_LEGACY_LIBRARIES_TRUE@ $(UUID_LIBS) $(am__append_75) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_78) @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_79) $(am__append_81) +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_81) $(am__append_83) @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_80) \ -@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_82) +@WITH_LEGACY_LIBRARIES_TRUE@ $(GLIB_LIBS) $(am__append_82) \ +@WITH_LEGACY_LIBRARIES_TRUE@ $(am__append_84) @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 @@ -7402,6 +7405,9 @@ libnm-core/libnm_core_libnm_core_la-nm-vpn-editor-plugin.lo: \ libnm-core/libnm_core_libnm_core_la-nm-vpn-plugin-info.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) +libnm-core/libnm_core_libnm_core_la-nm-json.lo: \ + libnm-core/$(am__dirstamp) \ + libnm-core/$(DEPDIR)/$(am__dirstamp) libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo: \ libnm-core/$(am__dirstamp) \ libnm-core/$(DEPDIR)/$(am__dirstamp) @@ -9833,6 +9839,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-core-enum-types.Plo@am__quote@ @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@ @@ -11405,6 +11412,13 @@ libnm-core/libnm_core_libnm_core_la-nm-vpn-plugin-info.lo: libnm-core/nm-vpn-plu @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-vpn-plugin-info.lo `test -f 'libnm-core/nm-vpn-plugin-info.c' || echo '$(srcdir)/'`libnm-core/nm-vpn-plugin-info.c +libnm-core/libnm_core_libnm_core_la-nm-json.lo: libnm-core/nm-json.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-json.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-json.Tpo -c -o libnm-core/libnm_core_libnm_core_la-nm-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-json.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-nm-json.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libnm-core/nm-json.c' object='libnm-core/libnm_core_libnm_core_la-nm-json.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-json.lo `test -f 'libnm-core/nm-json.c' || echo '$(srcdir)/'`libnm-core/nm-json.c + libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo: libnm-core/crypto_gnutls.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_gnutls.lo -MD -MP -MF libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Tpo -c -o libnm-core/libnm_core_libnm_core_la-crypto_gnutls.lo `test -f 'libnm-core/crypto_gnutls.c' || echo '$(srcdir)/'`libnm-core/crypto_gnutls.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Tpo libnm-core/$(DEPDIR)/libnm_core_libnm_core_la-crypto_gnutls.Plo diff --git a/NEWS b/NEWS index adea9f06..1a6aae8c 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,20 @@ +=============================================== +NetworkManager-1.10.4 +Overview of changes since NetworkManager-1.10.2 +=============================================== + +This is a new stable release of NetworkManager. Notable changes include: + +* 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. +* Fix libnm secret agent asynchronous initialization. +* Add a default route for a modem even if it didn't sent a gateway. +* 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 diff --git a/clients/cli/agent.c b/clients/cli/agent.c index 656a5851..488b16f4 100644 --- a/clients/cli/agent.c +++ b/clients/cli/agent.c @@ -201,10 +201,16 @@ do_agent_all (NmCli *nmc, int argc, char **argv) /* Run both secret and polkit agent */ secret_res = do_agent_secret (nmc, argc, argv); - if (secret_res != NMC_RESULT_SUCCESS) + if (secret_res != NMC_RESULT_SUCCESS) { g_printerr ("%s\n", nmc->return_text->str); + g_string_truncate (nmc->return_text, 0); + } nmc->return_value = do_agent_polkit (nmc, argc, argv); + if (nmc->return_value != NMC_RESULT_SUCCESS) { + g_printerr ("%s\n", nmc->return_text->str); + g_string_truncate (nmc->return_text, 0); + } if (nmc->return_value == NMC_RESULT_SUCCESS && secret_res != NMC_RESULT_SUCCESS) nmc->return_value = secret_res; diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 467ce427..da969fbe 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1116,8 +1116,8 @@ show_device_info (NMDevice *device, NmCli *nmc) (const NMMetaAbstractInfo *const*) nmc_fields_dev_show_general, FALSE, NULL, NULL); - row = g_new0 (NmcOutputField, _NM_META_SETTING_TYPE_NUM + 1); - for (i = 0; i < _NM_META_SETTING_TYPE_NUM; i++) + row = g_new0 (NmcOutputField, G_N_ELEMENTS (nmc_fields_dev_show_general)); + for (i = 0; i < G_N_ELEMENTS (nmc_fields_dev_show_general); i++) row[i].info = (const NMMetaAbstractInfo *) &nmc_fields_dev_show_general[i]; print_required_fields (&nmc->nmc_config, NMC_OF_FLAG_MAIN_HEADER_ONLY, diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index ee621ca3..f5a66cdd 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -454,15 +454,16 @@ signal_handler (gpointer user_data) if (nmc_get_in_readline ()) { nmcli_sigint = TRUE; } else { - g_print (_("Error: nmcli terminated by signal %s (%d)\n"), - strsignal (signo), - signo); + nm_cli.return_value = 0x80 + signo; + g_string_printf (nm_cli.return_text, _("Error: nmcli terminated by signal %s (%d)"), + strsignal (signo), signo); g_main_loop_quit (loop); } break; case SIGTERM: - g_print (_("Error: nmcli terminated by signal %s (%d)\n"), - strsignal (signo), signo); + nm_cli.return_value = 0x80 + signo; + g_string_printf (nm_cli.return_text, _("Error: nmcli terminated by signal %s (%d)"), + strsignal (signo), signo); nmc_exit (); break; } @@ -633,13 +634,14 @@ main (int argc, char *argv[]) /* Save terminal settings */ tcgetattr (STDIN_FILENO, &termios_orig); - g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM)); - g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT)); - nmc_value_transforms_register (); nmc_init (&nm_cli); loop = g_main_loop_new (NULL, FALSE); + + g_unix_signal_add (SIGTERM, signal_handler, GINT_TO_POINTER (SIGTERM)); + g_unix_signal_add (SIGINT, signal_handler, GINT_TO_POINTER (SIGINT)); + if (process_command_line (&nm_cli, argc, argv)) g_main_loop_run (loop); diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index bf4dcc77..b6ec92de 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -399,9 +399,12 @@ nmc_device_reason_to_string (NMDeviceStateReason reason) return _("The device's parent changed"); case NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: return _("The device parent's management changed"); - case NM_DEVICE_STATE_REASON_OVSDB_FAILED: return _("OpenVSwitch database connection failed"); + case NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: + return _("A duplicate IP address was detected"); + case NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: + return _("The selected IP method is not supported"); } /* TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) */ diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 9d0ac906..46b06fd4 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -4038,6 +4038,7 @@ _set_fcn_team_link_watchers (ARGS_SET_FCN) const char *const*iter; NMTeamLinkWatcher *watcher; + nm_setting_team_clear_link_watchers (NM_SETTING_TEAM (setting)); strv = nmc_strsplit_set (value, ",", 0); for (iter = (const char *const*) strv; *iter; iter++) { watcher = _parse_team_link_watcher (*iter, error); @@ -4110,6 +4111,7 @@ _set_fcn_team_port_link_watchers (ARGS_SET_FCN) const char *const*iter; NMTeamLinkWatcher *watcher; + nm_setting_team_port_clear_link_watchers (NM_SETTING_TEAM_PORT (setting)); strv = nmc_strsplit_set (value, ",", 0); for (iter = (const char *const*) strv; *iter; iter++) { watcher = _parse_team_link_watcher (*iter, error); @@ -4957,10 +4959,10 @@ static const NMMetaPropertyType _pt_gobject_devices = { "Properties available for the 'nsna_ping' link watcher:\n" \ " 'init-wait', 'interval', 'missed-max', 'target-host'*\n\n" \ "Properties available for the 'arp_ping' include all the ones for 'nsna_ping' and:\n" \ - " 'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n\n" \ + " 'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n\n" \ "Properties flagged with a '*' are mandatory.\n\n" \ "Example:\n" \ - " name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; name=ethtool,delay-up=3\n") + " name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n") #define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \ @@ -6623,7 +6625,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = 50, + .value = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT, .nick = "default", } ), @@ -6640,7 +6642,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = 255, + .value = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT, .nick = "default", } ), @@ -6696,7 +6698,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = -1, + .value = NM_SETTING_TEAM_PORT_QUEUE_ID_DEFAULT, .nick = "default", } ), @@ -6721,7 +6723,7 @@ static const NMMetaPropertyInfo *const property_infos_TEAM_PORT[] = { .property_typ_data = DEFINE_PROPERTY_TYP_DATA_SUBTYPE (gobject_int, .value_infos = INT_VALUE_INFOS ( { - .value = 255, + .value = NM_SETTING_TEAM_PORT_LACP_PRIO_DEFAULT, .nick = "default", } ), diff --git a/clients/common/settings-docs.c b/clients/common/settings-docs.c index bf544ab6..bf5753c5 100644 --- a/clients/common/settings-docs.c +++ b/clients/common/settings-docs.c @@ -325,7 +325,7 @@ #define DESCRIBE_DOC_NM_SETTING_TEAM_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.") -#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\".") +#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.") diff --git a/clients/common/settings-docs.c.in b/clients/common/settings-docs.c.in index bf544ab6..bf5753c5 100644 --- a/clients/common/settings-docs.c.in +++ b/clients/common/settings-docs.c.in @@ -325,7 +325,7 @@ #define DESCRIBE_DOC_NM_SETTING_TEAM_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.") -#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\".") +#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.") diff --git a/config.h.in b/config.h.in index 9abedb55..edec2111 100644 --- a/config.h.in +++ b/config.h.in @@ -144,6 +144,9 @@ /* Define to path of iptables binary */ #undef IPTABLES_PATH +/* Define to path to the Jansson shared library */ +#undef JANSSON_SONAME + /* Define to path of the kernel firmware directory */ #undef KERNEL_FIRMWARE_DIR diff --git a/configure b/configure index c081c15f..76b4d9bc 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for NetworkManager 1.10.2. +# Generated by GNU Autoconf 2.69 for NetworkManager 1.10.4. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='NetworkManager' PACKAGE_TARNAME='NetworkManager' -PACKAGE_VERSION='1.10.2' -PACKAGE_STRING='NetworkManager 1.10.2' +PACKAGE_VERSION='1.10.4' +PACKAGE_STRING='NetworkManager 1.10.4' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager' PACKAGE_URL='' @@ -752,6 +752,8 @@ POLKIT_CFLAGS NM_CONFIG_DEFAULT_MAIN_AUTH_POLKIT_TEXT WITH_JANSSON_FALSE WITH_JANSSON_TRUE +ac_ct_READELF +READELF WITH_TEAMDCTL_FALSE WITH_TEAMDCTL_TRUE LIBTEAMDCTL_LIBS @@ -1723,7 +1725,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures NetworkManager 1.10.2 to adapt to many kinds of systems. +\`configure' configures NetworkManager 1.10.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1793,7 +1795,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of NetworkManager 1.10.2:";; + short | recursive ) echo "Configuration of NetworkManager 1.10.4:";; esac cat <<\_ACEOF @@ -2140,7 +2142,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -NetworkManager configure 1.10.2 +NetworkManager configure 1.10.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2913,7 +2915,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by NetworkManager $as_me 1.10.2, which was +It was created by NetworkManager $as_me 1.10.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3783,7 +3785,7 @@ fi # Define the identity of the package. PACKAGE='NetworkManager' - VERSION='1.10.2' + VERSION='1.10.4' cat >>confdefs.h <<_ACEOF @@ -17967,8 +17969,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu NM_MAJOR_VERSION=1 NM_MINOR_VERSION=10 -NM_MICRO_VERSION=2 -NM_VERSION=1.10.2 +NM_MICRO_VERSION=4 +NM_VERSION=1.10.4 @@ -17976,7 +17978,7 @@ NM_VERSION=1.10.2 -NM_GIT_SHA=7ebc9258452623679b9f1c27aee94c528c14b273 +NM_GIT_SHA=f781411ceb83b9e2f678d57bc7239ba8c03b5b8d if test """" != "no-config-h" ; then @@ -24631,8 +24633,121 @@ else as_fn_error $? "jansson is needed for team configuration validation. Use --disable-json-validation to build without it." "$LINENO" 5 fi + $as_echo "#define WITH_JANSSON 1" >>confdefs.h + + if test -n "$ac_tool_prefix"; then + for ac_prog in eu-readelf readelf + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_READELF+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$READELF"; then + ac_cv_prog_READELF="$READELF" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_READELF="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +READELF=$ac_cv_prog_READELF +if test -n "$READELF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READELF" >&5 +$as_echo "$READELF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$READELF" && break + done +fi +if test -z "$READELF"; then + ac_ct_READELF=$READELF + for ac_prog in eu-readelf readelf +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_READELF+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_READELF"; then + ac_cv_prog_ac_ct_READELF="$ac_ct_READELF" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_READELF="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_READELF=$ac_cv_prog_ac_ct_READELF +if test -n "$ac_ct_READELF"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_READELF" >&5 +$as_echo "$ac_ct_READELF" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_READELF" && break +done + + if test "x$ac_ct_READELF" = x; then + READELF="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + READELF=$ac_ct_READELF + fi +fi + + JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` + JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[\([^]]*\)]/\1/p'` + + if test "$JANSSON_SONAME" = ""; then + as_fn_error $? "Unable to locate the Jansson library" "$LINENO" 5 + fi + +cat >>confdefs.h <<_ACEOF +#define JANSSON_SONAME "$JANSSON_SONAME" +_ACEOF + fi if test "${enable_json_validation}" != "no"; then WITH_JANSSON_TRUE= @@ -29279,7 +29394,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by NetworkManager $as_me 1.10.2, which was +This file was extended by NetworkManager $as_me 1.10.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29345,7 +29460,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -NetworkManager config.status 1.10.2 +NetworkManager config.status 1.10.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index a4d7c24f..c1ce21ef 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.63]) dnl The NM version number m4_define([nm_major_version], [1]) m4_define([nm_minor_version], [10]) -m4_define([nm_micro_version], [2]) +m4_define([nm_micro_version], [4]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) @@ -664,7 +664,17 @@ else if test "$have_jansson" = "no"; then AC_MSG_ERROR([jansson is needed for team configuration validation. Use --disable-json-validation to build without it.]) fi - AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) + + AC_DEFINE(WITH_JANSSON, 1, [Define if JANSSON is enabled]) + + AC_CHECK_TOOLS(READELF, [eu-readelf readelf]) + JANSSON_LIBDIR=`$PKG_CONFIG --variable=libdir jansson` + JANSSON_SONAME=`$READELF -d $JANSSON_LIBDIR/libjansson.so |sed -n 's/.*SONAME.*\[[\([^]]*\)]]/\1/p'` + + if test "$JANSSON_SONAME" = ""; then + AC_MSG_ERROR(Unable to locate the Jansson library) + fi + AC_DEFINE_UNQUOTED(JANSSON_SONAME, "$JANSSON_SONAME", [Define to path to the Jansson shared library]) fi AM_CONDITIONAL(WITH_JANSSON, test "${enable_json_validation}" != "no") diff --git a/docs/api/Makefile.in b/docs/api/Makefile.in index 0ec24a5a..41297cde 100644 --- a/docs/api/Makefile.in +++ b/docs/api/Makefile.in @@ -15,6 +15,24 @@ @SET_MAKE@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . #################################### # Everything below here is generic # @@ -323,6 +341,7 @@ PYTHON_VERSION = @PYTHON_VERSION@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ +READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ @@ -363,6 +382,7 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_NM = @ac_ct_NM@ ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_READELF = @ac_ct_READELF@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -856,6 +876,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo ""; \ diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index ec32a39c..bd53917a 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -8,7 +8,7 @@ - + @@ -1361,6 +1361,6 @@ interface-name:vboxnet*,except:interface-name:vboxnet2 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 0b7b3f8c..08ee6116 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -657,6 +657,8 @@ + + diff --git a/docs/api/html/NetworkManager.html b/docs/api/html/NetworkManager.html index 1868481e..510bd9e8 100644 --- a/docs/api/html/NetworkManager.html +++ b/docs/api/html/NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -538,6 +538,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ch01.html b/docs/api/html/ch01.html index c4e4d4d4..c6f1e645 100644 --- a/docs/api/html/ch01.html +++ b/docs/api/html/ch01.html @@ -8,7 +8,7 @@ - + @@ -143,6 +143,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/dbus-secret-agent.html b/docs/api/html/dbus-secret-agent.html index 73263315..eb71faf1 100644 --- a/docs/api/html/dbus-secret-agent.html +++ b/docs/api/html/dbus-secret-agent.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/dbus-types.html b/docs/api/html/dbus-types.html index cb571905..4250a4ef 100644 --- a/docs/api/html/dbus-types.html +++ b/docs/api/html/dbus-types.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/dbus-vpn-types.html b/docs/api/html/dbus-vpn-types.html index 80bdcb6b..e0ee8393 100644 --- a/docs/api/html/dbus-vpn-types.html +++ b/docs/api/html/dbus-vpn-types.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html index e053d0ee..757a4eb1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AccessPoint.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ LastSeen readable i +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html index 923e9c8b..9075a5a0 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.AgentManager.html @@ -8,7 +8,7 @@ - + @@ -105,6 +105,6 @@ Unregister (); +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html index 17ba5fad..0b3bf316 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Connection.Active.html @@ -8,7 +8,7 @@ - + @@ -297,6 +297,6 @@ Master readable o +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html index 8677019b..a8e63326 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP4Config.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@ Options readable a{sv} +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html index 2081f3a3..d7dfd16e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DHCP6Config.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@ Options readable a{sv} +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html index e5e3c29e..0f39847c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Adsl.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ Carrier readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html index 0764e366..54804156 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bluetooth.html @@ -8,7 +8,7 @@ - + @@ -105,6 +105,6 @@ BtCapabilities readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html index 9f893fce..d1b8e70d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bond.html @@ -8,7 +8,7 @@ - + @@ -105,6 +105,6 @@ Slaves readable ao +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html index 0033a6af..09c8faaa 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Bridge.html @@ -8,7 +8,7 @@ - + @@ -105,6 +105,6 @@ Slaves readable ao +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html index 3779dbf2..639e0bdc 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Dummy.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ HwAddress readable s +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html index 6f55ac2e..9ef3d59b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Generic.html @@ -8,7 +8,7 @@ - + @@ -93,6 +93,6 @@ TypeDescription readable s +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html index 7a6972e3..63fa2a96 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.IPTunnel.html @@ -8,7 +8,7 @@ - + @@ -187,6 +187,6 @@ FlowLabel readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html index dd7bff77..930057ef 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Infiniband.html @@ -8,7 +8,7 @@ - + @@ -94,6 +94,6 @@ Carrier readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html index 4275e298..8a1c231e 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macsec.html @@ -8,7 +8,7 @@ - + @@ -209,6 +209,6 @@ ReplayProtect readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html index 9e5e2ba1..937d3347 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Macvlan.html @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@ Tap readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html index 8e6cb2f2..74986845 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Modem.html @@ -8,7 +8,7 @@ - + @@ -101,6 +101,6 @@ CurrentCapabilities readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html index 75ccef38..883ac64c 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.OlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -103,6 +103,6 @@ ActiveChannel readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html index dadac210..1ec5802a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Statistics.html @@ -8,7 +8,7 @@ - + @@ -106,6 +106,6 @@ RxBytes readable t +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html index 7d338dc8..ee41dde2 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Team.html @@ -8,7 +8,7 @@ - + @@ -115,6 +115,6 @@ Config readable s +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html index 353ace83..72d55060 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Tun.html @@ -8,7 +8,7 @@ - + @@ -146,6 +146,6 @@ HwAddress readable s +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html index c364bbb2..1d489ae7 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Veth.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ Peer readable o +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html index 8b9b68bb..c452fafa 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vlan.html @@ -8,7 +8,7 @@ - + @@ -114,6 +114,6 @@ VlanId readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html index 69dcfbe5..2320de2b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Vxlan.html @@ -8,7 +8,7 @@ - + @@ -250,6 +250,6 @@ L3miss readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html index db5db0f7..96270fa8 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.WiMax.html @@ -8,7 +8,7 @@ - + @@ -231,6 +231,6 @@ ActiveNsp readable o +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html index 232b4b54..37f62ae5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wired.html @@ -8,7 +8,7 @@ - + @@ -124,6 +124,6 @@ Carrier readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html index 13ffd14b..9019b511 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Wireless.html @@ -8,7 +8,7 @@ - + @@ -259,6 +259,6 @@ WirelessCapabilities readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html index 4f62d52f..5e67c999 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.html @@ -8,7 +8,7 @@ - + @@ -536,6 +536,6 @@ Real readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html index 358e11c7..91bb94d5 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.DnsManager.html @@ -8,7 +8,7 @@ - + @@ -82,6 +82,6 @@ Configuration readable aa{sv} +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html index 47f3da57..4874db9d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP4Config.html @@ -8,7 +8,7 @@ - + @@ -195,6 +195,6 @@ WinsServers readable au +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html index a505fe33..4943c32b 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.IP6Config.html @@ -8,7 +8,7 @@ - + @@ -179,6 +179,6 @@ DnsPriority readable i +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html index 55503b09..874c436d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.PPP.html @@ -8,7 +8,7 @@ - + @@ -128,6 +128,6 @@ SetState (IN u state); +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html index cfae9aa3..7d5f279a 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.SecretAgent.html @@ -8,7 +8,7 @@ - + @@ -197,6 +197,6 @@ DeleteSecrets (IN a{sa{sv}} connection, +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html index b644fdef..72efbc92 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.Connection.html @@ -8,7 +8,7 @@ - + @@ -322,6 +322,6 @@ Unsaved readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html index 830f1462..325733eb 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Settings.html @@ -8,7 +8,7 @@ - + @@ -359,6 +359,6 @@ CanModify readable b +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html index f1c9bab4..687da6c1 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Connection.html @@ -8,7 +8,7 @@ - + @@ -124,6 +124,6 @@ Banner readable s +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html index 9dda7f3d..51047c7d 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.VPN.Plugin.html @@ -8,7 +8,7 @@ - + @@ -415,6 +415,6 @@ State readable u +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html index 0d804cd3..836d15b6 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -908,6 +908,6 @@ GlobalDnsConfiguration readwrite a{sv} +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/index.html b/docs/api/html/index.html index eab5cbca..b3222072 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@

- for NetworkManager 1.10.2 + for NetworkManager 1.10.4 The latest version of this documentation can be found on-line at https://developer.gnome.org/NetworkManager/stable/. @@ -376,6 +376,6 @@

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index 674f2857..3a170dd0 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -8,7 +8,7 @@ - + @@ -26,1456 +26,1456 @@

Symbols

-
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint +
org.freedesktop.NetworkManager.AccessPoint, org.freedesktop.NetworkManager.AccessPoint
-
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.AccessPoint::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property +
org.freedesktop.NetworkManager.AccessPoint:Flags, The "Flags" property
-
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property +
org.freedesktop.NetworkManager.AccessPoint:Frequency, The "Frequency" property
-
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.AccessPoint:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property +
org.freedesktop.NetworkManager.AccessPoint:LastSeen, The "LastSeen" property
-
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property +
org.freedesktop.NetworkManager.AccessPoint:MaxBitrate, The "MaxBitrate" property
-
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property +
org.freedesktop.NetworkManager.AccessPoint:Mode, The "Mode" property
-
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property +
org.freedesktop.NetworkManager.AccessPoint:RsnFlags, The "RsnFlags" property
-
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property +
org.freedesktop.NetworkManager.AccessPoint:Ssid, The "Ssid" property
-
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property +
org.freedesktop.NetworkManager.AccessPoint:Strength, The "Strength" property
-
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property +
org.freedesktop.NetworkManager.AccessPoint:WpaFlags, The "WpaFlags" property
-
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager +
org.freedesktop.NetworkManager.AgentManager, org.freedesktop.NetworkManager.AgentManager
-
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method +
org.freedesktop.NetworkManager.AgentManager.Register(), The Register() method
-
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method +
org.freedesktop.NetworkManager.AgentManager.RegisterWithCapabilities(), The RegisterWithCapabilities() method
-
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method +
org.freedesktop.NetworkManager.AgentManager.Unregister(), The Unregister() method
-
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device +
org.freedesktop.NetworkManager.Device, org.freedesktop.NetworkManager.Device
-
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl +
org.freedesktop.NetworkManager.Device.Adsl, org.freedesktop.NetworkManager.Device.Adsl
-
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Adsl::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Adsl:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth +
org.freedesktop.NetworkManager.Device.Bluetooth, org.freedesktop.NetworkManager.Device.Bluetooth
-
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Bluetooth::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property +
org.freedesktop.NetworkManager.Device.Bluetooth:BtCapabilities, The "BtCapabilities" property
-
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Bluetooth:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property +
org.freedesktop.NetworkManager.Device.Bluetooth:Name, The "Name" property
-
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond +
org.freedesktop.NetworkManager.Device.Bond, org.freedesktop.NetworkManager.Device.Bond
-
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Bond::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Bond:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Bond:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property +
org.freedesktop.NetworkManager.Device.Bond:Slaves, The "Slaves" property
-
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge +
org.freedesktop.NetworkManager.Device.Bridge, org.freedesktop.NetworkManager.Device.Bridge
-
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Bridge::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Bridge:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Bridge:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property +
org.freedesktop.NetworkManager.Device.Bridge:Slaves, The "Slaves" property
-
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method +
org.freedesktop.NetworkManager.Device.Delete(), The Delete() method
-
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method +
org.freedesktop.NetworkManager.Device.Disconnect(), The Disconnect() method
-
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy +
org.freedesktop.NetworkManager.Device.Dummy, org.freedesktop.NetworkManager.Device.Dummy
-
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Dummy::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Dummy:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic +
org.freedesktop.NetworkManager.Device.Generic, org.freedesktop.NetworkManager.Device.Generic
-
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Generic::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Generic:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property +
org.freedesktop.NetworkManager.Device.Generic:TypeDescription, The "TypeDescription" property
-
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method +
org.freedesktop.NetworkManager.Device.GetAppliedConnection(), The GetAppliedConnection() method
-
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband +
org.freedesktop.NetworkManager.Device.Infiniband, org.freedesktop.NetworkManager.Device.Infiniband
-
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Infiniband::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Infiniband:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Infiniband:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel +
org.freedesktop.NetworkManager.Device.IPTunnel, org.freedesktop.NetworkManager.Device.IPTunnel
-
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.IPTunnel::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property +
org.freedesktop.NetworkManager.Device.IPTunnel:EncapsulationLimit, The "EncapsulationLimit" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property +
org.freedesktop.NetworkManager.Device.IPTunnel:FlowLabel, The "FlowLabel" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property +
org.freedesktop.NetworkManager.Device.IPTunnel:InputKey, The "InputKey" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property +
org.freedesktop.NetworkManager.Device.IPTunnel:Local, The "Local" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property +
org.freedesktop.NetworkManager.Device.IPTunnel:Mode, The "Mode" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property +
org.freedesktop.NetworkManager.Device.IPTunnel:OutputKey, The "OutputKey" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property +
org.freedesktop.NetworkManager.Device.IPTunnel:Parent, The "Parent" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property +
org.freedesktop.NetworkManager.Device.IPTunnel:PathMtuDiscovery, The "PathMtuDiscovery" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property +
org.freedesktop.NetworkManager.Device.IPTunnel:Remote, The "Remote" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property +
org.freedesktop.NetworkManager.Device.IPTunnel:Tos, The "Tos" property
-
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property +
org.freedesktop.NetworkManager.Device.IPTunnel:Ttl, The "Ttl" property
-
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec +
org.freedesktop.NetworkManager.Device.Macsec, org.freedesktop.NetworkManager.Device.Macsec
-
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Macsec::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property +
org.freedesktop.NetworkManager.Device.Macsec:CipherSuite, The "CipherSuite" property
-
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property +
org.freedesktop.NetworkManager.Device.Macsec:EncodingSa, The "EncodingSa" property
-
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property +
org.freedesktop.NetworkManager.Device.Macsec:Encrypt, The "Encrypt" property
-
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property +
org.freedesktop.NetworkManager.Device.Macsec:Es, The "Es" property
-
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property +
org.freedesktop.NetworkManager.Device.Macsec:IcvLength, The "IcvLength" property
-
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property +
org.freedesktop.NetworkManager.Device.Macsec:IncludeSci, The "IncludeSci" property
-
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property +
org.freedesktop.NetworkManager.Device.Macsec:Parent, The "Parent" property
-
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property +
org.freedesktop.NetworkManager.Device.Macsec:Protect, The "Protect" property
-
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property +
org.freedesktop.NetworkManager.Device.Macsec:ReplayProtect, The "ReplayProtect" property
-
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property +
org.freedesktop.NetworkManager.Device.Macsec:Scb, The "Scb" property
-
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property +
org.freedesktop.NetworkManager.Device.Macsec:Sci, The "Sci" property
-
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property +
org.freedesktop.NetworkManager.Device.Macsec:Validation, The "Validation" property
-
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property +
org.freedesktop.NetworkManager.Device.Macsec:Window, The "Window" property
-
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan +
org.freedesktop.NetworkManager.Device.Macvlan, org.freedesktop.NetworkManager.Device.Macvlan
-
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Macvlan::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property +
org.freedesktop.NetworkManager.Device.Macvlan:Mode, The "Mode" property
-
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property +
org.freedesktop.NetworkManager.Device.Macvlan:NoPromisc, The "NoPromisc" property
-
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property +
org.freedesktop.NetworkManager.Device.Macvlan:Parent, The "Parent" property
-
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property +
org.freedesktop.NetworkManager.Device.Macvlan:Tap, The "Tap" property
-
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem +
org.freedesktop.NetworkManager.Device.Modem, org.freedesktop.NetworkManager.Device.Modem
-
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Modem::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property +
org.freedesktop.NetworkManager.Device.Modem:CurrentCapabilities, The "CurrentCapabilities" property
-
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property +
org.freedesktop.NetworkManager.Device.Modem:ModemCapabilities, The "ModemCapabilities" property
-
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh +
org.freedesktop.NetworkManager.Device.OlpcMesh, org.freedesktop.NetworkManager.Device.OlpcMesh
-
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.OlpcMesh::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property +
org.freedesktop.NetworkManager.Device.OlpcMesh:ActiveChannel, The "ActiveChannel" property
-
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property +
org.freedesktop.NetworkManager.Device.OlpcMesh:Companion, The "Companion" property
-
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.OlpcMesh:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method +
org.freedesktop.NetworkManager.Device.Reapply(), The Reapply() method
-
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics +
org.freedesktop.NetworkManager.Device.Statistics, org.freedesktop.NetworkManager.Device.Statistics
-
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Statistics::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property +
org.freedesktop.NetworkManager.Device.Statistics:RefreshRateMs, The "RefreshRateMs" property
-
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property +
org.freedesktop.NetworkManager.Device.Statistics:RxBytes, The "RxBytes" property
-
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property +
org.freedesktop.NetworkManager.Device.Statistics:TxBytes, The "TxBytes" property
-
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team +
org.freedesktop.NetworkManager.Device.Team, org.freedesktop.NetworkManager.Device.Team
-
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Team::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Team:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property +
org.freedesktop.NetworkManager.Device.Team:Config, The "Config" property
-
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Team:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property +
org.freedesktop.NetworkManager.Device.Team:Slaves, The "Slaves" property
-
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun +
org.freedesktop.NetworkManager.Device.Tun, org.freedesktop.NetworkManager.Device.Tun
-
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Tun::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property +
org.freedesktop.NetworkManager.Device.Tun:Group, The "Group" property
-
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Tun:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property +
org.freedesktop.NetworkManager.Device.Tun:Mode, The "Mode" property
-
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property +
org.freedesktop.NetworkManager.Device.Tun:MultiQueue, The "MultiQueue" property
-
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property +
org.freedesktop.NetworkManager.Device.Tun:NoPi, The "NoPi" property
-
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property +
org.freedesktop.NetworkManager.Device.Tun:Owner, The "Owner" property
-
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property +
org.freedesktop.NetworkManager.Device.Tun:VnetHdr, The "VnetHdr" property
-
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth +
org.freedesktop.NetworkManager.Device.Veth, org.freedesktop.NetworkManager.Device.Veth
-
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Veth::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property +
org.freedesktop.NetworkManager.Device.Veth:Peer, The "Peer" property
-
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan +
org.freedesktop.NetworkManager.Device.Vlan, org.freedesktop.NetworkManager.Device.Vlan
-
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Vlan::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Vlan:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Vlan:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property +
org.freedesktop.NetworkManager.Device.Vlan:Parent, The "Parent" property
-
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property +
org.freedesktop.NetworkManager.Device.Vlan:VlanId, The "VlanId" property
-
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan +
org.freedesktop.NetworkManager.Device.Vxlan, org.freedesktop.NetworkManager.Device.Vxlan
-
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Vxlan::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property +
org.freedesktop.NetworkManager.Device.Vxlan:Ageing, The "Ageing" property
-
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property +
org.freedesktop.NetworkManager.Device.Vxlan:DstPort, The "DstPort" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property +
org.freedesktop.NetworkManager.Device.Vxlan:Group, The "Group" property
-
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Vxlan:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property +
org.freedesktop.NetworkManager.Device.Vxlan:Id, The "Id" property
-
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property +
org.freedesktop.NetworkManager.Device.Vxlan:L2miss, The "L2miss" property
-
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property +
org.freedesktop.NetworkManager.Device.Vxlan:L3miss, The "L3miss" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property +
org.freedesktop.NetworkManager.Device.Vxlan:Learning, The "Learning" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property +
org.freedesktop.NetworkManager.Device.Vxlan:Limit, The "Limit" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property +
org.freedesktop.NetworkManager.Device.Vxlan:Local, The "Local" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property +
org.freedesktop.NetworkManager.Device.Vxlan:Parent, The "Parent" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property +
org.freedesktop.NetworkManager.Device.Vxlan:Proxy, The "Proxy" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property +
org.freedesktop.NetworkManager.Device.Vxlan:Rsc, The "Rsc" property
-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property +
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMax, The "SrcPortMax" property
-
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property +
org.freedesktop.NetworkManager.Device.Vxlan:SrcPortMin, The "SrcPortMin" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property +
org.freedesktop.NetworkManager.Device.Vxlan:Tos, The "Tos" property
-
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property +
org.freedesktop.NetworkManager.Device.Vxlan:Ttl, The "Ttl" property
-
org.freedesktop.NetworkManager.Device.WiMax, org.freedesktop.NetworkManager.Device.WiMax +
org.freedesktop.NetworkManager.Device.WiMax, org.freedesktop.NetworkManager.Device.WiMax
-
org.freedesktop.NetworkManager.Device.WiMax.GetNspList(), The GetNspList() method +
org.freedesktop.NetworkManager.Device.WiMax.GetNspList(), The GetNspList() method
-
org.freedesktop.NetworkManager.Device.WiMax::NspAdded, The "NspAdded" signal +
org.freedesktop.NetworkManager.Device.WiMax::NspAdded, The "NspAdded" signal
-
org.freedesktop.NetworkManager.Device.WiMax::NspRemoved, The "NspRemoved" signal +
org.freedesktop.NetworkManager.Device.WiMax::NspRemoved, The "NspRemoved" signal
-
org.freedesktop.NetworkManager.Device.WiMax::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.WiMax::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp, The "ActiveNsp" property +
org.freedesktop.NetworkManager.Device.WiMax:ActiveNsp, The "ActiveNsp" property
-
org.freedesktop.NetworkManager.Device.WiMax:Bsid, The "Bsid" property +
org.freedesktop.NetworkManager.Device.WiMax:Bsid, The "Bsid" property
-
org.freedesktop.NetworkManager.Device.WiMax:CenterFrequency, The "CenterFrequency" property +
org.freedesktop.NetworkManager.Device.WiMax:CenterFrequency, The "CenterFrequency" property
-
org.freedesktop.NetworkManager.Device.WiMax:Cinr, The "Cinr" property +
org.freedesktop.NetworkManager.Device.WiMax:Cinr, The "Cinr" property
-
org.freedesktop.NetworkManager.Device.WiMax:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.WiMax:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.WiMax:Nsps, The "Nsps" property +
org.freedesktop.NetworkManager.Device.WiMax:Nsps, The "Nsps" property
-
org.freedesktop.NetworkManager.Device.WiMax:Rssi, The "Rssi" property +
org.freedesktop.NetworkManager.Device.WiMax:Rssi, The "Rssi" property
-
org.freedesktop.NetworkManager.Device.WiMax:TxPower, The "TxPower" property +
org.freedesktop.NetworkManager.Device.WiMax:TxPower, The "TxPower" property
-
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal +
org.freedesktop.NetworkManager.Device::StateChanged, The "StateChanged" signal
-
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property +
org.freedesktop.NetworkManager.Device:ActiveConnection, The "ActiveConnection" property
-
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property +
org.freedesktop.NetworkManager.Device:Autoconnect, The "Autoconnect" property
-
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property +
org.freedesktop.NetworkManager.Device:AvailableConnections, The "AvailableConnections" property
-
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property +
org.freedesktop.NetworkManager.Device:Capabilities, The "Capabilities" property
-
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property +
org.freedesktop.NetworkManager.Device:DeviceType, The "DeviceType" property
-
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property +
org.freedesktop.NetworkManager.Device:Dhcp4Config, The "Dhcp4Config" property
-
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property +
org.freedesktop.NetworkManager.Device:Dhcp6Config, The "Dhcp6Config" property
-
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property +
org.freedesktop.NetworkManager.Device:Driver, The "Driver" property
-
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property +
org.freedesktop.NetworkManager.Device:DriverVersion, The "DriverVersion" property
-
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property +
org.freedesktop.NetworkManager.Device:FirmwareMissing, The "FirmwareMissing" property
-
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property +
org.freedesktop.NetworkManager.Device:FirmwareVersion, The "FirmwareVersion" property
-
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property +
org.freedesktop.NetworkManager.Device:Interface, The "Interface" property
-
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property +
org.freedesktop.NetworkManager.Device:Ip4Address, The "Ip4Address" property
-
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property +
org.freedesktop.NetworkManager.Device:Ip4Config, The "Ip4Config" property
-
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property +
org.freedesktop.NetworkManager.Device:Ip6Config, The "Ip6Config" property
-
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property +
org.freedesktop.NetworkManager.Device:IpInterface, The "IpInterface" property
-
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property +
org.freedesktop.NetworkManager.Device:LldpNeighbors, The "LldpNeighbors" property
-
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property +
org.freedesktop.NetworkManager.Device:Managed, The "Managed" property
-
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property +
org.freedesktop.NetworkManager.Device:Metered, The "Metered" property
-
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property +
org.freedesktop.NetworkManager.Device:Mtu, The "Mtu" property
-
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property +
org.freedesktop.NetworkManager.Device:NmPluginMissing, The "NmPluginMissing" property
-
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property +
org.freedesktop.NetworkManager.Device:PhysicalPortId, The "PhysicalPortId" property
-
org.freedesktop.NetworkManager.Device:Real, The "Real" property +
org.freedesktop.NetworkManager.Device:Real, The "Real" property
-
org.freedesktop.NetworkManager.Device:State, The "State" property +
org.freedesktop.NetworkManager.Device:State, The "State" property
-
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property +
org.freedesktop.NetworkManager.Device:StateReason, The "StateReason" property
-
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property +
org.freedesktop.NetworkManager.Device:Udi, The "Udi" property
-
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager +
org.freedesktop.NetworkManager.DnsManager, org.freedesktop.NetworkManager.DnsManager
-
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property +
org.freedesktop.NetworkManager.DnsManager:Configuration, The "Configuration" property
-
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property +
org.freedesktop.NetworkManager.DnsManager:Mode, The "Mode" property
-
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property +
org.freedesktop.NetworkManager.DnsManager:RcManager, The "RcManager" property
-
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config +
org.freedesktop.NetworkManager.IP4Config, org.freedesktop.NetworkManager.IP4Config
-
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.IP4Config::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property +
org.freedesktop.NetworkManager.IP4Config:AddressData, The "AddressData" property
-
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property +
org.freedesktop.NetworkManager.IP4Config:Addresses, The "Addresses" property
-
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property +
org.freedesktop.NetworkManager.IP4Config:DnsOptions, The "DnsOptions" property
-
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property +
org.freedesktop.NetworkManager.IP4Config:DnsPriority, The "DnsPriority" property
-
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property +
org.freedesktop.NetworkManager.IP4Config:Domains, The "Domains" property
-
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property +
org.freedesktop.NetworkManager.IP4Config:Gateway, The "Gateway" property
-
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property +
org.freedesktop.NetworkManager.IP4Config:Nameservers, The "Nameservers" property
-
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property +
org.freedesktop.NetworkManager.IP4Config:RouteData, The "RouteData" property
-
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property +
org.freedesktop.NetworkManager.IP4Config:Routes, The "Routes" property
-
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property +
org.freedesktop.NetworkManager.IP4Config:Searches, The "Searches" property
-
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property +
org.freedesktop.NetworkManager.IP4Config:WinsServers, The "WinsServers" property
-
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config +
org.freedesktop.NetworkManager.IP6Config, org.freedesktop.NetworkManager.IP6Config
-
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.IP6Config::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property +
org.freedesktop.NetworkManager.IP6Config:AddressData, The "AddressData" property
-
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property +
org.freedesktop.NetworkManager.IP6Config:Addresses, The "Addresses" property
-
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property +
org.freedesktop.NetworkManager.IP6Config:DnsOptions, The "DnsOptions" property
-
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property +
org.freedesktop.NetworkManager.IP6Config:DnsPriority, The "DnsPriority" property
-
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property +
org.freedesktop.NetworkManager.IP6Config:Domains, The "Domains" property
-
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property +
org.freedesktop.NetworkManager.IP6Config:Gateway, The "Gateway" property
-
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property +
org.freedesktop.NetworkManager.IP6Config:Nameservers, The "Nameservers" property
-
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property +
org.freedesktop.NetworkManager.IP6Config:RouteData, The "RouteData" property
-
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property +
org.freedesktop.NetworkManager.IP6Config:Routes, The "Routes" property
-
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property +
org.freedesktop.NetworkManager.IP6Config:Searches, The "Searches" property
-
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent +
org.freedesktop.NetworkManager.SecretAgent, org.freedesktop.NetworkManager.SecretAgent
-
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method +
org.freedesktop.NetworkManager.SecretAgent.CancelGetSecrets(), The CancelGetSecrets() method
-
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method +
org.freedesktop.NetworkManager.SecretAgent.DeleteSecrets(), The DeleteSecrets() method
-
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method +
org.freedesktop.NetworkManager.SecretAgent.GetSecrets(), The GetSecrets() method
-
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method +
org.freedesktop.NetworkManager.SecretAgent.SaveSecrets(), The SaveSecrets() method
-
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings +
org.freedesktop.NetworkManager.Settings, org.freedesktop.NetworkManager.Settings
-
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method +
org.freedesktop.NetworkManager.Settings.AddConnection(), The AddConnection() method
-
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method +
org.freedesktop.NetworkManager.Settings.AddConnectionUnsaved(), The AddConnectionUnsaved() method
-
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection +
org.freedesktop.NetworkManager.Settings.Connection, org.freedesktop.NetworkManager.Settings.Connection
-
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method +
org.freedesktop.NetworkManager.Settings.Connection.ClearSecrets(), The ClearSecrets() method
-
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method +
org.freedesktop.NetworkManager.Settings.Connection.Delete(), The Delete() method
-
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method +
org.freedesktop.NetworkManager.Settings.Connection.GetSecrets(), The GetSecrets() method
-
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method +
org.freedesktop.NetworkManager.Settings.Connection.GetSettings(), The GetSettings() method
-
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method +
org.freedesktop.NetworkManager.Settings.Connection.Save(), The Save() method
-
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method +
org.freedesktop.NetworkManager.Settings.Connection.Update(), The Update() method
-
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method +
org.freedesktop.NetworkManager.Settings.Connection.Update2(), The Update2() method
-
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method +
org.freedesktop.NetworkManager.Settings.Connection.UpdateUnsaved(), The UpdateUnsaved() method
-
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Settings.Connection::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal +
org.freedesktop.NetworkManager.Settings.Connection::Removed, The "Removed" signal
-
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal +
org.freedesktop.NetworkManager.Settings.Connection::Updated, The "Updated" signal
-
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property +
org.freedesktop.NetworkManager.Settings.Connection:Unsaved, The "Unsaved" property
-
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method +
org.freedesktop.NetworkManager.Settings.GetConnectionByUuid(), The GetConnectionByUuid() method
-
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method +
org.freedesktop.NetworkManager.Settings.ListConnections(), The ListConnections() method
-
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method +
org.freedesktop.NetworkManager.Settings.LoadConnections(), The LoadConnections() method
-
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method +
org.freedesktop.NetworkManager.Settings.ReloadConnections(), The ReloadConnections() method
-
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method +
org.freedesktop.NetworkManager.Settings.SaveHostname(), The SaveHostname() method
-
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal +
org.freedesktop.NetworkManager.Settings::ConnectionRemoved, The "ConnectionRemoved" signal
-
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal +
org.freedesktop.NetworkManager.Settings::NewConnection, The "NewConnection" signal
-
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Settings::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property +
org.freedesktop.NetworkManager.Settings:CanModify, The "CanModify" property
-
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property +
org.freedesktop.NetworkManager.Settings:Connections, The "Connections" property
-
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property +
org.freedesktop.NetworkManager.Settings:Hostname, The "Hostname" property

A

-
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active +
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
-
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Connection.Active::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal +
org.freedesktop.NetworkManager.Connection.Active::StateChanged, The "StateChanged" signal
-
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property +
org.freedesktop.NetworkManager.Connection.Active:Connection, The "Connection" property
-
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property +
org.freedesktop.NetworkManager.Connection.Active:Default, The "Default" property
-
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property +
org.freedesktop.NetworkManager.Connection.Active:Default6, The "Default6" property
-
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property +
org.freedesktop.NetworkManager.Connection.Active:Devices, The "Devices" property
-
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property +
org.freedesktop.NetworkManager.Connection.Active:Dhcp4Config, The "Dhcp4Config" property
-
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property +
org.freedesktop.NetworkManager.Connection.Active:Dhcp6Config, The "Dhcp6Config" property
-
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property +
org.freedesktop.NetworkManager.Connection.Active:Id, The "Id" property
-
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property +
org.freedesktop.NetworkManager.Connection.Active:Ip4Config, The "Ip4Config" property
-
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property +
org.freedesktop.NetworkManager.Connection.Active:Ip6Config, The "Ip6Config" property
-
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property +
org.freedesktop.NetworkManager.Connection.Active:Master, The "Master" property
-
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property +
org.freedesktop.NetworkManager.Connection.Active:SpecificObject, The "SpecificObject" property
-
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property +
org.freedesktop.NetworkManager.Connection.Active:State, The "State" property
-
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property +
org.freedesktop.NetworkManager.Connection.Active:StateFlags, The "StateFlags" property
-
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property +
org.freedesktop.NetworkManager.Connection.Active:Type, The "Type" property
-
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property +
org.freedesktop.NetworkManager.Connection.Active:Uuid, The "Uuid" property
-
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property +
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
-
addr-gen-mode, ipv6 +
addr-gen-mode, ipv6
-
address-data, ipv4, ipv6 +
address-data, ipv4, ipv6
-
addresses, ipv4, ipv6 +
addresses, ipv4, ipv6
-
ageing, vxlan +
ageing, vxlan
-
ageing-time, bridge +
ageing-time, bridge
-
altsubject-matches, 802-1x +
altsubject-matches, 802-1x
-
anonymous-identity, 802-1x +
anonymous-identity, 802-1x
-
apn, gsm +
apn, gsm
-
app-fcoe-flags, dcb +
app-fcoe-flags, dcb
-
app-fcoe-mode, dcb +
app-fcoe-mode, dcb
-
app-fcoe-priority, dcb +
app-fcoe-priority, dcb
-
app-fip-flags, dcb +
app-fip-flags, dcb
-
app-fip-priority, dcb +
app-fip-priority, dcb
-
app-iscsi-flags, dcb +
app-iscsi-flags, dcb
-
app-iscsi-priority, dcb +
app-iscsi-priority, dcb
-
assigned-mac-address, 802-3-ethernet, 802-11-wireless +
assigned-mac-address, 802-3-ethernet, 802-11-wireless
-
auth-alg, 802-11-wireless-security +
auth-alg, 802-11-wireless-security
-
auth-retries, connection +
auth-retries, connection
-
auth-timeout, 802-1x +
auth-timeout, 802-1x
-
auto-negotiate, 802-3-ethernet +
auto-negotiate, 802-3-ethernet
-
autoconnect, connection +
autoconnect, connection
-
autoconnect-priority, connection +
autoconnect-priority, connection
-
autoconnect-retries, connection +
autoconnect-retries, connection
-
autoconnect-slaves, connection +
autoconnect-slaves, connection

B

-
band, 802-11-wireless +
band, 802-11-wireless
-
baud, ppp, serial +
baud, ppp, serial
-
bdaddr, bluetooth +
bdaddr, bluetooth
-
bits, serial +
bits, serial
-
bond-downdelay, ovs-port +
bond-downdelay, ovs-port
-
bond-mode, ovs-port +
bond-mode, ovs-port
-
bond-updelay, ovs-port +
bond-updelay, ovs-port
-
browser-only, proxy +
browser-only, proxy
-
bssid, 802-11-wireless +
bssid, 802-11-wireless

C

-
ca-cert, 802-1x +
ca-cert, 802-1x
-
ca-cert-password, 802-1x +
ca-cert-password, 802-1x
-
ca-cert-password-flags, 802-1x +
ca-cert-password-flags, 802-1x
-
ca-path, 802-1x +
ca-path, 802-1x
-
channel, 802-11-olpc-mesh, 802-11-wireless +
channel, 802-11-olpc-mesh, 802-11-wireless
-
client-cert, 802-1x +
client-cert, 802-1x
-
client-cert-password, 802-1x +
client-cert-password, 802-1x
-
client-cert-password-flags, 802-1x +
client-cert-password-flags, 802-1x
-
cloned-mac-address, 802-3-ethernet, 802-11-wireless +
cloned-mac-address, 802-3-ethernet, 802-11-wireless
-
config, team, team-port +
config, team, team-port
-
crtscts, ppp +
crtscts, ppp

D

-
dad-timeout, ipv4, ipv6 +
dad-timeout, ipv4, ipv6
-
data, user, vpn +
data, user, vpn
-
destination-port, vxlan +
destination-port, vxlan
-
device-id, gsm +
device-id, gsm
-
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired +
org.freedesktop.NetworkManager.Device.Wired, org.freedesktop.NetworkManager.Device.Wired
-
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Wired::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property +
org.freedesktop.NetworkManager.Device.Wired:Carrier, The "Carrier" property
-
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Wired:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property +
org.freedesktop.NetworkManager.Device.Wired:PermHwAddress, The "PermHwAddress" property
-
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property +
org.freedesktop.NetworkManager.Device.Wired:S390Subchannels, The "S390Subchannels" property
-
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property +
org.freedesktop.NetworkManager.Device.Wired:Speed, The "Speed" property
-
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless +
org.freedesktop.NetworkManager.Device.Wireless, org.freedesktop.NetworkManager.Device.Wireless
-
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method +
org.freedesktop.NetworkManager.Device.Wireless.GetAccessPoints(), The GetAccessPoints() method
-
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method +
org.freedesktop.NetworkManager.Device.Wireless.GetAllAccessPoints(), The GetAllAccessPoints() method
-
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method +
org.freedesktop.NetworkManager.Device.Wireless.RequestScan(), The RequestScan() method
-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal +
org.freedesktop.NetworkManager.Device.Wireless::AccessPointAdded, The "AccessPointAdded" signal
-
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal +
org.freedesktop.NetworkManager.Device.Wireless::AccessPointRemoved, The "AccessPointRemoved" signal
-
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.Device.Wireless::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property +
org.freedesktop.NetworkManager.Device.Wireless:AccessPoints, The "AccessPoints" property
-
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property +
org.freedesktop.NetworkManager.Device.Wireless:ActiveAccessPoint, The "ActiveAccessPoint" property
-
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property +
org.freedesktop.NetworkManager.Device.Wireless:Bitrate, The "Bitrate" property
-
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property +
org.freedesktop.NetworkManager.Device.Wireless:HwAddress, The "HwAddress" property
-
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property +
org.freedesktop.NetworkManager.Device.Wireless:Mode, The "Mode" property
-
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property +
org.freedesktop.NetworkManager.Device.Wireless:PermHwAddress, The "PermHwAddress" property
-
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property +
org.freedesktop.NetworkManager.Device.Wireless:WirelessCapabilities, The "WirelessCapabilities" property
-
dhcp-anycast-address, 802-11-olpc-mesh +
dhcp-anycast-address, 802-11-olpc-mesh
-
dhcp-client-id, ipv4 +
dhcp-client-id, ipv4
-
dhcp-fqdn, ipv4 +
dhcp-fqdn, ipv4
-
dhcp-hostname, ipv4, ipv6 +
dhcp-hostname, ipv4, ipv6
-
dhcp-send-hostname, ipv4, ipv6 +
dhcp-send-hostname, ipv4, ipv6
-
dhcp-timeout, ipv4, ipv6 +
dhcp-timeout, ipv4, ipv6
-
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config +
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
-
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.DHCP4Config::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property +
org.freedesktop.NetworkManager.DHCP4Config:Options, The "Options" property
-
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config +
org.freedesktop.NetworkManager.DHCP6Config, org.freedesktop.NetworkManager.DHCP6Config
-
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.DHCP6Config::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property +
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
-
dns, ipv4, ipv6 +
dns, ipv4, ipv6
-
dns-options, ipv4, ipv6 +
dns-options, ipv4, ipv6
-
dns-priority, ipv4, ipv6 +
dns-priority, ipv4, ipv6
-
dns-search, ipv4, ipv6 +
dns-search, ipv4, ipv6
-
domain-suffix-match, 802-1x +
domain-suffix-match, 802-1x
-
duplex, 802-3-ethernet +
duplex, 802-3-ethernet

E

-
eap, 802-1x +
eap, 802-1x
-
egress-priority-map, vlan +
egress-priority-map, vlan
-
encapsulation, adsl +
encapsulation, adsl
-
encapsulation-limit, ip-tunnel +
encapsulation-limit, ip-tunnel
-
encrypt, macsec +
encrypt, macsec

F

-
fail-mode, ovs-bridge +
fail-mode, ovs-bridge
-
flags, vlan +
flags, vlan
-
flow-label, ip-tunnel +
flow-label, ip-tunnel
-
forward-delay, bridge +
forward-delay, bridge

G

-
gateway, ipv4, ipv6 +
gateway, ipv4, ipv6
-
gateway-ping-timeout, connection +
gateway-ping-timeout, connection
-
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless +
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
-
group, tun, 802-11-wireless-security +
group, tun, 802-11-wireless-security
-
group-forward-mask, bridge +
group-forward-mask, bridge

H

-
hairpin-mode, bridge-port +
hairpin-mode, bridge-port
-
hello-time, bridge +
hello-time, bridge
-
hidden, 802-11-wireless +
hidden, 802-11-wireless
-
home-only, gsm +
home-only, gsm

I

-
id, connection, vlan, vxlan +
id, connection, vlan, vxlan
-
identity, 802-1x +
identity, 802-1x
-
ignore-auto-dns, ipv4, ipv6 +
ignore-auto-dns, ipv4, ipv6
-
ignore-auto-routes, ipv4, ipv6 +
ignore-auto-routes, ipv4, ipv6
-
ingress-priority-map, vlan +
ingress-priority-map, vlan
-
input-key, ip-tunnel +
input-key, ip-tunnel
-
interface-name, connection, bond, bridge, team, vlan +
interface-name, connection, bond, bridge, team, vlan
-
ip6-privacy, ipv6 +
ip6-privacy, ipv6

L

-
l2-miss, vxlan +
l2-miss, vxlan
-
l3-miss, vxlan +
l3-miss, vxlan
-
lacp, ovs-port +
lacp, ovs-port
-
lacp-key, team-port +
lacp-key, team-port
-
lacp-prio, team-port +
lacp-prio, team-port
-
lcp-echo-failure, ppp +
lcp-echo-failure, ppp
-
lcp-echo-interval, ppp +
lcp-echo-interval, ppp
-
leap-password, 802-11-wireless-security +
leap-password, 802-11-wireless-security
-
leap-password-flags, 802-11-wireless-security +
leap-password-flags, 802-11-wireless-security
-
leap-username, 802-11-wireless-security +
leap-username, 802-11-wireless-security
-
learning, vxlan +
learning, vxlan
-
limit, vxlan +
limit, vxlan
-
link-watchers, team, team-port +
link-watchers, team, team-port
-
lldp, connection +
lldp, connection
-
local, ip-tunnel, vxlan +
local, ip-tunnel, vxlan

M

-
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless +
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless
-
mac-address-blacklist, 802-3-ethernet, 802-11-wireless +
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
-
mac-address-randomization, 802-11-wireless +
mac-address-randomization, 802-11-wireless
-
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager +
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
-
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method +
org.freedesktop.NetworkManager.ActivateConnection(), The ActivateConnection() method
-
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method +
org.freedesktop.NetworkManager.AddAndActivateConnection(), The AddAndActivateConnection() method
-
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method +
org.freedesktop.NetworkManager.CheckConnectivity(), The CheckConnectivity() method
-
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method +
org.freedesktop.NetworkManager.CheckpointCreate(), The CheckpointCreate() method
-
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method +
org.freedesktop.NetworkManager.CheckpointDestroy(), The CheckpointDestroy() method
-
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method +
org.freedesktop.NetworkManager.CheckpointRollback(), The CheckpointRollback() method
-
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method +
org.freedesktop.NetworkManager.DeactivateConnection(), The DeactivateConnection() method
-
org.freedesktop.NetworkManager.Enable(), The Enable() method +
org.freedesktop.NetworkManager.Enable(), The Enable() method
-
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method +
org.freedesktop.NetworkManager.GetAllDevices(), The GetAllDevices() method
-
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method +
org.freedesktop.NetworkManager.GetDeviceByIpIface(), The GetDeviceByIpIface() method
-
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method +
org.freedesktop.NetworkManager.GetDevices(), The GetDevices() method
-
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method +
org.freedesktop.NetworkManager.GetLogging(), The GetLogging() method
-
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method +
org.freedesktop.NetworkManager.GetPermissions(), The GetPermissions() method
-
org.freedesktop.NetworkManager.Reload(), The Reload() method +
org.freedesktop.NetworkManager.Reload(), The Reload() method
-
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method +
org.freedesktop.NetworkManager.SetLogging(), The SetLogging() method
-
org.freedesktop.NetworkManager.Sleep(), The Sleep() method +
org.freedesktop.NetworkManager.Sleep(), The Sleep() method
-
org.freedesktop.NetworkManager.state(), The state() method +
org.freedesktop.NetworkManager.state(), The state() method
-
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal +
org.freedesktop.NetworkManager::CheckPermissions, The "CheckPermissions" signal
-
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal +
org.freedesktop.NetworkManager::DeviceAdded, The "DeviceAdded" signal
-
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal +
org.freedesktop.NetworkManager::DeviceRemoved, The "DeviceRemoved" signal
-
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal +
org.freedesktop.NetworkManager::StateChanged, The "StateChanged" signal
-
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property +
org.freedesktop.NetworkManager:ActivatingConnection, The "ActivatingConnection" property
-
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property +
org.freedesktop.NetworkManager:ActiveConnections, The "ActiveConnections" property
-
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property +
org.freedesktop.NetworkManager:AllDevices, The "AllDevices" property
-
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property +
org.freedesktop.NetworkManager:Capabilities, The "Capabilities" property
-
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property +
org.freedesktop.NetworkManager:Connectivity, The "Connectivity" property
-
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property +
org.freedesktop.NetworkManager:ConnectivityCheckAvailable, The "ConnectivityCheckAvailable" property
-
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property +
org.freedesktop.NetworkManager:ConnectivityCheckEnabled, The "ConnectivityCheckEnabled" property
-
org.freedesktop.NetworkManager:Devices, The "Devices" property +
org.freedesktop.NetworkManager:Devices, The "Devices" property
-
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property +
org.freedesktop.NetworkManager:GlobalDnsConfiguration, The "GlobalDnsConfiguration" property
-
org.freedesktop.NetworkManager:Metered, The "Metered" property +
org.freedesktop.NetworkManager:Metered, The "Metered" property
-
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property +
org.freedesktop.NetworkManager:NetworkingEnabled, The "NetworkingEnabled" property
-
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property +
org.freedesktop.NetworkManager:PrimaryConnection, The "PrimaryConnection" property
-
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property +
org.freedesktop.NetworkManager:PrimaryConnectionType, The "PrimaryConnectionType" property
-
org.freedesktop.NetworkManager:Startup, The "Startup" property +
org.freedesktop.NetworkManager:Startup, The "Startup" property
-
org.freedesktop.NetworkManager:State, The "State" property +
org.freedesktop.NetworkManager:State, The "State" property
-
org.freedesktop.NetworkManager:Version, The "Version" property +
org.freedesktop.NetworkManager:Version, The "Version" property
-
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property +
org.freedesktop.NetworkManager:WimaxEnabled, The "WimaxEnabled" property
-
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property +
org.freedesktop.NetworkManager:WimaxHardwareEnabled, The "WimaxHardwareEnabled" property
-
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property +
org.freedesktop.NetworkManager:WirelessEnabled, The "WirelessEnabled" property
-
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property +
org.freedesktop.NetworkManager:WirelessHardwareEnabled, The "WirelessHardwareEnabled" property
-
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property +
org.freedesktop.NetworkManager:WwanEnabled, The "WwanEnabled" property
-
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property +
org.freedesktop.NetworkManager:WwanHardwareEnabled, The "WwanHardwareEnabled" property
-
master, connection +
master, connection
-
max-age, bridge +
max-age, bridge
-
may-fail, ipv4, ipv6 +
may-fail, ipv4, ipv6
-
mcast-rejoin-count, team +
mcast-rejoin-count, team
-
mcast-rejoin-interval, team +
mcast-rejoin-interval, team
-
mcast-snooping-enable, ovs-bridge +
mcast-snooping-enable, ovs-bridge
-
metered, connection +
metered, connection
-
method, ipv4, ipv6, proxy +
method, ipv4, ipv6, proxy
-
mka-cak, macsec +
mka-cak, macsec
-
mka-cak-flags, macsec +
mka-cak-flags, macsec
-
mka-ckn, macsec +
mka-ckn, macsec
-
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless +
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
-
mppe-stateful, ppp +
mppe-stateful, ppp
-
mru, ppp +
mru, ppp
-
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, 802-11-wireless +
mtu, cdma, gsm, infiniband, ip-tunnel, ppp, 802-3-ethernet, 802-11-wireless
-
multi-queue, tun +
multi-queue, tun
-
multicast-snooping, bridge +
multicast-snooping, bridge

N

-
name, connection, 802-1x, adsl, bluetooth, bond, bridge, bridge-port, cdma, dcb, dummy, generic, gsm, infiniband, ipv4, ipv6, ip-tunnel, macsec, macvlan, 802-11-olpc-mesh, ovs-bridge, ovs-interface, ovs-patch, ovs-port, ppp, pppoe, proxy, serial, tc, team, team-port, tun, user, vlan, vpn, vxlan, wimax, 802-3-ethernet, 802-11-wireless, 802-11-wireless-security +
name, connection, 802-1x, adsl, bluetooth, bond, bridge, bridge-port, cdma, dcb, dummy, generic, gsm, infiniband, ipv4, ipv6, ip-tunnel, macsec, macvlan, 802-11-olpc-mesh, ovs-bridge, ovs-interface, ovs-patch, ovs-port, ppp, pppoe, proxy, serial, tc, team, team-port, tun, user, vlan, vpn, vxlan, wimax, 802-3-ethernet, 802-11-wireless, 802-11-wireless-security
-
network-id, gsm +
network-id, gsm
-
network-name, wimax +
network-name, wimax
-
never-default, ipv4, ipv6 +
never-default, ipv4, ipv6
-
NM80211ApFlags, enum NM80211ApFlags +
NM80211ApFlags, enum NM80211ApFlags
-
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags +
NM80211ApSecurityFlags, enum NM80211ApSecurityFlags
-
NM80211Mode, enum NM80211Mode +
NM80211Mode, enum NM80211Mode
-
NMActivationStateFlags, enum NMActivationStateFlags +
NMActivationStateFlags, enum NMActivationStateFlags
-
NMActiveConnectionState, enum NMActiveConnectionState +
NMActiveConnectionState, enum NMActiveConnectionState
-
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason +
NMActiveConnectionStateReason, enum NMActiveConnectionStateReason
-
NMBluetoothCapabilities, enum NMBluetoothCapabilities +
NMBluetoothCapabilities, enum NMBluetoothCapabilities
-
NMCapability, enum NMCapability +
NMCapability, enum NMCapability
-
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags +
NMCheckpointCreateFlags, enum NMCheckpointCreateFlags
-
NMConnectivityState, enum NMConnectivityState +
NMConnectivityState, enum NMConnectivityState
-
NMDeviceCapabilities, enum NMDeviceCapabilities +
NMDeviceCapabilities, enum NMDeviceCapabilities
-
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities +
NMDeviceModemCapabilities, enum NMDeviceModemCapabilities
-
NMDeviceState, enum NMDeviceState +
NMDeviceState, enum NMDeviceState
-
NMDeviceStateReason, enum NMDeviceStateReason +
NMDeviceStateReason, enum NMDeviceStateReason
-
NMDeviceType, enum NMDeviceType +
NMDeviceType, enum NMDeviceType
-
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities +
NMDeviceWifiCapabilities, enum NMDeviceWifiCapabilities
-
NMIPTunnelMode, enum NMIPTunnelMode +
NMIPTunnelMode, enum NMIPTunnelMode
-
NMMetered, enum NMMetered +
NMMetered, enum NMMetered
-
NMRollbackResult, enum NMRollbackResult +
NMRollbackResult, enum NMRollbackResult
-
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities +
NMSecretAgentCapabilities, enum NMSecretAgentCapabilities
-
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags +
NMSecretAgentGetSecretsFlags, enum NMSecretAgentGetSecretsFlags
-
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags +
NMSettingsUpdate2Flags, enum NMSettingsUpdate2Flags
-
NMState, enum NMState +
NMState, enum NMState
-
NMVpnConnectionState, enum NMVpnConnectionState +
NMVpnConnectionState, enum NMVpnConnectionState
-
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason +
NMVpnConnectionStateReason, enum NMVpnConnectionStateReason
-
NMVpnPluginFailure, enum NMVpnPluginFailure +
NMVpnPluginFailure, enum NMVpnPluginFailure
-
NMVpnServiceState, enum NMVpnServiceState +
NMVpnServiceState, enum NMVpnServiceState
-
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType +
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
-
no-vj-comp, ppp +
no-vj-comp, ppp
-
noauth, ppp +
noauth, ppp
-
nobsdcomp, ppp +
nobsdcomp, ppp
-
nodeflate, ppp +
nodeflate, ppp
-
notify-peers-count, team +
notify-peers-count, team
-
notify-peers-interval, team +
notify-peers-interval, team
-
number, cdma, gsm +
number, cdma, gsm

O

-
options, bond +
options, bond
-
output-key, ip-tunnel +
output-key, ip-tunnel
-
owner, tun +
owner, tun

P

-
p-key, infiniband +
p-key, infiniband
-
pac-file, 802-1x +
pac-file, 802-1x
-
pac-script, proxy +
pac-script, proxy
-
pac-url, proxy +
pac-url, proxy
-
pairwise, 802-11-wireless-security +
pairwise, 802-11-wireless-security
-
parent, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan +
parent, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
-
parity, serial +
parity, serial
-
password, 802-1x, adsl, cdma, gsm, pppoe +
password, 802-1x, adsl, cdma, gsm, pppoe
-
password-flags, 802-1x, adsl, cdma, gsm, pppoe +
password-flags, 802-1x, adsl, cdma, gsm, pppoe
-
password-raw, 802-1x +
password-raw, 802-1x
-
password-raw-flags, 802-1x +
password-raw-flags, 802-1x
-
path-cost, bridge-port +
path-cost, bridge-port
-
path-mtu-discovery, ip-tunnel +
path-mtu-discovery, ip-tunnel
-
peer, ovs-patch +
peer, ovs-patch
-
permissions, connection +
permissions, connection
-
persistent, vpn +
persistent, vpn
-
phase1-auth-flags, 802-1x +
phase1-auth-flags, 802-1x
-
phase1-fast-provisioning, 802-1x +
phase1-fast-provisioning, 802-1x
-
phase1-peaplabel, 802-1x +
phase1-peaplabel, 802-1x
-
phase1-peapver, 802-1x +
phase1-peapver, 802-1x
-
phase2-altsubject-matches, 802-1x +
phase2-altsubject-matches, 802-1x
-
phase2-auth, 802-1x +
phase2-auth, 802-1x
-
phase2-autheap, 802-1x +
phase2-autheap, 802-1x
-
phase2-ca-cert, 802-1x +
phase2-ca-cert, 802-1x
-
phase2-ca-cert-password, 802-1x +
phase2-ca-cert-password, 802-1x
-
phase2-ca-cert-password-flags, 802-1x +
phase2-ca-cert-password-flags, 802-1x
-
phase2-ca-path, 802-1x +
phase2-ca-path, 802-1x
-
phase2-client-cert, 802-1x +
phase2-client-cert, 802-1x
-
phase2-client-cert-password, 802-1x +
phase2-client-cert-password, 802-1x
-
phase2-client-cert-password-flags, 802-1x +
phase2-client-cert-password-flags, 802-1x
-
phase2-domain-suffix-match, 802-1x +
phase2-domain-suffix-match, 802-1x
-
phase2-private-key, 802-1x +
phase2-private-key, 802-1x
-
phase2-private-key-password, 802-1x +
phase2-private-key-password, 802-1x
-
phase2-private-key-password-flags, 802-1x +
phase2-private-key-password-flags, 802-1x
-
phase2-subject-match, 802-1x +
phase2-subject-match, 802-1x
-
pi, tun +
pi, tun
-
pin, 802-1x, gsm +
pin, 802-1x, gsm
-
pin-flags, 802-1x, gsm +
pin-flags, 802-1x, gsm
-
pmf, 802-11-wireless-security +
pmf, 802-11-wireless-security
-
port, macsec, 802-3-ethernet +
port, macsec, 802-3-ethernet
-
powersave, 802-11-wireless +
powersave, 802-11-wireless
-
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP +
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
-
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method +
org.freedesktop.NetworkManager.PPP.NeedSecrets(), The NeedSecrets() method
-
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method +
org.freedesktop.NetworkManager.PPP.SetIp4Config(), The SetIp4Config() method
-
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method +
org.freedesktop.NetworkManager.PPP.SetIp6Config(), The SetIp6Config() method
-
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method +
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
-
prio, team-port +
prio, team-port
-
priority, bridge, bridge-port +
priority, bridge, bridge-port
-
priority-bandwidth, dcb +
priority-bandwidth, dcb
-
priority-flow-control, dcb +
priority-flow-control, dcb
-
priority-flow-control-flags, dcb +
priority-flow-control-flags, dcb
-
priority-group-bandwidth, dcb +
priority-group-bandwidth, dcb
-
priority-group-flags, dcb +
priority-group-flags, dcb
-
priority-group-id, dcb +
priority-group-id, dcb
-
priority-strict-bandwidth, dcb +
priority-strict-bandwidth, dcb
-
priority-traffic-class, dcb +
priority-traffic-class, dcb
-
private-key, 802-1x +
private-key, 802-1x
-
private-key-password, 802-1x +
private-key-password, 802-1x
-
private-key-password-flags, 802-1x +
private-key-password-flags, 802-1x
-
promiscuous, macvlan +
promiscuous, macvlan
-
proto, 802-11-wireless-security +
proto, 802-11-wireless-security
-
protocol, adsl +
protocol, adsl
-
proxy, vxlan +
proxy, vxlan
-
psk, 802-11-wireless-security +
psk, 802-11-wireless-security
-
psk-flags, 802-11-wireless-security +
psk-flags, 802-11-wireless-security

Q

-
qdiscs, tc +
qdiscs, tc
-
queue-id, team-port +
queue-id, team-port

R

-
rate, 802-11-wireless +
rate, 802-11-wireless
-
read-only, connection +
read-only, connection
-
refuse-chap, ppp +
refuse-chap, ppp
-
refuse-eap, ppp +
refuse-eap, ppp
-
refuse-mschap, ppp +
refuse-mschap, ppp
-
refuse-mschapv2, ppp +
refuse-mschapv2, ppp
-
refuse-pap, ppp +
refuse-pap, ppp
-
remote, ip-tunnel, vxlan +
remote, ip-tunnel, vxlan
-
require-mppe, ppp +
require-mppe, ppp
-
require-mppe-128, ppp +
require-mppe-128, ppp
-
route-data, ipv4, ipv6 +
route-data, ipv4, ipv6
-
route-metric, ipv4, ipv6 +
route-metric, ipv4, ipv6
-
route-table, ipv4, ipv6 +
route-table, ipv4, ipv6
-
routes, ipv4, ipv6 +
routes, ipv4, ipv6
-
rsc, vxlan +
rsc, vxlan
-
rstp-enable, ovs-bridge +
rstp-enable, ovs-bridge
-
runner, team +
runner, team
-
runner-active, team +
runner-active, team
-
runner-agg-select-policy, team +
runner-agg-select-policy, team
-
runner-fast-rate, team +
runner-fast-rate, team
-
runner-hwaddr-policy, team +
runner-hwaddr-policy, team
-
runner-min-ports, team +
runner-min-ports, team
-
runner-sys-prio, team +
runner-sys-prio, team
-
runner-tx-balancer, team +
runner-tx-balancer, team
-
runner-tx-balancer-interval, team +
runner-tx-balancer-interval, team
-
runner-tx-hash, team +
runner-tx-hash, team

S

-
s390-nettype, 802-3-ethernet +
s390-nettype, 802-3-ethernet
-
s390-options, 802-3-ethernet +
s390-options, 802-3-ethernet
-
s390-subchannels, 802-3-ethernet +
s390-subchannels, 802-3-ethernet
-
secondaries, connection +
secondaries, connection
-
secrets, vpn +
secrets, vpn
-
security, 802-11-wireless +
security, 802-11-wireless
-
seen-bssids, 802-11-wireless +
seen-bssids, 802-11-wireless
-
send-delay, serial +
send-delay, serial
-
service, pppoe +
service, pppoe
-
service-type, vpn +
service-type, vpn
-
sim-id, gsm +
sim-id, gsm
-
sim-operator-id, gsm +
sim-operator-id, gsm
-
slave-type, connection +
slave-type, connection
-
source-port-max, vxlan +
source-port-max, vxlan
-
source-port-min, vxlan +
source-port-min, vxlan
-
speed, 802-3-ethernet +
speed, 802-3-ethernet
-
ssid, 802-11-olpc-mesh, 802-11-wireless +
ssid, 802-11-olpc-mesh, 802-11-wireless
-
stable-id, connection +
stable-id, connection
-
sticky, team-port +
sticky, team-port
-
stopbits, serial +
stopbits, serial
-
stp, bridge +
stp, bridge
-
stp-enable, ovs-bridge +
stp-enable, ovs-bridge
-
subject-match, 802-1x +
subject-match, 802-1x
-
system-ca-certs, 802-1x +
system-ca-certs, 802-1x

T

-
tag, ovs-port +
tag, ovs-port
-
tap, macvlan +
tap, macvlan
-
tfilters, tc +
tfilters, tc
-
timeout, vpn +
timeout, vpn
-
timestamp, connection +
timestamp, connection
-
token, ipv6 +
token, ipv6
-
tos, ip-tunnel, vxlan +
tos, ip-tunnel, vxlan
-
transport-mode, infiniband +
transport-mode, infiniband
-
ttl, ip-tunnel, vxlan +
ttl, ip-tunnel, vxlan
-
tx-power, 802-11-wireless +
tx-power, 802-11-wireless
-
type, connection, bluetooth, ovs-interface +
type, connection, bluetooth, ovs-interface

U

-
user-name, vpn +
user-name, vpn
-
username, adsl, cdma, gsm, pppoe +
username, adsl, cdma, gsm, pppoe
-
uuid, connection +
uuid, connection

V

-
validation, macsec +
validation, macsec
-
vci, adsl +
vci, adsl
-
vlan-mode, ovs-port +
vlan-mode, ovs-port
-
vnet-hdr, tun +
vnet-hdr, tun
-
vpi, adsl +
vpi, adsl
-
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection +
org.freedesktop.NetworkManager.VPN.Connection, org.freedesktop.NetworkManager.VPN.Connection
-
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal +
org.freedesktop.NetworkManager.VPN.Connection::PropertiesChanged, The "PropertiesChanged" signal
-
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal +
org.freedesktop.NetworkManager.VPN.Connection::VpnStateChanged, The "VpnStateChanged" signal
-
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property +
org.freedesktop.NetworkManager.VPN.Connection:Banner, The "Banner" property
-
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property +
org.freedesktop.NetworkManager.VPN.Connection:VpnState, The "VpnState" property
-
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin +
org.freedesktop.NetworkManager.VPN.Plugin, org.freedesktop.NetworkManager.VPN.Plugin
-
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method +
org.freedesktop.NetworkManager.VPN.Plugin.Connect(), The Connect() method
-
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method +
org.freedesktop.NetworkManager.VPN.Plugin.ConnectInteractive(), The ConnectInteractive() method
-
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method +
org.freedesktop.NetworkManager.VPN.Plugin.Disconnect(), The Disconnect() method
-
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method +
org.freedesktop.NetworkManager.VPN.Plugin.NeedSecrets(), The NeedSecrets() method
-
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method +
org.freedesktop.NetworkManager.VPN.Plugin.NewSecrets(), The NewSecrets() method
-
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method +
org.freedesktop.NetworkManager.VPN.Plugin.SetConfig(), The SetConfig() method
-
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method +
org.freedesktop.NetworkManager.VPN.Plugin.SetFailure(), The SetFailure() method
-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method +
org.freedesktop.NetworkManager.VPN.Plugin.SetIp4Config(), The SetIp4Config() method
-
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method +
org.freedesktop.NetworkManager.VPN.Plugin.SetIp6Config(), The SetIp6Config() method
-
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal +
org.freedesktop.NetworkManager.VPN.Plugin::Config, The "Config" signal
-
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal +
org.freedesktop.NetworkManager.VPN.Plugin::Failure, The "Failure" signal
-
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal +
org.freedesktop.NetworkManager.VPN.Plugin::Ip4Config, The "Ip4Config" signal
-
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal +
org.freedesktop.NetworkManager.VPN.Plugin::Ip6Config, The "Ip6Config" signal
-
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal +
org.freedesktop.NetworkManager.VPN.Plugin::LoginBanner, The "LoginBanner" signal
-
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal +
org.freedesktop.NetworkManager.VPN.Plugin::SecretsRequired, The "SecretsRequired" signal
-
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal +
org.freedesktop.NetworkManager.VPN.Plugin::StateChanged, The "StateChanged" signal
-
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property +
org.freedesktop.NetworkManager.VPN.Plugin:State, The "State" property

W

-
wake-on-lan, 802-3-ethernet +
wake-on-lan, 802-3-ethernet
-
wake-on-lan-password, 802-3-ethernet +
wake-on-lan-password, 802-3-ethernet
-
wep-key-flags, 802-11-wireless-security +
wep-key-flags, 802-11-wireless-security
-
wep-key-type, 802-11-wireless-security +
wep-key-type, 802-11-wireless-security
-
wep-key0, 802-11-wireless-security +
wep-key0, 802-11-wireless-security
-
wep-key1, 802-11-wireless-security +
wep-key1, 802-11-wireless-security
-
wep-key2, 802-11-wireless-security +
wep-key2, 802-11-wireless-security
-
wep-key3, 802-11-wireless-security +
wep-key3, 802-11-wireless-security
-
wep-tx-keyidx, 802-11-wireless-security +
wep-tx-keyidx, 802-11-wireless-security
-
wps-method, 802-11-wireless-security +
wps-method, 802-11-wireless-security

Z

-
zone, connection +
zone, connection
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/license.html b/docs/api/html/license.html index 2e1ae12d..19d7cb54 100644 --- a/docs/api/html/license.html +++ b/docs/api/html/license.html @@ -7,7 +7,7 @@ - + @@ -379,6 +379,6 @@ Public License instead of this License.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/manpages.html b/docs/api/html/manpages.html index ab79b922..2f85b5fb 100644 --- a/docs/api/html/manpages.html +++ b/docs/api/html/manpages.html @@ -8,7 +8,7 @@ - + @@ -59,6 +59,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index 5bfe1ac9..0587ed16 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -2791,6 +2791,36 @@   + + +

NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE

+

+ + +

= 64

+

+ + +

a duplicate IP address was detected

+

+ +  + + + +

NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED

+

+ + +

= 65

+

+ + +

The selected IP method is not supported

+

+ +  + @@ -3982,6 +4012,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nm-online.html b/docs/api/html/nm-online.html index 38008541..0b5008da 100644 --- a/docs/api/html/nm-online.html +++ b/docs/api/html/nm-online.html @@ -8,7 +8,7 @@ - + @@ -115,6 +115,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html index 30ed6d4f..15bd5bdb 100644 --- a/docs/api/html/nm-openvswitch.html +++ b/docs/api/html/nm-openvswitch.html @@ -8,7 +8,7 @@ - + @@ -98,11 +98,11 @@

Example 14. Creating a Bridge with a single internal Interface

-
$ nmcli conn add conn.type ovs-bridge conn.interface bridge0
+
$ nmcli conn add type ovs-bridge conn.interface bridge0
 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added.
-$ nmcli conn add conn.type ovs-port conn.interface port0 conn.master bridge0
+$ nmcli conn add type ovs-port conn.interface port0 conn.master bridge0
 Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added.
-$ nmcli conn add conn.type ovs-interface conn.interface iface0 conn.master port0 \
+$ nmcli conn add type ovs-interface conn.interface iface0 conn.master port0 \
   ipv4.method manual ipv4.address 192.0.2.1/24
 Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added.
 
@@ -115,9 +115,9 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success

Example 15. Adding a Linux interface to a Bridge

-
$ nmcli conn add conn.type ovs-port conn.interface port1 conn.master bridge0
+
$ nmcli conn add type ovs-port conn.interface port1 conn.master bridge0
 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added.
-$ nmcli conn add conn.type ethernet conn.interface eth0 conn.master port1
+$ nmcli conn add type ethernet conn.interface eth0 conn.master port1
 Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added.
 

Again, you need a port.

@@ -126,9 +126,9 @@ Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully

Example 16. Creating a VLAN

-
$ nmcli conn add conn.type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120
+
$ nmcli conn add type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120
 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added.
-$ nmcli conn add conn.type ethernet conn.interface eth1 conn.master port2
+$ nmcli conn add type ethernet conn.interface eth1 conn.master port2
 Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added.
 

It's just a port with a tag.

@@ -137,11 +137,11 @@ Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully

Example 17. Creating a Bond

-
$ nmcli conn add conn.type ovs-port conn.interface bond0 conn.master bridge0
+
$ nmcli conn add type ovs-port conn.interface bond0 conn.master bridge0
 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added.
-$ nmcli conn add conn.type ethernet conn.interface eth2 conn.master bond0
+$ nmcli conn add type ethernet conn.interface eth2 conn.master bond0
 Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added.
-$ nmcli conn add conn.type ethernet conn.interface eth3 conn.master bond0
+$ nmcli conn add type ethernet conn.interface eth3 conn.master bond0
 Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added.
 

It's just a Port with multiple interfaces. See nm-settings manual for @@ -172,6 +172,6 @@ Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully

+
Generated by GTK-Doc V1.27
\ No newline at end of file diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html index 093b8ff4..f4fab601 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -8,7 +8,7 @@ - + @@ -2126,6 +2126,6 @@ Allowed values:
default, never, always
+
Generated by GTK-Doc V1.27
\ No newline at end of file diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html index f82549b8..d105493b 100644 --- a/docs/api/html/nm-settings-keyfile.html +++ b/docs/api/html/nm-settings-keyfile.html @@ -8,7 +8,7 @@ - + @@ -520,6 +520,6 @@ Example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nm-settings.html b/docs/api/html/nm-settings.html index c838a380..ff0fe48f 100644 --- a/docs/api/html/nm-settings.html +++ b/docs/api/html/nm-settings.html @@ -8,7 +8,7 @@ - + @@ -2659,7 +2659,7 @@ runner string "roundrobin" -Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". +Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value). @@ -3717,6 +3717,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nm-vpn-dbus-types.html b/docs/api/html/nm-vpn-dbus-types.html index 329f2347..fe46e253 100644 --- a/docs/api/html/nm-vpn-dbus-types.html +++ b/docs/api/html/nm-vpn-dbus-types.html @@ -8,7 +8,7 @@ - + @@ -555,6 +555,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html index 6dc0fd1a..f623850c 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -8,7 +8,7 @@ - + @@ -583,6 +583,6 @@ Connection 'ethernet-4' (de89cdeb-a3e1-4d53-8fa0-c22546c775f4) successfully +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index ebae4e6e..e2ce3b6f 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -8,7 +8,7 @@ - + @@ -2323,6 +2323,6 @@ It's equivalent to the +bond.options 'option=value' +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/nmtui.html b/docs/api/html/nmtui.html index 854dd9e0..693d5758 100644 --- a/docs/api/html/nmtui.html +++ b/docs/api/html/nmtui.html @@ -8,7 +8,7 @@ - + @@ -83,6 +83,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-access-points.html b/docs/api/html/ref-dbus-access-points.html index b0bceca8..58828a4a 100644 --- a/docs/api/html/ref-dbus-access-points.html +++ b/docs/api/html/ref-dbus-access-points.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-active-connections.html b/docs/api/html/ref-dbus-active-connections.html index a9e08f50..36d40c3b 100644 --- a/docs/api/html/ref-dbus-active-connections.html +++ b/docs/api/html/ref-dbus-active-connections.html @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-agent-manager.html b/docs/api/html/ref-dbus-agent-manager.html index ae3a599c..fb8621a8 100644 --- a/docs/api/html/ref-dbus-agent-manager.html +++ b/docs/api/html/ref-dbus-agent-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-devices.html b/docs/api/html/ref-dbus-devices.html index cbd5048f..b3b5d03e 100644 --- a/docs/api/html/ref-dbus-devices.html +++ b/docs/api/html/ref-dbus-devices.html @@ -8,7 +8,7 @@ - + @@ -95,6 +95,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dhcp4-configs.html b/docs/api/html/ref-dbus-dhcp4-configs.html index 8cafd67f..7ab17e3e 100644 --- a/docs/api/html/ref-dbus-dhcp4-configs.html +++ b/docs/api/html/ref-dbus-dhcp4-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dhcp6-configs.html b/docs/api/html/ref-dbus-dhcp6-configs.html index bfdeec26..043b0471 100644 --- a/docs/api/html/ref-dbus-dhcp6-configs.html +++ b/docs/api/html/ref-dbus-dhcp6-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-dns-manager.html b/docs/api/html/ref-dbus-dns-manager.html index cac5773f..39ba4e06 100644 --- a/docs/api/html/ref-dbus-dns-manager.html +++ b/docs/api/html/ref-dbus-dns-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-ip4-configs.html b/docs/api/html/ref-dbus-ip4-configs.html index 41134a0c..667d5ccc 100644 --- a/docs/api/html/ref-dbus-ip4-configs.html +++ b/docs/api/html/ref-dbus-ip4-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-ip6-configs.html b/docs/api/html/ref-dbus-ip6-configs.html index c34795d4..5026072b 100644 --- a/docs/api/html/ref-dbus-ip6-configs.html +++ b/docs/api/html/ref-dbus-ip6-configs.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-manager.html b/docs/api/html/ref-dbus-manager.html index dc28a494..bad65277 100644 --- a/docs/api/html/ref-dbus-manager.html +++ b/docs/api/html/ref-dbus-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-settings-manager.html b/docs/api/html/ref-dbus-settings-manager.html index 5b476864..2d4f001d 100644 --- a/docs/api/html/ref-dbus-settings-manager.html +++ b/docs/api/html/ref-dbus-settings-manager.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-dbus-settings.html b/docs/api/html/ref-dbus-settings.html index 00bf5a8b..33304a92 100644 --- a/docs/api/html/ref-dbus-settings.html +++ b/docs/api/html/ref-dbus-settings.html @@ -8,7 +8,7 @@ - + @@ -27,6 +27,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 17810d6b..f70b3c38 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -8,7 +8,7 @@ - + @@ -157,6 +157,6 @@

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/secret-agents.html b/docs/api/html/secret-agents.html index f520bafb..67b26073 100644 --- a/docs/api/html/secret-agents.html +++ b/docs/api/html/secret-agents.html @@ -8,7 +8,7 @@ - + @@ -33,6 +33,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/secrets-flags.html b/docs/api/html/secrets-flags.html index 7272a70a..1869fe69 100644 --- a/docs/api/html/secrets-flags.html +++ b/docs/api/html/secrets-flags.html @@ -8,7 +8,7 @@ - + @@ -58,6 +58,6 @@

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-olpc-mesh.html b/docs/api/html/settings-802-11-olpc-mesh.html index 4b3b11e1..1ead7bca 100644 --- a/docs/api/html/settings-802-11-olpc-mesh.html +++ b/docs/api/html/settings-802-11-olpc-mesh.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-wireless-security.html b/docs/api/html/settings-802-11-wireless-security.html index 495a0ac6..4fb6beae 100644 --- a/docs/api/html/settings-802-11-wireless-security.html +++ b/docs/api/html/settings-802-11-wireless-security.html @@ -8,7 +8,7 @@ - + @@ -180,6 +180,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-802-11-wireless.html b/docs/api/html/settings-802-11-wireless.html index c5258211..c8073d9d 100644 --- a/docs/api/html/settings-802-11-wireless.html +++ b/docs/api/html/settings-802-11-wireless.html @@ -8,7 +8,7 @@ - + @@ -174,6 +174,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-802-1x.html b/docs/api/html/settings-802-1x.html index cc6c0fd4..db2e18d6 100644 --- a/docs/api/html/settings-802-1x.html +++ b/docs/api/html/settings-802-1x.html @@ -8,7 +8,7 @@ - + @@ -330,6 +330,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html index 6425e724..65f22f24 100644 --- a/docs/api/html/settings-802-3-ethernet.html +++ b/docs/api/html/settings-802-3-ethernet.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-adsl.html b/docs/api/html/settings-adsl.html index 38393189..032b1c25 100644 --- a/docs/api/html/settings-adsl.html +++ b/docs/api/html/settings-adsl.html @@ -8,7 +8,7 @@ - + @@ -108,6 +108,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-bluetooth.html b/docs/api/html/settings-bluetooth.html index 4577c092..ec9f0e34 100644 --- a/docs/api/html/settings-bluetooth.html +++ b/docs/api/html/settings-bluetooth.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-bond.html b/docs/api/html/settings-bond.html index 45946281..2ccf4cb9 100644 --- a/docs/api/html/settings-bond.html +++ b/docs/api/html/settings-bond.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-bridge-port.html b/docs/api/html/settings-bridge-port.html index e9694e51..a9773668 100644 --- a/docs/api/html/settings-bridge-port.html +++ b/docs/api/html/settings-bridge-port.html @@ -8,7 +8,7 @@ - + @@ -84,6 +84,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-bridge.html b/docs/api/html/settings-bridge.html index b1d892f4..25e782c4 100644 --- a/docs/api/html/settings-bridge.html +++ b/docs/api/html/settings-bridge.html @@ -8,7 +8,7 @@ - + @@ -126,6 +126,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-cdma.html b/docs/api/html/settings-cdma.html index 5373efd6..96227771 100644 --- a/docs/api/html/settings-cdma.html +++ b/docs/api/html/settings-cdma.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html index 83fa6ede..3ee17245 100644 --- a/docs/api/html/settings-connection.html +++ b/docs/api/html/settings-connection.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-dcb.html b/docs/api/html/settings-dcb.html index db8b4aa3..0cf45e03 100644 --- a/docs/api/html/settings-dcb.html +++ b/docs/api/html/settings-dcb.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-dummy.html b/docs/api/html/settings-dummy.html index b420c332..60b38abb 100644 --- a/docs/api/html/settings-dummy.html +++ b/docs/api/html/settings-dummy.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-generic.html b/docs/api/html/settings-generic.html index 7837ff58..3d8b8908 100644 --- a/docs/api/html/settings-generic.html +++ b/docs/api/html/settings-generic.html @@ -8,7 +8,7 @@ - + @@ -64,6 +64,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-gsm.html b/docs/api/html/settings-gsm.html index 14fe2ff4..02d6d2b5 100644 --- a/docs/api/html/settings-gsm.html +++ b/docs/api/html/settings-gsm.html @@ -8,7 +8,7 @@ - + @@ -144,6 +144,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-infiniband.html b/docs/api/html/settings-infiniband.html index d5e1b1b3..e5730d0c 100644 --- a/docs/api/html/settings-infiniband.html +++ b/docs/api/html/settings-infiniband.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html index bb5f670c..ca015b6b 100644 --- a/docs/api/html/settings-ip-tunnel.html +++ b/docs/api/html/settings-ip-tunnel.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html index 186c8c70..9be5185e 100644 --- a/docs/api/html/settings-ipv4.html +++ b/docs/api/html/settings-ipv4.html @@ -8,7 +8,7 @@ - + @@ -198,6 +198,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html index 29fed777..5104e422 100644 --- a/docs/api/html/settings-ipv6.html +++ b/docs/api/html/settings-ipv6.html @@ -8,7 +8,7 @@ - + @@ -204,6 +204,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-macsec.html b/docs/api/html/settings-macsec.html index 50bfb495..669f170d 100644 --- a/docs/api/html/settings-macsec.html +++ b/docs/api/html/settings-macsec.html @@ -8,7 +8,7 @@ - + @@ -114,6 +114,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html index 19fbc076..3f630232 100644 --- a/docs/api/html/settings-macvlan.html +++ b/docs/api/html/settings-macvlan.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-bridge.html b/docs/api/html/settings-ovs-bridge.html index bd0183bb..6f74073b 100644 --- a/docs/api/html/settings-ovs-bridge.html +++ b/docs/api/html/settings-ovs-bridge.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-interface.html b/docs/api/html/settings-ovs-interface.html index 7286e8ac..812e4717 100644 --- a/docs/api/html/settings-ovs-interface.html +++ b/docs/api/html/settings-ovs-interface.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-patch.html b/docs/api/html/settings-ovs-patch.html index 859accf6..3518d40e 100644 --- a/docs/api/html/settings-ovs-patch.html +++ b/docs/api/html/settings-ovs-patch.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ovs-port.html b/docs/api/html/settings-ovs-port.html index 604875dc..e7d595da 100644 --- a/docs/api/html/settings-ovs-port.html +++ b/docs/api/html/settings-ovs-port.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-ppp.html b/docs/api/html/settings-ppp.html index 84acf50d..4bce27bd 100644 --- a/docs/api/html/settings-ppp.html +++ b/docs/api/html/settings-ppp.html @@ -8,7 +8,7 @@ - + @@ -174,6 +174,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-pppoe.html b/docs/api/html/settings-pppoe.html index aa70a3da..e2e39c93 100644 --- a/docs/api/html/settings-pppoe.html +++ b/docs/api/html/settings-pppoe.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-proxy.html b/docs/api/html/settings-proxy.html index 578754fd..ef517807 100644 --- a/docs/api/html/settings-proxy.html +++ b/docs/api/html/settings-proxy.html @@ -8,7 +8,7 @@ - + @@ -90,6 +90,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-serial.html b/docs/api/html/settings-serial.html index 31965d45..ddc4805e 100644 --- a/docs/api/html/settings-serial.html +++ b/docs/api/html/settings-serial.html @@ -8,7 +8,7 @@ - + @@ -96,6 +96,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-tc.html b/docs/api/html/settings-tc.html index c54083d1..b26c65a3 100644 --- a/docs/api/html/settings-tc.html +++ b/docs/api/html/settings-tc.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-team-port.html b/docs/api/html/settings-team-port.html index f5bdb88b..77e30261 100644 --- a/docs/api/html/settings-team-port.html +++ b/docs/api/html/settings-team-port.html @@ -8,7 +8,7 @@ - + @@ -108,6 +108,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-team.html b/docs/api/html/settings-team.html index fb18cfe2..8f5811cc 100644 --- a/docs/api/html/settings-team.html +++ b/docs/api/html/settings-team.html @@ -8,7 +8,7 @@ - + @@ -105,7 +105,7 @@
runner
string
"roundrobin"
-Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". +Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).
runner-active
@@ -168,6 +168,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-tun.html b/docs/api/html/settings-tun.html index 77ed4747..d8275439 100644 --- a/docs/api/html/settings-tun.html +++ b/docs/api/html/settings-tun.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-user.html b/docs/api/html/settings-user.html index ce193f87..0ba54b28 100644 --- a/docs/api/html/settings-user.html +++ b/docs/api/html/settings-user.html @@ -8,7 +8,7 @@ - + @@ -72,6 +72,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html index bdb068e1..b2b97554 100644 --- a/docs/api/html/settings-vlan.html +++ b/docs/api/html/settings-vlan.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html index e8da5d40..453aa65a 100644 --- a/docs/api/html/settings-vpn.html +++ b/docs/api/html/settings-vpn.html @@ -8,7 +8,7 @@ - + @@ -102,6 +102,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-vxlan.html b/docs/api/html/settings-vxlan.html index 5d633e61..77de27ad 100644 --- a/docs/api/html/settings-vxlan.html +++ b/docs/api/html/settings-vxlan.html @@ -8,7 +8,7 @@ - + @@ -162,6 +162,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/settings-wimax.html b/docs/api/html/settings-wimax.html index 466e639c..1bd5b38b 100644 --- a/docs/api/html/settings-wimax.html +++ b/docs/api/html/settings-wimax.html @@ -8,7 +8,7 @@ - + @@ -78,6 +78,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/spec.html b/docs/api/html/spec.html index d51fbd87..25d7f7b3 100644 --- a/docs/api/html/spec.html +++ b/docs/api/html/spec.html @@ -8,7 +8,7 @@ - + @@ -158,6 +158,6 @@

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/html/vpn-plugins.html b/docs/api/html/vpn-plugins.html index 803bc16a..fa552983 100644 --- a/docs/api/html/vpn-plugins.html +++ b/docs/api/html/vpn-plugins.html @@ -8,7 +8,7 @@ - + @@ -37,6 +37,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/api/settings-spec.xml b/docs/api/settings-spec.xml index 7f238460..b1b498f3 100644 --- a/docs/api/settings-spec.xml +++ b/docs/api/settings-spec.xml @@ -396,7 +396,7 @@ namenamestringteamThe setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired". notify-peers-countnotify-peers-countint320Corresponds to the teamd notify_peers.count. notify-peers-intervalnotify-peers-intervalint320Corresponds to the teamd notify_peers.interval. - runnerrunnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". + runnerrunnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value). runner-activerunner-activebooleanFALSECorresponds to the teamd runner.active. runner-agg-select-policyrunner-agg-select-policystringCorresponds to the teamd runner.agg_select_policy. runner-fast-raterunner-fast-ratebooleanFALSECorresponds to the teamd runner.fast_rate. diff --git a/docs/api/version.xml b/docs/api/version.xml index 5ad2491c..18b31142 100644 --- a/docs/api/version.xml +++ b/docs/api/version.xml @@ -1 +1 @@ -1.10.2 +1.10.4 diff --git a/docs/libnm-glib/Makefile.in b/docs/libnm-glib/Makefile.in index 9395aea7..1e6f0c58 100644 --- a/docs/libnm-glib/Makefile.in +++ b/docs/libnm-glib/Makefile.in @@ -15,6 +15,24 @@ @SET_MAKE@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . #################################### # Everything below here is generic # @@ -321,6 +339,7 @@ PYTHON_VERSION = @PYTHON_VERSION@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ +READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ @@ -361,6 +380,7 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_NM = @ac_ct_NM@ ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_READELF = @ac_ct_READELF@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -841,6 +861,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo ""; \ diff --git a/docs/libnm-glib/html/NMAccessPoint.html b/docs/libnm-glib/html/NMAccessPoint.html index 951a414f..ddc8f611 100644 --- a/docs/libnm-glib/html/NMAccessPoint.html +++ b/docs/libnm-glib/html/NMAccessPoint.html @@ -8,7 +8,7 @@ - + @@ -880,6 +880,6 @@ coordinator of the wireless network allowing clients to connect) or +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMActiveConnection.html b/docs/libnm-glib/html/NMActiveConnection.html index b16e124e..cd647237 100644 --- a/docs/libnm-glib/html/NMActiveConnection.html +++ b/docs/libnm-glib/html/NMActiveConnection.html @@ -8,7 +8,7 @@ - + @@ -1026,6 +1026,6 @@ nm_active_connection_get_vpn ( -
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMClient.html b/docs/libnm-glib/html/NMClient.html index 9d7ea620..47a706c1 100644 --- a/docs/libnm-glib/html/NMClient.html +++ b/docs/libnm-glib/html/NMClient.html @@ -8,7 +8,7 @@ - + @@ -2564,6 +2564,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDHCP4Config.html b/docs/libnm-glib/html/NMDHCP4Config.html index 8b3e8c83..c2fc38ed 100644 --- a/docs/libnm-glib/html/NMDHCP4Config.html +++ b/docs/libnm-glib/html/NMDHCP4Config.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ configuration, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDHCP6Config.html b/docs/libnm-glib/html/NMDHCP6Config.html index dcdad73f..ca5ca04d 100644 --- a/docs/libnm-glib/html/NMDHCP6Config.html +++ b/docs/libnm-glib/html/NMDHCP6Config.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ configuration, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDevice.html b/docs/libnm-glib/html/NMDevice.html index 86f9ac00..1f1181b7 100644 --- a/docs/libnm-glib/html/NMDevice.html +++ b/docs/libnm-glib/html/NMDevice.html @@ -8,7 +8,7 @@ - + @@ -2316,6 +2316,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceAdsl.html b/docs/libnm-glib/html/NMDeviceAdsl.html index 0819cd66..eaa4e1bf 100644 --- a/docs/libnm-glib/html/NMDeviceAdsl.html +++ b/docs/libnm-glib/html/NMDeviceAdsl.html @@ -8,7 +8,7 @@ - + @@ -254,6 +254,6 @@ nm_device_adsl_get_carrier (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBond.html b/docs/libnm-glib/html/NMDeviceBond.html index 83f9b2f9..44259906 100644 --- a/docs/libnm-glib/html/NMDeviceBond.html +++ b/docs/libnm-glib/html/NMDeviceBond.html @@ -8,7 +8,7 @@ - + @@ -384,6 +384,6 @@ copy used by the device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBridge.html b/docs/libnm-glib/html/NMDeviceBridge.html index 4a0548ad..3ac93bb9 100644 --- a/docs/libnm-glib/html/NMDeviceBridge.html +++ b/docs/libnm-glib/html/NMDeviceBridge.html @@ -8,7 +8,7 @@ - + @@ -391,6 +391,6 @@ copy used by the device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceBt.html b/docs/libnm-glib/html/NMDeviceBt.html index 4000d0b9..6cf132bc 100644 --- a/docs/libnm-glib/html/NMDeviceBt.html +++ b/docs/libnm-glib/html/NMDeviceBt.html @@ -8,7 +8,7 @@ - + @@ -392,6 +392,6 @@ nm_device_bt_get_capabilities (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceEthernet.html b/docs/libnm-glib/html/NMDeviceEthernet.html index b9fe7ffa..e4b7a32e 100644 --- a/docs/libnm-glib/html/NMDeviceEthernet.html +++ b/docs/libnm-glib/html/NMDeviceEthernet.html @@ -8,7 +8,7 @@ - + @@ -444,6 +444,6 @@ nm_device_ethernet_get_carrier (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceGeneric.html b/docs/libnm-glib/html/NMDeviceGeneric.html index a4bd7488..2e3ed5c0 100644 --- a/docs/libnm-glib/html/NMDeviceGeneric.html +++ b/docs/libnm-glib/html/NMDeviceGeneric.html @@ -8,7 +8,7 @@ - + @@ -285,6 +285,6 @@ if not known.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceInfiniband.html b/docs/libnm-glib/html/NMDeviceInfiniband.html index 17a97998..67a1100f 100644 --- a/docs/libnm-glib/html/NMDeviceInfiniband.html +++ b/docs/libnm-glib/html/NMDeviceInfiniband.html @@ -8,7 +8,7 @@ - + @@ -328,6 +328,6 @@ nm_device_infiniband_get_carrier (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceModem.html b/docs/libnm-glib/html/NMDeviceModem.html index 7df2d4c0..9487979d 100644 --- a/docs/libnm-glib/html/NMDeviceModem.html +++ b/docs/libnm-glib/html/NMDeviceModem.html @@ -8,7 +8,7 @@ - + @@ -288,6 +288,6 @@ CDMA/EVDO and GSM/UMTS.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceOlpcMesh.html b/docs/libnm-glib/html/NMDeviceOlpcMesh.html index c9ac63b7..f5e7b149 100644 --- a/docs/libnm-glib/html/NMDeviceOlpcMesh.html +++ b/docs/libnm-glib/html/NMDeviceOlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -373,6 +373,6 @@ nm_device_olpc_mesh_get_active_channel +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceTeam.html b/docs/libnm-glib/html/NMDeviceTeam.html index 2c6e7553..33ea96c0 100644 --- a/docs/libnm-glib/html/NMDeviceTeam.html +++ b/docs/libnm-glib/html/NMDeviceTeam.html @@ -8,7 +8,7 @@ - + @@ -387,6 +387,6 @@ copy used by the device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceVlan.html b/docs/libnm-glib/html/NMDeviceVlan.html index 8fcfe876..b9450573 100644 --- a/docs/libnm-glib/html/NMDeviceVlan.html +++ b/docs/libnm-glib/html/NMDeviceVlan.html @@ -8,7 +8,7 @@ - + @@ -451,6 +451,6 @@ nm_device_vlan_get_vlan_id (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceWifi.html b/docs/libnm-glib/html/NMDeviceWifi.html index 65955625..f58678ef 100644 --- a/docs/libnm-glib/html/NMDeviceWifi.html +++ b/docs/libnm-glib/html/NMDeviceWifi.html @@ -8,7 +8,7 @@ - + @@ -843,6 +843,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMDeviceWimax.html b/docs/libnm-glib/html/NMDeviceWimax.html index 44110ed2..e26791e9 100644 --- a/docs/libnm-glib/html/NMDeviceWimax.html +++ b/docs/libnm-glib/html/NMDeviceWimax.html @@ -8,7 +8,7 @@ - + @@ -919,6 +919,6 @@ user_function (
< +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMIP4Config.html b/docs/libnm-glib/html/NMIP4Config.html index a6a8bce5..e6b4fa37 100644 --- a/docs/libnm-glib/html/NMIP4Config.html +++ b/docs/libnm-glib/html/NMIP4Config.html @@ -8,7 +8,7 @@ - + @@ -538,6 +538,6 @@ modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMIP6Config.html b/docs/libnm-glib/html/NMIP6Config.html index 255555d7..daf58691 100644 --- a/docs/libnm-glib/html/NMIP6Config.html +++ b/docs/libnm-glib/html/NMIP6Config.html @@ -8,7 +8,7 @@ - + @@ -567,6 +567,6 @@ contain the addresses of nameservers of the configuration.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMObject.html b/docs/libnm-glib/html/NMObject.html index 30edaae3..e12cbdb9 100644 --- a/docs/libnm-glib/html/NMObject.html +++ b/docs/libnm-glib/html/NMObject.html @@ -8,7 +8,7 @@ - + @@ -336,6 +336,6 @@ during property handling of master_object +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMRemoteConnection.html b/docs/libnm-glib/html/NMRemoteConnection.html index 211c4d0f..4f28af17 100644 --- a/docs/libnm-glib/html/NMRemoteConnection.html +++ b/docs/libnm-glib/html/NMRemoteConnection.html @@ -8,7 +8,7 @@ - + @@ -654,10 +654,14 @@ representation.


NMRemoteConnectionCommitFunc

+
typedef NMRemoteConnectionResultFunc NMRemoteConnectionCommitFunc;
+

NMRemoteConnectionDeleteFunc

+
typedef NMRemoteConnectionResultFunc NMRemoteConnectionDeleteFunc;
+
@@ -769,6 +773,6 @@ user_function ( -
Generated by GTK-Doc V1.26
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMRemoteSettings.html b/docs/libnm-glib/html/NMRemoteSettings.html index 530641d9..6b571ac3 100644 --- a/docs/libnm-glib/html/NMRemoteSettings.html +++ b/docs/libnm-glib/html/NMRemoteSettings.html @@ -8,7 +8,7 @@ - + @@ -1133,6 +1133,6 @@ user_function (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMSecretAgent.html b/docs/libnm-glib/html/NMSecretAgent.html index 51909453..d7617dd9 100644 --- a/docs/libnm-glib/html/NMSecretAgent.html +++ b/docs/libnm-glib/html/NMSecretAgent.html @@ -8,7 +8,7 @@ - + @@ -970,6 +970,6 @@ request was successful.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMVPNConnection.html b/docs/libnm-glib/html/NMVPNConnection.html index 9c2ae171..fc6469dd 100644 --- a/docs/libnm-glib/html/NMVPNConnection.html +++ b/docs/libnm-glib/html/NMVPNConnection.html @@ -8,7 +8,7 @@ - + @@ -273,6 +273,6 @@ user_function (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/NMWimaxNsp.html b/docs/libnm-glib/html/NMWimaxNsp.html index 476be10b..d17f2e9b 100644 --- a/docs/libnm-glib/html/NMWimaxNsp.html +++ b/docs/libnm-glib/html/NMWimaxNsp.html @@ -8,7 +8,7 @@ - + @@ -449,6 +449,6 @@ against

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/annotation-glossary.html b/docs/libnm-glib/html/annotation-glossary.html index 5a6e9c41..29b74948 100644 --- a/docs/libnm-glib/html/annotation-glossary.html +++ b/docs/libnm-glib/html/annotation-glossary.html @@ -7,7 +7,7 @@ - + @@ -61,6 +61,6 @@

Override the parsed C type with given type.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/api-index-full.html b/docs/libnm-glib/html/api-index-full.html index 84463386..dd4be285 100644 --- a/docs/libnm-glib/html/api-index-full.html +++ b/docs/libnm-glib/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -2696,6 +2696,6 @@
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/ch02.html b/docs/libnm-glib/html/ch02.html index 47816206..3cb73a4e 100644 --- a/docs/libnm-glib/html/ch02.html +++ b/docs/libnm-glib/html/ch02.html @@ -8,7 +8,7 @@ - + @@ -119,6 +119,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/index.html b/docs/libnm-glib/html/index.html index 6c7c956b..5b68ce09 100644 --- a/docs/libnm-glib/html/index.html +++ b/docs/libnm-glib/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html index dcc9e93b..5877ebeb 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html +++ b/docs/libnm-glib/html/libnm-glib-NMVPNPlugin.html @@ -8,7 +8,7 @@ - + @@ -381,6 +381,6 @@ nm_vpn_plugin_disconnect (NMVPNPl +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html index dd007895..2ba09a03 100644 --- a/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html +++ b/docs/libnm-glib/html/libnm-glib-NMVpnPluginUiWidget.html @@ -8,7 +8,7 @@ - + @@ -547,6 +547,6 @@ plugin's VPN service daemon

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-nm-types.html b/docs/libnm-glib/html/libnm-glib-nm-types.html index 14d91ae6..14576d47 100644 --- a/docs/libnm-glib/html/libnm-glib-nm-types.html +++ b/docs/libnm-glib/html/libnm-glib-nm-types.html @@ -8,7 +8,7 @@ - + @@ -43,6 +43,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html index 84f8e479..6023a781 100644 --- a/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html +++ b/docs/libnm-glib/html/libnm-glib-nm-vpn-plugin-utils.html @@ -8,7 +8,7 @@ - + @@ -156,6 +156,6 @@ to flags, -
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/object-tree.html b/docs/libnm-glib/html/object-tree.html index 686e5dd4..00f1a96b 100644 --- a/docs/libnm-glib/html/object-tree.html +++ b/docs/libnm-glib/html/object-tree.html @@ -8,7 +8,7 @@ - + @@ -55,6 +55,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/html/ref-overview.html b/docs/libnm-glib/html/ref-overview.html index 63917124..9c4377cb 100644 --- a/docs/libnm-glib/html/ref-overview.html +++ b/docs/libnm-glib/html/ref-overview.html @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-glib/version.xml b/docs/libnm-glib/version.xml index 5ad2491c..18b31142 100644 --- a/docs/libnm-glib/version.xml +++ b/docs/libnm-glib/version.xml @@ -1 +1 @@ -1.10.2 +1.10.4 diff --git a/docs/libnm-util/Makefile.in b/docs/libnm-util/Makefile.in index a0c018de..6471f826 100644 --- a/docs/libnm-util/Makefile.in +++ b/docs/libnm-util/Makefile.in @@ -15,6 +15,24 @@ @SET_MAKE@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . #################################### # Everything below here is generic # @@ -321,6 +339,7 @@ PYTHON_VERSION = @PYTHON_VERSION@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ +READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ @@ -361,6 +380,7 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_NM = @ac_ct_NM@ ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_READELF = @ac_ct_READELF@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -837,6 +857,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo ""; \ diff --git a/docs/libnm-util/html/NMConnection.html b/docs/libnm-util/html/NMConnection.html index 14f20d51..8cdf90b2 100644 --- a/docs/libnm-util/html/NMConnection.html +++ b/docs/libnm-util/html/NMConnection.html @@ -8,7 +8,7 @@ - + @@ -2691,6 +2691,6 @@ updated

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting.html b/docs/libnm-util/html/NMSetting.html index fbc97331..40d06a36 100644 --- a/docs/libnm-util/html/NMSetting.html +++ b/docs/libnm-util/html/NMSetting.html @@ -8,7 +8,7 @@ - + @@ -1399,6 +1399,6 @@ example "ppp" or "wireless" or "wired".

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSetting8021x.html b/docs/libnm-util/html/NMSetting8021x.html index bb3ec40a..deed8ba9 100644 --- a/docs/libnm-util/html/NMSetting8021x.html +++ b/docs/libnm-util/html/NMSetting8021x.html @@ -8,7 +8,7 @@ - + @@ -3963,6 +3963,6 @@ addition to any certificates specified by the
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingAdsl.html b/docs/libnm-util/html/NMSettingAdsl.html index 422181a8..f5e7b91c 100644 --- a/docs/libnm-util/html/NMSettingAdsl.html +++ b/docs/libnm-util/html/NMSettingAdsl.html @@ -8,7 +8,7 @@ - + @@ -639,6 +639,6 @@ required

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingBluetooth.html b/docs/libnm-util/html/NMSettingBluetooth.html index 5a92f63e..48af1465 100644 --- a/docs/libnm-util/html/NMSettingBluetooth.html +++ b/docs/libnm-util/html/NMSettingBluetooth.html @@ -8,7 +8,7 @@ - + @@ -348,6 +348,6 @@ Area Networking connections to devices supporting the NAP profile.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingBond.html b/docs/libnm-util/html/NMSettingBond.html index 1bfcf29b..02adcc17 100644 --- a/docs/libnm-util/html/NMSettingBond.html +++ b/docs/libnm-util/html/NMSettingBond.html @@ -8,7 +8,7 @@ - + @@ -807,6 +807,6 @@ must be strings. Option names must contain only alphanumeric characters +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingBridge.html b/docs/libnm-util/html/NMSettingBridge.html index 42e859e2..04a527ca 100644 --- a/docs/libnm-util/html/NMSettingBridge.html +++ b/docs/libnm-util/html/NMSettingBridge.html @@ -8,7 +8,7 @@ - + @@ -670,6 +670,6 @@ bridge.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingBridgePort.html b/docs/libnm-util/html/NMSettingBridgePort.html index 70d8d3df..d7e8e0d3 100644 --- a/docs/libnm-util/html/NMSettingBridgePort.html +++ b/docs/libnm-util/html/NMSettingBridgePort.html @@ -8,7 +8,7 @@ - + @@ -377,6 +377,6 @@ port.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingCdma.html b/docs/libnm-util/html/NMSettingCdma.html index 966fa94c..d2c67a2a 100644 --- a/docs/libnm-util/html/NMSettingCdma.html +++ b/docs/libnm-util/html/NMSettingCdma.html @@ -8,7 +8,7 @@ - + @@ -434,6 +434,6 @@ username is required, it is specified here.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingConnection.html b/docs/libnm-util/html/NMSettingConnection.html index ca705f35..0f595283 100644 --- a/docs/libnm-util/html/NMSettingConnection.html +++ b/docs/libnm-util/html/NMSettingConnection.html @@ -8,7 +8,7 @@ - + @@ -1517,6 +1517,6 @@ firewall.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingDcb.html b/docs/libnm-util/html/NMSettingDcb.html index 6cdbed85..b4388962 100644 --- a/docs/libnm-util/html/NMSettingDcb.html +++ b/docs/libnm-util/html/NMSettingDcb.html @@ -8,7 +8,7 @@ - + @@ -1517,6 +1517,6 @@ which the priority is mapped.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingGeneric.html b/docs/libnm-util/html/NMSettingGeneric.html index 6c34cb97..7dd36c05 100644 --- a/docs/libnm-util/html/NMSettingGeneric.html +++ b/docs/libnm-util/html/NMSettingGeneric.html @@ -8,7 +8,7 @@ - + @@ -186,6 +186,6 @@ is required

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingGsm.html b/docs/libnm-util/html/NMSettingGsm.html index 648212cb..ab6850b8 100644 --- a/docs/libnm-util/html/NMSettingGsm.html +++ b/docs/libnm-util/html/NMSettingGsm.html @@ -8,7 +8,7 @@ - + @@ -1100,6 +1100,6 @@ username is required, it is specified here.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingIP4Config.html b/docs/libnm-util/html/NMSettingIP4Config.html index 00b796d4..16213307 100644 --- a/docs/libnm-util/html/NMSettingIP4Config.html +++ b/docs/libnm-util/html/NMSettingIP4Config.html @@ -8,7 +8,7 @@ - + @@ -2779,6 +2779,6 @@ methods because there is no upstream network.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingIP6Config.html b/docs/libnm-util/html/NMSettingIP6Config.html index 88210773..3d11d842 100644 --- a/docs/libnm-util/html/NMSettingIP6Config.html +++ b/docs/libnm-util/html/NMSettingIP6Config.html @@ -8,7 +8,7 @@ - + @@ -2723,6 +2723,6 @@ automatic configuration. Routes cannot be used with the "shared" or +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingInfiniband.html b/docs/libnm-util/html/NMSettingInfiniband.html index fd58dbee..9b44b162 100644 --- a/docs/libnm-util/html/NMSettingInfiniband.html +++ b/docs/libnm-util/html/NMSettingInfiniband.html @@ -8,7 +8,7 @@ - + @@ -492,6 +492,6 @@ specify the base device by setting either this property or +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingOlpcMesh.html b/docs/libnm-util/html/NMSettingOlpcMesh.html index c4136eb8..99ed57fb 100644 --- a/docs/libnm-util/html/NMSettingOlpcMesh.html +++ b/docs/libnm-util/html/NMSettingOlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -294,6 +294,6 @@ answers the request.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingPPP.html b/docs/libnm-util/html/NMSettingPPP.html index f94b7ce8..28b67ce9 100644 --- a/docs/libnm-util/html/NMSettingPPP.html +++ b/docs/libnm-util/html/NMSettingPPP.html @@ -8,7 +8,7 @@ - + @@ -1235,6 +1235,6 @@ be set to
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingPPPOE.html b/docs/libnm-util/html/NMSettingPPPOE.html index 5e0feccd..7d9600bc 100644 --- a/docs/libnm-util/html/NMSettingPPPOE.html +++ b/docs/libnm-util/html/NMSettingPPPOE.html @@ -8,7 +8,7 @@ - + @@ -432,6 +432,6 @@ access concentrators or a specific service is known to be required.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingSerial.html b/docs/libnm-util/html/NMSettingSerial.html index 62ba1e0b..0942e0bc 100644 --- a/docs/libnm-util/html/NMSettingSerial.html +++ b/docs/libnm-util/html/NMSettingSerial.html @@ -8,7 +8,7 @@ - + @@ -492,6 +492,6 @@ The 1 in "8n1" for example.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingTeam.html b/docs/libnm-util/html/NMSettingTeam.html index 65f8c94d..704ab2d5 100644 --- a/docs/libnm-util/html/NMSettingTeam.html +++ b/docs/libnm-util/html/NMSettingTeam.html @@ -8,7 +8,7 @@ - + @@ -314,6 +314,6 @@ configuration is used. See man teamd.conf for the format details.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingTeamPort.html b/docs/libnm-util/html/NMSettingTeamPort.html index c9ff80a3..f2263b38 100644 --- a/docs/libnm-util/html/NMSettingTeamPort.html +++ b/docs/libnm-util/html/NMSettingTeamPort.html @@ -8,7 +8,7 @@ - + @@ -255,6 +255,6 @@ used. See man teamd.conf for the format details.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingVPN.html b/docs/libnm-util/html/NMSettingVPN.html index 4f59ff22..55e75ece 100644 --- a/docs/libnm-util/html/NMSettingVPN.html +++ b/docs/libnm-util/html/NMSettingVPN.html @@ -8,7 +8,7 @@ - + @@ -904,6 +904,6 @@ VPN connection.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingVlan.html b/docs/libnm-util/html/NMSettingVlan.html index 483499f0..1a691951 100644 --- a/docs/libnm-util/html/NMSettingVlan.html +++ b/docs/libnm-util/html/NMSettingVlan.html @@ -8,7 +8,7 @@ - + @@ -1023,6 +1023,6 @@ with a
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingWimax.html b/docs/libnm-util/html/NMSettingWimax.html index 5a239a70..7c533417 100644 --- a/docs/libnm-util/html/NMSettingWimax.html +++ b/docs/libnm-util/html/NMSettingWimax.html @@ -8,7 +8,7 @@ - + @@ -339,6 +339,6 @@ should use.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingWired.html b/docs/libnm-util/html/NMSettingWired.html index 8102dc88..632547e6 100644 --- a/docs/libnm-util/html/NMSettingWired.html +++ b/docs/libnm-util/html/NMSettingWired.html @@ -8,7 +8,7 @@ - + @@ -1328,6 +1328,6 @@ Mbit/s, ie 100 == 100Mbit/s.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingWireless.html b/docs/libnm-util/html/NMSettingWireless.html index d44aae69..3a0e8fa1 100644 --- a/docs/libnm-util/html/NMSettingWireless.html +++ b/docs/libnm-util/html/NMSettingWireless.html @@ -8,7 +8,7 @@ - + @@ -1543,6 +1543,6 @@ devices support setting a static transmit power.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/NMSettingWirelessSecurity.html b/docs/libnm-util/html/NMSettingWirelessSecurity.html index 89c47d9d..59ae2c6c 100644 --- a/docs/libnm-util/html/NMSettingWirelessSecurity.html +++ b/docs/libnm-util/html/NMSettingWirelessSecurity.html @@ -8,7 +8,7 @@ - + @@ -1898,6 +1898,6 @@ Linksys WRT54G) number the keys 1 - 4.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/annotation-glossary.html b/docs/libnm-util/html/annotation-glossary.html index af7b079d..c0e5c4f8 100644 --- a/docs/libnm-util/html/annotation-glossary.html +++ b/docs/libnm-util/html/annotation-glossary.html @@ -7,7 +7,7 @@ - + @@ -64,6 +64,6 @@

Don't free data after the code is done.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/api-index-full.html b/docs/libnm-util/html/api-index-full.html index 6b826461..c9bc5b2d 100644 --- a/docs/libnm-util/html/api-index-full.html +++ b/docs/libnm-util/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -5335,6 +5335,6 @@ DBUS_TYPE_NM_IP_ROUTES, macro in nm-dbus-glib-types
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/ch01.html b/docs/libnm-util/html/ch01.html index 407e8c0c..169ef3f7 100644 --- a/docs/libnm-util/html/ch01.html +++ b/docs/libnm-util/html/ch01.html @@ -8,7 +8,7 @@ - + @@ -122,6 +122,6 @@ that require PPP to deliver IP capability
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/index.html b/docs/libnm-util/html/index.html index 3c8cebc5..d3774d77 100644 --- a/docs/libnm-util/html/index.html +++ b/docs/libnm-util/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/libnm-util-NetworkManager.html b/docs/libnm-util/html/libnm-util-NetworkManager.html index d2c0c1e7..14cad274 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManager.html +++ b/docs/libnm-util/html/libnm-util-NetworkManager.html @@ -8,7 +8,7 @@ - + @@ -1886,6 +1886,6 @@ network.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html index 078d02b5..a4d82377 100644 --- a/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html +++ b/docs/libnm-util/html/libnm-util-NetworkManagerVPN.html @@ -8,7 +8,7 @@ - + @@ -944,6 +944,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/libnm-util-nm-utils.html b/docs/libnm-util/html/libnm-util-nm-utils.html index d322ac39..fafbbeb7 100644 --- a/docs/libnm-util/html/libnm-util-nm-utils.html +++ b/docs/libnm-util/html/libnm-util-nm-utils.html @@ -8,7 +8,7 @@ - + @@ -2498,6 +2498,6 @@ for both +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/html/object-tree.html b/docs/libnm-util/html/object-tree.html index a0213542..edb04e5e 100644 --- a/docs/libnm-util/html/object-tree.html +++ b/docs/libnm-util/html/object-tree.html @@ -8,7 +8,7 @@ - + @@ -103,6 +103,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm-util/version.xml b/docs/libnm-util/version.xml index 5ad2491c..18b31142 100644 --- a/docs/libnm-util/version.xml +++ b/docs/libnm-util/version.xml @@ -1 +1 @@ -1.10.2 +1.10.4 diff --git a/docs/libnm/Makefile.in b/docs/libnm/Makefile.in index 1da591d2..ff314e0e 100644 --- a/docs/libnm/Makefile.in +++ b/docs/libnm/Makefile.in @@ -15,6 +15,24 @@ @SET_MAKE@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . #################################### # Everything below here is generic # @@ -321,6 +339,7 @@ PYTHON_VERSION = @PYTHON_VERSION@ QT_CFLAGS = @QT_CFLAGS@ QT_LIBS = @QT_LIBS@ RANLIB = @RANLIB@ +READELF = @READELF@ READLINE_LIBS = @READLINE_LIBS@ SANITIZERS = @SANITIZERS@ SANITIZER_ENV = @SANITIZER_ENV@ @@ -361,6 +380,7 @@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ ac_ct_NM = @ac_ct_NM@ ac_ct_RANLIB = @ac_ct_RANLIB@ +ac_ct_READELF = @ac_ct_READELF@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -856,6 +876,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo ""; \ diff --git a/docs/libnm/html/NMAccessPoint.html b/docs/libnm/html/NMAccessPoint.html index 59a7726d..971a6eb2 100644 --- a/docs/libnm/html/NMAccessPoint.html +++ b/docs/libnm/html/NMAccessPoint.html @@ -8,7 +8,7 @@ - + @@ -814,6 +814,6 @@ coordinator of the wireless network allowing clients to connect) or +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html index e49d3ef0..1543554d 100644 --- a/docs/libnm/html/NMActiveConnection.html +++ b/docs/libnm/html/NMActiveConnection.html @@ -8,7 +8,7 @@ - + @@ -1112,6 +1112,6 @@ user_function (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMClient.html b/docs/libnm/html/NMClient.html index 401a1156..6015f726 100644 --- a/docs/libnm/html/NMClient.html +++ b/docs/libnm/html/NMClient.html @@ -8,7 +8,7 @@ - + @@ -4513,6 +4513,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMConnection.html b/docs/libnm/html/NMConnection.html index 2b539a36..ef3b0136 100644 --- a/docs/libnm/html/NMConnection.html +++ b/docs/libnm/html/NMConnection.html @@ -8,7 +8,7 @@ - + @@ -2853,6 +2853,6 @@ calling
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index 1ab4b955..b58fcda5 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -8,7 +8,7 @@ - + @@ -3219,6 +3219,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceAdsl.html b/docs/libnm/html/NMDeviceAdsl.html index 0bd96d2f..7c64b167 100644 --- a/docs/libnm/html/NMDeviceAdsl.html +++ b/docs/libnm/html/NMDeviceAdsl.html @@ -8,7 +8,7 @@ - + @@ -155,6 +155,6 @@ nm_device_adsl_get_carrier (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html index 686710c1..e0f5cd27 100644 --- a/docs/libnm/html/NMDeviceBond.html +++ b/docs/libnm/html/NMDeviceBond.html @@ -8,7 +8,7 @@ - + @@ -279,6 +279,6 @@ copy used by the device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html index 867d5380..6936ca89 100644 --- a/docs/libnm/html/NMDeviceBridge.html +++ b/docs/libnm/html/NMDeviceBridge.html @@ -8,7 +8,7 @@ - + @@ -279,6 +279,6 @@ copy used by the device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceBt.html b/docs/libnm/html/NMDeviceBt.html index f8278d3e..22c365c6 100644 --- a/docs/libnm/html/NMDeviceBt.html +++ b/docs/libnm/html/NMDeviceBt.html @@ -8,7 +8,7 @@ - + @@ -273,6 +273,6 @@ nm_device_bt_get_capabilities (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceDummy.html b/docs/libnm/html/NMDeviceDummy.html index a2b54409..da701a47 100644 --- a/docs/libnm/html/NMDeviceDummy.html +++ b/docs/libnm/html/NMDeviceDummy.html @@ -8,7 +8,7 @@ - + @@ -158,6 +158,6 @@ device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceEthernet.html b/docs/libnm/html/NMDeviceEthernet.html index c294af9d..2d8c6dcf 100644 --- a/docs/libnm/html/NMDeviceEthernet.html +++ b/docs/libnm/html/NMDeviceEthernet.html @@ -8,7 +8,7 @@ - + @@ -394,6 +394,6 @@ communication with z/VM or s390 host.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceGeneric.html b/docs/libnm/html/NMDeviceGeneric.html index fa71f9fb..df10829c 100644 --- a/docs/libnm/html/NMDeviceGeneric.html +++ b/docs/libnm/html/NMDeviceGeneric.html @@ -8,7 +8,7 @@ - + @@ -183,6 +183,6 @@ if not known.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceIPTunnel.html b/docs/libnm/html/NMDeviceIPTunnel.html index da351bd9..c8807ffe 100644 --- a/docs/libnm/html/NMDeviceIPTunnel.html +++ b/docs/libnm/html/NMDeviceIPTunnel.html @@ -8,7 +8,7 @@ - + @@ -750,6 +750,6 @@ tunneled packets.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceInfiniband.html b/docs/libnm/html/NMDeviceInfiniband.html index b5b282a0..3a2ba403 100644 --- a/docs/libnm/html/NMDeviceInfiniband.html +++ b/docs/libnm/html/NMDeviceInfiniband.html @@ -8,7 +8,7 @@ - + @@ -217,6 +217,6 @@ nm_device_infiniband_get_carrier (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceMacsec.html b/docs/libnm/html/NMDeviceMacsec.html index 8dcf1832..1075e32d 100644 --- a/docs/libnm/html/NMDeviceMacsec.html +++ b/docs/libnm/html/NMDeviceMacsec.html @@ -8,7 +8,7 @@ - + @@ -939,6 +939,6 @@ disabled).

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceMacvlan.html b/docs/libnm/html/NMDeviceMacvlan.html index 5827d9d6..1d6f9470 100644 --- a/docs/libnm/html/NMDeviceMacvlan.html +++ b/docs/libnm/html/NMDeviceMacvlan.html @@ -8,7 +8,7 @@ - + @@ -399,6 +399,6 @@ device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceModem.html b/docs/libnm/html/NMDeviceModem.html index f4ae7ad6..5b15cb7a 100644 --- a/docs/libnm/html/NMDeviceModem.html +++ b/docs/libnm/html/NMDeviceModem.html @@ -8,7 +8,7 @@ - + @@ -225,6 +225,6 @@ CDMA/EVDO and GSM/UMTS.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceOlpcMesh.html b/docs/libnm/html/NMDeviceOlpcMesh.html index de00ad87..8ff5ce2c 100644 --- a/docs/libnm/html/NMDeviceOlpcMesh.html +++ b/docs/libnm/html/NMDeviceOlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -276,6 +276,6 @@ nm_device_olpc_mesh_get_active_channel +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html index e3fe4974..d4b1a6e4 100644 --- a/docs/libnm/html/NMDeviceTeam.html +++ b/docs/libnm/html/NMDeviceTeam.html @@ -8,7 +8,7 @@ - + @@ -339,6 +339,6 @@ device, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceTun.html b/docs/libnm/html/NMDeviceTun.html index 3dc10345..743334e4 100644 --- a/docs/libnm/html/NMDeviceTun.html +++ b/docs/libnm/html/NMDeviceTun.html @@ -8,7 +8,7 @@ - + @@ -501,6 +501,6 @@ include a virtio network header.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceVlan.html b/docs/libnm/html/NMDeviceVlan.html index 434bd46f..be5231ba 100644 --- a/docs/libnm/html/NMDeviceVlan.html +++ b/docs/libnm/html/NMDeviceVlan.html @@ -8,7 +8,7 @@ - + @@ -331,6 +331,6 @@ nm_device_vlan_get_vlan_id (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceVxlan.html b/docs/libnm/html/NMDeviceVxlan.html index 46cb768a..6723c297 100644 --- a/docs/libnm/html/NMDeviceVxlan.html +++ b/docs/libnm/html/NMDeviceVxlan.html @@ -8,7 +8,7 @@ - + @@ -1162,6 +1162,6 @@ tunnel endpoint.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWifi.html b/docs/libnm/html/NMDeviceWifi.html index 3f6da6cd..eacae65f 100644 --- a/docs/libnm/html/NMDeviceWifi.html +++ b/docs/libnm/html/NMDeviceWifi.html @@ -8,7 +8,7 @@ - + @@ -944,6 +944,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDeviceWimax.html b/docs/libnm/html/NMDeviceWimax.html index 395f8398..2cb66cbe 100644 --- a/docs/libnm/html/NMDeviceWimax.html +++ b/docs/libnm/html/NMDeviceWimax.html @@ -8,7 +8,7 @@ - + @@ -796,6 +796,6 @@ user_function (
< +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMDhcpConfig.html b/docs/libnm/html/NMDhcpConfig.html index b23c8e40..495070c0 100644 --- a/docs/libnm/html/NMDhcpConfig.html +++ b/docs/libnm/html/NMDhcpConfig.html @@ -8,7 +8,7 @@ - + @@ -264,6 +264,6 @@ configuration, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMIPConfig.html b/docs/libnm/html/NMIPConfig.html index 2fa27a59..b62bc639 100644 --- a/docs/libnm/html/NMIPConfig.html +++ b/docs/libnm/html/NMIPConfig.html @@ -8,7 +8,7 @@ - + @@ -569,6 +569,6 @@ nm_ip_config_get_wins_servers (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMObject.html b/docs/libnm/html/NMObject.html index 0f0b6ce1..e8a18ec8 100644 --- a/docs/libnm/html/NMObject.html +++ b/docs/libnm/html/NMObject.html @@ -8,7 +8,7 @@ - + @@ -226,6 +226,6 @@ object, and must not be modified.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMRemoteConnection.html b/docs/libnm/html/NMRemoteConnection.html index 5fb92093..6cd6e6dd 100644 --- a/docs/libnm/html/NMRemoteConnection.html +++ b/docs/libnm/html/NMRemoteConnection.html @@ -8,7 +8,7 @@ - + @@ -1009,6 +1009,6 @@ after you already have a reference to it.)

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSecretAgentOld.html b/docs/libnm/html/NMSecretAgentOld.html index f8c782fc..b7625a37 100644 --- a/docs/libnm/html/NMSecretAgentOld.html +++ b/docs/libnm/html/NMSecretAgentOld.html @@ -8,7 +8,7 @@ - + @@ -958,6 +958,6 @@ of 3 characters. An example valid identifier is 'org.gnome.nm-applet' +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSetting.html b/docs/libnm/html/NMSetting.html index 4eddfb47..7ef5b016 100644 --- a/docs/libnm/html/NMSetting.html +++ b/docs/libnm/html/NMSetting.html @@ -8,7 +8,7 @@ - + @@ -1159,6 +1159,6 @@ example "ppp" or "wireless" or "wired".

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSetting8021x.html b/docs/libnm/html/NMSetting8021x.html index 56c2b9dd..cce84fb7 100644 --- a/docs/libnm/html/NMSetting8021x.html +++ b/docs/libnm/html/NMSetting8021x.html @@ -8,7 +8,7 @@ - + @@ -5036,6 +5036,6 @@ properties instead (sets ca_cert/ca_cert2 options for wpa_supplicant).

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingAdsl.html b/docs/libnm/html/NMSettingAdsl.html index 9761522e..871430cd 100644 --- a/docs/libnm/html/NMSettingAdsl.html +++ b/docs/libnm/html/NMSettingAdsl.html @@ -8,7 +8,7 @@ - + @@ -569,6 +569,6 @@ nm_setting_adsl_get_password_flags (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBluetooth.html b/docs/libnm/html/NMSettingBluetooth.html index b0a6bfe2..dc47baa3 100644 --- a/docs/libnm/html/NMSettingBluetooth.html +++ b/docs/libnm/html/NMSettingBluetooth.html @@ -8,7 +8,7 @@ - + @@ -284,6 +284,6 @@ Area Networking connections to devices supporting the NAP profile.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBond.html b/docs/libnm/html/NMSettingBond.html index da05b73e..d64629ac 100644 --- a/docs/libnm/html/NMSettingBond.html +++ b/docs/libnm/html/NMSettingBond.html @@ -8,7 +8,7 @@ - + @@ -791,6 +791,6 @@ must be strings. Option names must contain only alphanumeric characters +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBridge.html b/docs/libnm/html/NMSettingBridge.html index 9c7224b0..5644cae1 100644 --- a/docs/libnm/html/NMSettingBridge.html +++ b/docs/libnm/html/NMSettingBridge.html @@ -8,7 +8,7 @@ - + @@ -659,6 +659,6 @@ bridge.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingBridgePort.html b/docs/libnm/html/NMSettingBridgePort.html index 8f0a6dac..ffb114db 100644 --- a/docs/libnm/html/NMSettingBridgePort.html +++ b/docs/libnm/html/NMSettingBridgePort.html @@ -8,7 +8,7 @@ - + @@ -300,6 +300,6 @@ port.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingCdma.html b/docs/libnm/html/NMSettingCdma.html index c257430a..a28a7750 100644 --- a/docs/libnm/html/NMSettingCdma.html +++ b/docs/libnm/html/NMSettingCdma.html @@ -8,7 +8,7 @@ - + @@ -415,6 +415,6 @@ username is required, it is specified here.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 963914a8..36f687c3 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -8,7 +8,7 @@ - + @@ -1987,6 +1987,6 @@ the change takes effect immediately.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingDcb.html b/docs/libnm/html/NMSettingDcb.html index 970f8d65..f7560b20 100644 --- a/docs/libnm/html/NMSettingDcb.html +++ b/docs/libnm/html/NMSettingDcb.html @@ -8,7 +8,7 @@ - + @@ -1403,6 +1403,6 @@ which the priority is mapped.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingDummy.html b/docs/libnm/html/NMSettingDummy.html index f8a7f8a1..2a34ea93 100644 --- a/docs/libnm/html/NMSettingDummy.html +++ b/docs/libnm/html/NMSettingDummy.html @@ -8,7 +8,7 @@ - + @@ -111,6 +111,6 @@ nm_setting_dummy_new (void +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingGeneric.html b/docs/libnm/html/NMSettingGeneric.html index ff628cfe..7d5f1abc 100644 --- a/docs/libnm/html/NMSettingGeneric.html +++ b/docs/libnm/html/NMSettingGeneric.html @@ -8,7 +8,7 @@ - + @@ -113,6 +113,6 @@ nm_setting_generic_new (void +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingGsm.html b/docs/libnm/html/NMSettingGsm.html index df0775e6..6748514e 100644 --- a/docs/libnm/html/NMSettingGsm.html +++ b/docs/libnm/html/NMSettingGsm.html @@ -8,7 +8,7 @@ - + @@ -891,6 +891,6 @@ username is required, it is specified here.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIP4Config.html b/docs/libnm/html/NMSettingIP4Config.html index 07df6282..4bd8df58 100644 --- a/docs/libnm/html/NMSettingIP4Config.html +++ b/docs/libnm/html/NMSettingIP4Config.html @@ -8,7 +8,7 @@ - + @@ -337,6 +337,6 @@ cannot be set at the same time.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIP6Config.html b/docs/libnm/html/NMSettingIP6Config.html index 440245a4..e1cc7707 100644 --- a/docs/libnm/html/NMSettingIP6Config.html +++ b/docs/libnm/html/NMSettingIP6Config.html @@ -8,7 +8,7 @@ - + @@ -528,6 +528,6 @@ IPv6 tokenized interface identifiers. Useful with eui64 addr-gen-mode.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIPConfig.html b/docs/libnm/html/NMSettingIPConfig.html index 341714ed..5fe47818 100644 --- a/docs/libnm/html/NMSettingIPConfig.html +++ b/docs/libnm/html/NMSettingIPConfig.html @@ -8,7 +8,7 @@ - + @@ -4363,6 +4363,6 @@ of NetworkManager.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingIPTunnel.html b/docs/libnm/html/NMSettingIPTunnel.html index 428334c1..e8bb273c 100644 --- a/docs/libnm/html/NMSettingIPTunnel.html +++ b/docs/libnm/html/NMSettingIPTunnel.html @@ -8,7 +8,7 @@ - + @@ -852,6 +852,6 @@ packets inherit the TTL value.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingInfiniband.html b/docs/libnm/html/NMSettingInfiniband.html index c2ffe028..d7611eb6 100644 --- a/docs/libnm/html/NMSettingInfiniband.html +++ b/docs/libnm/html/NMSettingInfiniband.html @@ -8,7 +8,7 @@ - + @@ -461,6 +461,6 @@ specify the base device by setting either this property or +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingMacsec.html b/docs/libnm/html/NMSettingMacsec.html index 4170cbb4..9adf0f48 100644 --- a/docs/libnm/html/NMSettingMacsec.html +++ b/docs/libnm/html/NMSettingMacsec.html @@ -8,7 +8,7 @@ - + @@ -705,6 +705,6 @@ with a
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingMacvlan.html b/docs/libnm/html/NMSettingMacvlan.html index a911e8bc..3145485b 100644 --- a/docs/libnm/html/NMSettingMacvlan.html +++ b/docs/libnm/html/NMSettingMacvlan.html @@ -8,7 +8,7 @@ - + @@ -438,6 +438,6 @@ with a
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingOlpcMesh.html b/docs/libnm/html/NMSettingOlpcMesh.html index 23a8679b..3a4ce4b2 100644 --- a/docs/libnm/html/NMSettingOlpcMesh.html +++ b/docs/libnm/html/NMSettingOlpcMesh.html @@ -8,7 +8,7 @@ - + @@ -260,6 +260,6 @@ answers the request.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingPpp.html b/docs/libnm/html/NMSettingPpp.html index 3e66cb06..55534290 100644 --- a/docs/libnm/html/NMSettingPpp.html +++ b/docs/libnm/html/NMSettingPpp.html @@ -8,7 +8,7 @@ - + @@ -1159,6 +1159,6 @@ be set to
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingPppoe.html b/docs/libnm/html/NMSettingPppoe.html index 48cd6c33..b0dcbdf8 100644 --- a/docs/libnm/html/NMSettingPppoe.html +++ b/docs/libnm/html/NMSettingPppoe.html @@ -8,7 +8,7 @@ - + @@ -415,6 +415,6 @@ access concentrators or a specific service is known to be required.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingSerial.html b/docs/libnm/html/NMSettingSerial.html index b194767a..435dcc81 100644 --- a/docs/libnm/html/NMSettingSerial.html +++ b/docs/libnm/html/NMSettingSerial.html @@ -8,7 +8,7 @@ - + @@ -458,6 +458,6 @@ The 1 in "8n1" for example.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index b68ee8a4..5365b1d9 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -8,7 +8,7 @@ - + @@ -2176,7 +2176,7 @@ nm_setting_team_clear_link_watchers (

NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT

-
#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT             255
+
#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT             65535
 

@@ -2262,7 +2262,11 @@ arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active',
  “runner”                   gchar *

Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", -"loadbalance", "lacp".

+"loadbalance", "lacp". +When setting the runner, all the properties specific to the runner +will be reset to the default value; all the properties specific to +other runners will be set to an empty value (or if not possible to +a default value).

Flags: Read / Write

Default value: NULL

Since: 1.10.2

@@ -2350,6 +2354,6 @@ Permitted values are: "roundrobin", "broadcast", "activebackup", +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTeamPort.html b/docs/libnm/html/NMSettingTeamPort.html index 52030694..4e5feda1 100644 --- a/docs/libnm/html/NMSettingTeamPort.html +++ b/docs/libnm/html/NMSettingTeamPort.html @@ -8,7 +8,7 @@ - + @@ -768,6 +768,6 @@ When set to -1 means the parameter is skipped from the json config.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingTun.html b/docs/libnm/html/NMSettingTun.html index 5db3acde..cb17b21e 100644 --- a/docs/libnm/html/NMSettingTun.html +++ b/docs/libnm/html/NMSettingTun.html @@ -8,7 +8,7 @@ - + @@ -530,6 +530,6 @@ network header.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVlan.html b/docs/libnm/html/NMSettingVlan.html index 7f015712..4aeec14f 100644 --- a/docs/libnm/html/NMSettingVlan.html +++ b/docs/libnm/html/NMSettingVlan.html @@ -8,7 +8,7 @@ - + @@ -889,6 +889,6 @@ with a +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVpn.html b/docs/libnm/html/NMSettingVpn.html index 03e6bdd9..8814e6f8 100644 --- a/docs/libnm/html/NMSettingVpn.html +++ b/docs/libnm/html/NMSettingVpn.html @@ -8,7 +8,7 @@ - + @@ -902,6 +902,6 @@ VPN connection.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingVxlan.html b/docs/libnm/html/NMSettingVxlan.html index f5fa98ba..ce0bdbe9 100644 --- a/docs/libnm/html/NMSettingVxlan.html +++ b/docs/libnm/html/NMSettingVxlan.html @@ -8,7 +8,7 @@ - + @@ -1070,6 +1070,6 @@ tunnel endpoint.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWimax.html b/docs/libnm/html/NMSettingWimax.html index 150c0102..fd08bedf 100644 --- a/docs/libnm/html/NMSettingWimax.html +++ b/docs/libnm/html/NMSettingWimax.html @@ -8,7 +8,7 @@ - + @@ -268,6 +268,6 @@ should use.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWired.html b/docs/libnm/html/NMSettingWired.html index ef7608c7..3bbe9fd4 100644 --- a/docs/libnm/html/NMSettingWired.html +++ b/docs/libnm/html/NMSettingWired.html @@ -8,7 +8,7 @@ - + @@ -1596,6 +1596,6 @@ no password will be required.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWireless.html b/docs/libnm/html/NMSettingWireless.html index c88c400a..08420f25 100644 --- a/docs/libnm/html/NMSettingWireless.html +++ b/docs/libnm/html/NMSettingWireless.html @@ -8,7 +8,7 @@ - + @@ -1607,6 +1607,6 @@ devices support setting a static transmit power.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSettingWirelessSecurity.html b/docs/libnm/html/NMSettingWirelessSecurity.html index d55ba942..848f2cf9 100644 --- a/docs/libnm/html/NMSettingWirelessSecurity.html +++ b/docs/libnm/html/NMSettingWirelessSecurity.html @@ -8,7 +8,7 @@ - + @@ -2010,6 +2010,6 @@ the Access Point capabilities.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMSimpleConnection.html b/docs/libnm/html/NMSimpleConnection.html index 61437d2b..55fec999 100644 --- a/docs/libnm/html/NMSimpleConnection.html +++ b/docs/libnm/html/NMSimpleConnection.html @@ -8,7 +8,7 @@ - + @@ -188,6 +188,6 @@ and properties as the source
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnConnection.html b/docs/libnm/html/NMVpnConnection.html index d31b40ba..3fc3a251 100644 --- a/docs/libnm/html/NMVpnConnection.html +++ b/docs/libnm/html/NMVpnConnection.html @@ -8,7 +8,7 @@ - + @@ -245,6 +245,6 @@ user_function (
-
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMVpnEditorPlugin.html b/docs/libnm/html/NMVpnEditorPlugin.html index 727675ad..7bdc9f9b 100644 --- a/docs/libnm/html/NMVpnEditorPlugin.html +++ b/docs/libnm/html/NMVpnEditorPlugin.html @@ -8,7 +8,7 @@ - + @@ -807,6 +807,6 @@ user_function (
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/NMWimaxNsp.html b/docs/libnm/html/NMWimaxNsp.html index cdb11824..b00c07de 100644 --- a/docs/libnm/html/NMWimaxNsp.html +++ b/docs/libnm/html/NMWimaxNsp.html @@ -8,7 +8,7 @@ - + @@ -371,6 +371,6 @@ against

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/annotation-glossary.html b/docs/libnm/html/annotation-glossary.html index 1fbce73c..2af383fb 100644 --- a/docs/libnm/html/annotation-glossary.html +++ b/docs/libnm/html/annotation-glossary.html @@ -7,7 +7,7 @@ - + @@ -68,6 +68,6 @@

Override the parsed C type with given type.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index aa417e20..3e0a9a18 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -8,7 +8,7 @@ - + @@ -25,6 +25,8 @@  | 
I  |  + J +  |  L  |  M @@ -3920,6 +3922,107 @@ NMDevicePpp, struct in nm-types nm_ip_route_unref, function in NMSettingIPConfig
+

J

+
+nm_jansson_load, function in nm-json +
+
+
+json_array, macro in nm-json +
+
+
+json_array_append_new, macro in nm-json +
+
+
+json_array_get, macro in nm-json +
+
+
+json_array_size, macro in nm-json +
+
+
+json_delete, macro in nm-json +
+
+
+json_dumps, macro in nm-json +
+
+
+json_false, macro in nm-json +
+
+
+json_integer, macro in nm-json +
+
+
+json_integer_value, macro in nm-json +
+
+
+json_loads, macro in nm-json +
+
+
+json_object, macro in nm-json +
+
+
+json_object_del, macro in nm-json +
+
+
+json_object_get, macro in nm-json +
+
+
+json_object_iter, macro in nm-json +
+
+
+json_object_iter_at, macro in nm-json +
+
+
+json_object_iter_key, macro in nm-json +
+
+
+json_object_iter_next, macro in nm-json +
+
+
+json_object_iter_value, macro in nm-json +
+
+
+json_object_key_to_iter, macro in nm-json +
+
+
+json_object_set_new, macro in nm-json +
+
+
+json_object_size, macro in nm-json +
+
+
+json_string, macro in nm-json +
+
+
+json_string_value, macro in nm-json +
+
+
+json_true, macro in nm-json +
+

L

NM_LLDP_ATTR_CHASSIS_ID, macro in nm-dbus-interface @@ -10513,7 +10616,7 @@ nm_utils_fixup_desc_string, function in nm-libnm-utils
-NMVpnEditorInterface, struct in NMVpnEditor +NMVpnEditorInterface, struct in NMVpnEditor
@@ -10907,6 +11010,6 @@ NM_VPN_SERVICE_PLUGIN_STATE, macro in nm-vpn-service-plugin
+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/ch02.html b/docs/libnm/html/ch02.html index 2ede59e0..b00646c9 100644 --- a/docs/libnm/html/ch02.html +++ b/docs/libnm/html/ch02.html @@ -8,7 +8,7 @@ - + @@ -41,6 +41,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/ch03.html b/docs/libnm/html/ch03.html index 4bbc2cf3..45af16a3 100644 --- a/docs/libnm/html/ch03.html +++ b/docs/libnm/html/ch03.html @@ -8,7 +8,7 @@ - + @@ -138,6 +138,6 @@ use WEP, LEAP, WPA or WPA2/RSN security +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/ch04.html b/docs/libnm/html/ch04.html index f0f26ef3..f35d01c6 100644 --- a/docs/libnm/html/ch04.html +++ b/docs/libnm/html/ch04.html @@ -8,7 +8,7 @@ - + @@ -107,6 +107,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/ch05.html b/docs/libnm/html/ch05.html index 1044f9bb..6463c54b 100644 --- a/docs/libnm/html/ch05.html +++ b/docs/libnm/html/ch05.html @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/ch06.html b/docs/libnm/html/ch06.html index 44a4f710..c938e846 100644 --- a/docs/libnm/html/ch06.html +++ b/docs/libnm/html/ch06.html @@ -8,7 +8,7 @@ - + @@ -32,6 +32,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index 2661a42b..28584532 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@

- for libnm 1.10.2 + for libnm 1.10.4 The latest version of this documentation can be found on-line at https://developer.gnome.org/libnm/stable/. @@ -293,6 +293,6 @@ use WEP, LEAP, WPA or WPA2/RSN security

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 2b5affa6..575adb4e 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -8,7 +8,7 @@ - + @@ -2244,6 +2244,20 @@ GPRS, EDGE, UMTS, HSDPA, HSUPA, or HSPA+ packet switched data capability

  + +

NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE

+ +

a duplicate IP address was detected

+ +  + + +

NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED

+ +

The selected IP method is not supported

+ +  + @@ -3059,6 +3073,6 @@ VPN plugin authentication dialogs.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-errors.html b/docs/libnm/html/libnm-nm-errors.html index eb668056..3a37d8ad 100644 --- a/docs/libnm/html/libnm-nm-errors.html +++ b/docs/libnm/html/libnm-nm-errors.html @@ -8,7 +8,7 @@ - + @@ -991,6 +991,6 @@ to errors in the "org.freedesktop.NetworkManager.VPN.Error" namespace.

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html index 01e683fd..002d54ce 100644 --- a/docs/libnm/html/libnm-nm-utils.html +++ b/docs/libnm/html/libnm-nm-utils.html @@ -8,7 +8,7 @@ - + @@ -3360,6 +3360,6 @@ for both -
Generated by GTK-Doc V1.26 +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-version.html b/docs/libnm/html/libnm-nm-version.html index d92a8c8a..e2010ded 100644 --- a/docs/libnm/html/libnm-nm-version.html +++ b/docs/libnm/html/libnm-nm-version.html @@ -8,7 +8,7 @@ - + @@ -313,6 +313,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html index 1bbf9cb8..81acf918 100644 --- a/docs/libnm/html/libnm-nm-vpn-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-vpn-dbus-interface.html @@ -8,7 +8,7 @@ - + @@ -1004,6 +1004,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index 78123716..d55d98b2 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -2919,6 +2919,8 @@ + + diff --git a/docs/libnm/html/object-tree.html b/docs/libnm/html/object-tree.html index c05b7fc1..268539b2 100644 --- a/docs/libnm/html/object-tree.html +++ b/docs/libnm/html/object-tree.html @@ -8,7 +8,7 @@ - + @@ -184,6 +184,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/ref-overview.html b/docs/libnm/html/ref-overview.html index e167ead9..a32c3d32 100644 --- a/docs/libnm/html/ref-overview.html +++ b/docs/libnm/html/ref-overview.html @@ -8,7 +8,7 @@ - + @@ -62,6 +62,6 @@ +
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index b2332998..7721eb79 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -8,7 +8,7 @@ - + @@ -96,7 +96,7 @@

$ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
   $ ./hello-nm
-  NetworkManager version: 1.10.2
+  NetworkManager version: 1.10.4
 
   $ 

@@ -161,6 +161,6 @@

+
Generated by GTK-Doc V1.27 \ No newline at end of file diff --git a/docs/libnm/libnm-sections.txt b/docs/libnm/libnm-sections.txt index 1908d05f..da714c9b 100644 --- a/docs/libnm/libnm-sections.txt +++ b/docs/libnm/libnm-sections.txt @@ -1277,6 +1277,35 @@ NM_TYPE_IP_CONFIG nm_ip_config_get_type +
+nm-json +nm_jansson_load +json_object_iter_value +json_object_key_to_iter +json_integer +json_object_del +json_array_get +json_array_size +json_array_append_new +json_string +json_object_iter_next +json_loads +json_dumps +json_object_iter_key +json_object +json_object_get +json_array +json_false +json_delete +json_true +json_object_size +json_object_set_new +json_object_iter +json_object_iter_at +json_integer_value +json_string_value +
+
nm-libnm-utils nm_utils_fixup_desc_string diff --git a/docs/libnm/version.xml b/docs/libnm/version.xml index 5ad2491c..18b31142 100644 --- a/docs/libnm/version.xml +++ b/docs/libnm/version.xml @@ -1 +1 @@ -1.10.2 +1.10.4 diff --git a/gtk-doc.make b/gtk-doc.make index e5777b6e..f87eaab9 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -1,4 +1,22 @@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . #################################### # Everything below here is generic # @@ -152,6 +170,9 @@ sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HF sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo ""; \ diff --git a/libnm-core/nm-core-internal.h b/libnm-core/nm-core-internal.h index 5a27d438..15e5dc2a 100644 --- a/libnm-core/nm-core-internal.h +++ b/libnm-core/nm-core-internal.h @@ -241,7 +241,13 @@ GPtrArray *_nm_utils_copy_object_array (const GPtrArray *array); gssize _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpointer needle); -gssize _nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data); +gssize _nm_utils_ptrarray_find_binary_search (gconstpointer *list, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data, + gssize *out_idx_first, + gssize *out_idx_last); gssize _nm_utils_array_find_binary_search (gconstpointer list, gsize elem_size, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data); GSList * _nm_utils_strv_to_slist (char **strv, gboolean deep_copy); diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 98c94154..33e4850c 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -551,6 +551,8 @@ typedef enum { * @NM_DEVICE_STATE_REASON_PARENT_CHANGED: the device's parent changed * @NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED: the device parent's management changed * @NM_DEVICE_STATE_REASON_OVSDB_FAILED: problem communicating with OpenVSwitch database + * @NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE: a duplicate IP address was detected + * @NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED: The selected IP method is not supported * * Device state change reason codes */ @@ -619,6 +621,8 @@ typedef enum { NM_DEVICE_STATE_REASON_PARENT_CHANGED = 61, NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED = 62, NM_DEVICE_STATE_REASON_OVSDB_FAILED = 63, + NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE = 64, + NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED = 65, } NMDeviceStateReason; /** diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml index bc0c023b..b8c5d84f 100644 --- a/libnm-core/nm-dbus-types.xml +++ b/libnm-core/nm-dbus-types.xml @@ -1122,6 +1122,16 @@ = 63 problem communicating with OpenVSwitch database + + NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE + = 64 + a duplicate IP address was detected + + + NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED + = 65 + The selected IP method is not supported + diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c new file mode 100644 index 00000000..f9042b1f --- /dev/null +++ b/libnm-core/nm-json.c @@ -0,0 +1,118 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2017, 2018 Red Hat, Inc. + */ + +#include "nm-default.h" + +#define NM_JANSSON_C +#include "nm-json.h" + +#include + +void *_nm_jansson_json_object_iter_value; +void *_nm_jansson_json_object_key_to_iter; +void *_nm_jansson_json_integer; +void *_nm_jansson_json_object_del; +void *_nm_jansson_json_array_get; +void *_nm_jansson_json_array_size; +void *_nm_jansson_json_array_append_new; +void *_nm_jansson_json_string; +void *_nm_jansson_json_object_iter_next; +void *_nm_jansson_json_loads; +void *_nm_jansson_json_dumps; +void *_nm_jansson_json_object_iter_key; +void *_nm_jansson_json_object; +void *_nm_jansson_json_object_get; +void *_nm_jansson_json_array; +void *_nm_jansson_json_false; +void *_nm_jansson_json_delete; +void *_nm_jansson_json_true; +void *_nm_jansson_json_object_size; +void *_nm_jansson_json_object_set_new; +void *_nm_jansson_json_object_iter; +void *_nm_jansson_json_object_iter_at; +void *_nm_jansson_json_integer_value; +void *_nm_jansson_json_string_value; + +#define TRY_BIND_SYMBOL(symbol) \ + G_STMT_START { \ + void *sym = dlsym (handle, #symbol); \ + if (_nm_jansson_ ## symbol && sym != _nm_jansson_ ## symbol) \ + return FALSE; \ + _nm_jansson_ ## symbol = sym; \ + } G_STMT_END + +static gboolean +bind_symbols (void *handle) +{ + TRY_BIND_SYMBOL (json_object_iter_value); + TRY_BIND_SYMBOL (json_object_key_to_iter); + TRY_BIND_SYMBOL (json_integer); + TRY_BIND_SYMBOL (json_object_del); + TRY_BIND_SYMBOL (json_array_get); + TRY_BIND_SYMBOL (json_array_size); + TRY_BIND_SYMBOL (json_array_append_new); + TRY_BIND_SYMBOL (json_string); + TRY_BIND_SYMBOL (json_object_iter_next); + TRY_BIND_SYMBOL (json_loads); + TRY_BIND_SYMBOL (json_dumps); + TRY_BIND_SYMBOL (json_object_iter_key); + TRY_BIND_SYMBOL (json_object); + TRY_BIND_SYMBOL (json_object_get); + TRY_BIND_SYMBOL (json_array); + TRY_BIND_SYMBOL (json_false); + TRY_BIND_SYMBOL (json_delete); + TRY_BIND_SYMBOL (json_true); + TRY_BIND_SYMBOL (json_object_size); + TRY_BIND_SYMBOL (json_object_set_new); + TRY_BIND_SYMBOL (json_object_iter); + TRY_BIND_SYMBOL (json_object_iter_at); + TRY_BIND_SYMBOL (json_integer_value); + TRY_BIND_SYMBOL (json_string_value); + + return TRUE; +} + +gboolean +nm_jansson_load (void) +{ + static enum { + UNKNOWN, + AVAILABLE, + MISSING, + } state = UNKNOWN; + void *handle; + + if (G_LIKELY (state != UNKNOWN)) + goto out; + + /* First just resolve the symbols to see if there's a conflict already. */ + if (!bind_symbols (RTLD_DEFAULT)) + goto out; + + handle = dlopen (JANSSON_SONAME, RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE | RTLD_DEEPBIND); + if (!handle) + goto out; + + /* Now do the actual binding. */ + if (!bind_symbols (handle)) + goto out; + + state = AVAILABLE; +out: + return state == AVAILABLE; +} diff --git a/libnm-core/nm-json.h b/libnm-core/nm-json.h new file mode 100644 index 00000000..513b8d36 --- /dev/null +++ b/libnm-core/nm-json.h @@ -0,0 +1,50 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Copyright 2017, 2018 Red Hat, Inc. + */ +#ifndef __NM_JSON_H__ +#define __NM_JSON_H__ + +gboolean nm_jansson_load (void); + +#ifndef NM_JANSSON_C +#define json_object_iter_value (*_nm_jansson_json_object_iter_value) +#define json_object_key_to_iter (*_nm_jansson_json_object_key_to_iter) +#define json_integer (*_nm_jansson_json_integer) +#define json_object_del (*_nm_jansson_json_object_del) +#define json_array_get (*_nm_jansson_json_array_get) +#define json_array_size (*_nm_jansson_json_array_size) +#define json_array_append_new (*_nm_jansson_json_array_append_new) +#define json_string (*_nm_jansson_json_string) +#define json_object_iter_next (*_nm_jansson_json_object_iter_next) +#define json_loads (*_nm_jansson_json_loads) +#define json_dumps (*_nm_jansson_json_dumps) +#define json_object_iter_key (*_nm_jansson_json_object_iter_key) +#define json_object (*_nm_jansson_json_object) +#define json_object_get (*_nm_jansson_json_object_get) +#define json_array (*_nm_jansson_json_array) +#define json_false (*_nm_jansson_json_false) +#define json_delete (*_nm_jansson_json_delete) +#define json_true (*_nm_jansson_json_true) +#define json_object_size (*_nm_jansson_json_object_size) +#define json_object_set_new (*_nm_jansson_json_object_set_new) +#define json_object_iter (*_nm_jansson_json_object_iter) +#define json_object_iter_at (*_nm_jansson_json_object_iter_at) +#define json_integer_value (*_nm_jansson_json_integer_value) +#define json_string_value (*_nm_jansson_json_string_value) +#endif + +#endif /* __NM_JSON_H__ */ diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 26e7f505..d9c0cbb1 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -191,7 +191,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) return FALSE; } - if (priv->dhcp_client_id && !strlen (priv->dhcp_client_id)) { + if (priv->dhcp_client_id && !priv->dhcp_client_id[0]) { g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, diff --git a/libnm-core/nm-setting-tc-config.h b/libnm-core/nm-setting-tc-config.h index 736d5ad1..8117d5ea 100644 --- a/libnm-core/nm-setting-tc-config.h +++ b/libnm-core/nm-setting-tc-config.h @@ -28,7 +28,6 @@ G_BEGIN_DECLS -NM_AVAILABLE_IN_1_10_2 typedef struct NMTCQdisc NMTCQdisc; NM_AVAILABLE_IN_1_10_2 @@ -61,7 +60,6 @@ void nm_tc_qdisc_set_handle (NMTCQdisc *qdisc, NM_AVAILABLE_IN_1_10_2 guint32 nm_tc_qdisc_get_parent (NMTCQdisc *qdisc); -NM_AVAILABLE_IN_1_10_2 typedef struct NMTCAction NMTCAction; NM_AVAILABLE_IN_1_10_2 @@ -96,7 +94,6 @@ void nm_tc_action_set_attribute (NMTCAction *action, const char *name, GVariant *value); -NM_AVAILABLE_IN_1_10_2 typedef struct NMTCTfilter NMTCTfilter; NM_AVAILABLE_IN_1_10_2 diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index d3688278..60bdf5f6 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -249,7 +249,7 @@ nm_team_link_watcher_new_arp_ping (gint init_wait, return NULL; } - if (strpbrk (target_host, " \\/\t=\"\'")) { + if (strpbrk (source_host, " \\/\t=\"\'")) { g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, _("source-host '%s' contains invalid characters"), source_host); return NULL; @@ -1485,8 +1485,10 @@ set_property (GObject *object, guint prop_id, break; } - if (align_config) + if (align_config) { _nm_utils_json_append_gvalue (&priv->config, _prop_to_keys[prop_id], align_value); + _align_team_properties (setting); + } } static void @@ -1654,6 +1656,10 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) * Corresponds to the teamd runner.name. * Permitted values are: "roundrobin", "broadcast", "activebackup", * "loadbalance", "lacp". + * When setting the runner, all the properties specific to the runner + * will be reset to the default value; all the properties specific to + * other runners will be set to an empty value (or if not possible to + * a default value). * * Since: 1.10.2 **/ diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h index 45207836..d423901f 100644 --- a/libnm-core/nm-setting-team.h +++ b/libnm-core/nm-setting-team.h @@ -150,7 +150,7 @@ NMTeamLinkWatcherArpPingFlags nm_team_link_watcher_get_flags (NMTeamLinkWatcher #define NM_SETTING_TEAM_RUNNER_DEFAULT NM_SETTING_TEAM_RUNNER_ROUNDROBIN #define NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_SAME_ALL #define NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT 50 -#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 255 +#define NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT 65535 #define NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_LACP_PRIO diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index 6b42e0c7..34607252 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -614,17 +614,15 @@ need_secrets (NMSetting *setting) } static gboolean -compare_one_secret (NMSettingVpn *a, - NMSettingVpn *b, - NMSettingCompareFlags flags) +_compare_secrets (NMSettingVpn *a, + NMSettingVpn *b, + NMSettingCompareFlags flags) { - GHashTable *a_secrets, *b_secrets; + GHashTable *a_secrets; GHashTableIter iter; const char *key, *val; a_secrets = NM_SETTING_VPN_GET_PRIVATE (a)->secrets; - b_secrets = NM_SETTING_VPN_GET_PRIVATE (b)->secrets; - g_hash_table_iter_init (&iter, a_secrets); while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &val)) { NMSettingSecretFlags a_secret_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -653,6 +651,19 @@ compare_one_secret (NMSettingVpn *a, return TRUE; } +static gboolean +compare_one_secret (NMSettingVpn *a, + NMSettingVpn *b, + NMSettingCompareFlags flags) +{ + if (!_compare_secrets (a, b, flags)) + return FALSE; + if (!_compare_secrets (b, a, flags)) + return FALSE; + + return TRUE; +} + static gboolean compare_property (NMSetting *setting, NMSetting *other, diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 6cc92ec8..ebbbfd3a 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -36,6 +36,7 @@ #include #if WITH_JANSSON +#include "nm-json.h" #include #endif @@ -650,36 +651,82 @@ _nm_utils_ptrarray_find_first (gconstpointer *list, gssize len, gconstpointer ne } gssize -_nm_utils_ptrarray_find_binary_search (gconstpointer *list, gsize len, gconstpointer needle, GCompareDataFunc cmpfcn, gpointer user_data) -{ - gssize imin, imax, imid; +_nm_utils_ptrarray_find_binary_search (gconstpointer *list, + gsize len, + gconstpointer needle, + GCompareDataFunc cmpfcn, + gpointer user_data, + gssize *out_idx_first, + gssize *out_idx_last) +{ + gssize imin, imax, imid, i2min, i2max, i2mid; int cmp; g_return_val_if_fail (list || !len, ~((gssize) 0)); g_return_val_if_fail (cmpfcn, ~((gssize) 0)); imin = 0; - if (len == 0) - return ~imin; - - imax = len - 1; - - while (imin <= imax) { - imid = imin + (imax - imin) / 2; - - cmp = cmpfcn (list[imid], needle, user_data); - if (cmp == 0) - return imid; + if (len > 0) { + imax = len - 1; + + while (imin <= imax) { + imid = imin + (imax - imin) / 2; + + cmp = cmpfcn (list[imid], needle, user_data); + if (cmp == 0) { + /* we found a matching entry at index imid. + * + * Does the caller request the first/last index as well (in case that + * there are multiple entries which compare equal). */ + + if (out_idx_first) { + i2min = imin; + i2max = imid + 1; + while (i2min <= i2max) { + i2mid = i2min + (i2max - i2min) / 2; + + cmp = cmpfcn (list[i2mid], needle, user_data); + if (cmp == 0) + i2max = i2mid -1; + else { + nm_assert (cmp < 0); + i2min = i2mid + 1; + } + } + *out_idx_first = i2min; + } + if (out_idx_last) { + i2min = imid + 1; + i2max = imax; + while (i2min <= i2max) { + i2mid = i2min + (i2max - i2min) / 2; + + cmp = cmpfcn (list[i2mid], needle, user_data); + if (cmp == 0) + i2min = i2mid + 1; + else { + nm_assert (cmp > 0); + i2max = i2mid - 1; + } + } + *out_idx_last = i2min - 1; + } + return imid; + } - if (cmp < 0) - imin = imid + 1; - else - imax = imid - 1; + if (cmp < 0) + imin = imid + 1; + else + imax = imid - 1; + } } /* return the inverse of @imin. This is a negative number, but * also is ~imin the position where the value should be inserted. */ - return ~imin; + imin = ~imin; + NM_SET_OUT (out_idx_first, imin); + NM_SET_OUT (out_idx_last, imin); + return imin; } gssize @@ -4845,6 +4892,41 @@ const char **nm_utils_enum_get_values (GType type, gint from, gint to) /*****************************************************************************/ +static gboolean +_nm_utils_is_json_object_no_validation (const char *str, GError **error) +{ + if (str) { + /* libjansson also requires only utf-8 encoding. */ + if (!g_utf8_validate (str, -1, NULL)) { + g_set_error_literal (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("not valid utf-8")); + return FALSE; + } + while (g_ascii_isspace (str[0])) + str++; + } + + /* do some very basic validation to see if this might be a JSON object. */ + if (str[0] == '{') { + gsize l; + + l = strlen (str) - 1; + while (l > 0 && g_ascii_isspace (str[l])) + l--; + + if (str[l] == '}') + return TRUE; + } + + g_set_error_literal (error, + NM_CONNECTION_ERROR, + NM_CONNECTION_ERROR_INVALID_PROPERTY, + _("is not a JSON object")); + return FALSE; +} + #if WITH_JANSSON /* Added in Jansson v2.3 (released Jan 27 2012) */ @@ -5151,9 +5233,9 @@ _json_team_normalize_defaults (json_t *json, gboolean reset) _json_delete_object_on_string_match (json, "runner", "hwaddr_policy", NULL, NM_SETTING_TEAM_RUNNER_HWADDR_POLICY_DEFAULT); } else if (nm_streq (runner, NM_SETTING_TEAM_RUNNER_LACP)) { - runner_tx_balancer_interval = 50; + runner_tx_balancer_interval = NM_SETTING_TEAM_RUNNER_TX_BALANCER_INTERVAL_DEFAULT; runner_active = TRUE; - runner_sys_prio = 255; + runner_sys_prio = NM_SETTING_TEAM_RUNNER_SYS_PRIO_DEFAULT; runner_min_ports = 0; _json_delete_object_on_string_match (json, "runner", "agg_select_policy", NULL, NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY_DEFAULT); @@ -5185,13 +5267,16 @@ _nm_utils_team_link_watcher_from_json (json_t *json_element) g_return_val_if_fail (json_element, NULL); json_object_foreach (json_element, j_key, j_val) { - if (nm_streq (j_key, "name")) + if (nm_streq (j_key, "name")) { + g_free (name); name = strdup (json_string_value (j_val)); - else if (nm_streq (j_key, "target_host")) + } else if (nm_streq (j_key, "target_host")) { + g_free (target_host); target_host = strdup (json_string_value (j_val)); - else if (nm_streq (j_key, "source_host")) + } else if (nm_streq (j_key, "source_host")) { + g_free (source_host); source_host = strdup (json_string_value (j_val)); - else if (NM_IN_STRSET (j_key, "delay_up", "init_wait")) + } else if (NM_IN_STRSET (j_key, "delay_up", "init_wait")) val1 = json_integer_value (j_val); else if (NM_IN_STRSET (j_key, "delay_down", "interval")) val2 = json_integer_value (j_val); @@ -5314,6 +5399,9 @@ nm_utils_is_json_object (const char *str, GError **error) return FALSE; } + if (!nm_jansson_load ()) + return _nm_utils_is_json_object_no_validation (str, error); + json = json_loads (str, JSON_REJECT_DUPLICATES, &jerror); if (!json) { g_set_error (error, @@ -5364,6 +5452,8 @@ _nm_utils_team_config_equal (const char *conf1, if (nm_streq0 (conf1, conf2)) return TRUE; + else if (!nm_jansson_load ()) + return FALSE; /* A NULL configuration is equivalent to default value '{}' */ json1 = json_loads (conf1 ?: "{}", JSON_REJECT_DUPLICATES, &jerror); @@ -5421,6 +5511,9 @@ _nm_utils_team_config_get (const char *conf, if (!key) return NULL; + if (!nm_jansson_load ()) + return NULL; + json = json_loads (conf ?: "{}", JSON_REJECT_DUPLICATES, &jerror); /* Invalid json in conf */ @@ -5528,6 +5621,9 @@ _nm_utils_team_config_set (char **conf, g_return_val_if_fail (key, FALSE); + if (!nm_jansson_load ()) + return FALSE; + json = json_loads (*conf?: "{}", JSON_REJECT_DUPLICATES, &jerror); if (!json) return FALSE; @@ -5645,19 +5741,6 @@ nm_utils_is_json_object (const char *str, GError **error) { g_return_val_if_fail (!error || !*error, FALSE); - if (str) { - /* libjansson also requires only utf-8 encoding. */ - if (!g_utf8_validate (str, -1, NULL)) { - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("not valid utf-8")); - return FALSE; - } - while (g_ascii_isspace (str[0])) - str++; - } - if (!str || !str[0]) { g_set_error_literal (error, NM_CONNECTION_ERROR, @@ -5666,23 +5749,7 @@ nm_utils_is_json_object (const char *str, GError **error) return FALSE; } - /* do some very basic validation to see if this might be a JSON object. */ - if (str[0] == '{') { - gsize l; - - l = strlen (str) - 1; - while (l > 0 && g_ascii_isspace (str[l])) - l--; - - if (str[l] == '}') - return TRUE; - } - - g_set_error_literal (error, - NM_CONNECTION_ERROR, - NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("is not a JSON object")); - return FALSE; + return _nm_utils_is_json_object_no_validation (str, error); } gboolean diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index d743fd22..520ed581 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -6139,7 +6139,7 @@ static void _test_find_binary_search_do (const int *array, gsize len) { gsize i; - gssize idx; + gssize idx, idx_first, idx_last; gs_free gconstpointer *parray = g_new (gconstpointer, len); const int NEEDLE = 0; gconstpointer pneedle = GINT_TO_POINTER (NEEDLE); @@ -6150,10 +6150,10 @@ _test_find_binary_search_do (const int *array, gsize len) expected_result = _nm_utils_ptrarray_find_first (parray, len, pneedle); - idx = _nm_utils_ptrarray_find_binary_search (parray, len, pneedle, _test_find_binary_search_cmp, NULL); - if (expected_result >= 0) + idx = _nm_utils_ptrarray_find_binary_search (parray, len, pneedle, _test_find_binary_search_cmp, NULL, &idx_first, &idx_last); + if (expected_result >= 0) { g_assert_cmpint (expected_result, ==, idx); - else { + } else { gssize idx2 = ~idx; g_assert_cmpint (idx, <, 0); @@ -6162,6 +6162,8 @@ _test_find_binary_search_do (const int *array, gsize len) g_assert (idx2 - 1 < 0 || _test_find_binary_search_cmp (parray[idx2 - 1], pneedle, NULL) < 0); g_assert (idx2 >= len || _test_find_binary_search_cmp (parray[idx2], pneedle, NULL) > 0); } + g_assert_cmpint (idx, ==, idx_first); + g_assert_cmpint (idx, ==, idx_last); for (i = 0; i < len; i++) { int cmp; @@ -6262,6 +6264,94 @@ test_nm_utils_ptrarray_find_binary_search (void) test_find_binary_search_do (-3, -2, -1, 1, 2, 3, 4); } +/*****************************************************************************/ + +#define BIN_SEARCH_W_DUPS_LEN 100 +#define BIN_SEARCH_W_DUPS_JITTER 10 + +static int +_test_bin_search2_cmp (gconstpointer pa, + gconstpointer pb, + gpointer user_data) +{ + int a = GPOINTER_TO_INT (pa); + int b = GPOINTER_TO_INT (pb); + + g_assert (a >= 0 && a <= BIN_SEARCH_W_DUPS_LEN + BIN_SEARCH_W_DUPS_JITTER); + g_assert (b >= 0 && b <= BIN_SEARCH_W_DUPS_LEN + BIN_SEARCH_W_DUPS_JITTER); + NM_CMP_DIRECT (a, b); + return 0; +} + +static int +_test_bin_search2_cmp_p (gconstpointer pa, + gconstpointer pb, + gpointer user_data) +{ + return _test_bin_search2_cmp (*((gpointer *) pa), *((gpointer *) pb), NULL); +} + +static void +test_nm_utils_ptrarray_find_binary_search_with_duplicates (void) +{ + gssize idx, idx2, idx_first2, idx_first, idx_last; + int i_test, i_len, i; + gssize j; + gconstpointer arr[BIN_SEARCH_W_DUPS_LEN]; + const int N_TEST = 10; + + for (i_test = 0; i_test < N_TEST; i_test++) { + for (i_len = 0; i_len < BIN_SEARCH_W_DUPS_LEN; i_len++) { + + /* fill with random numbers... surely there are some duplicates + * there... or maybe even there are none... */ + for (i = 0; i < i_len; i++) + arr[i] = GINT_TO_POINTER (nmtst_get_rand_int () % (i_len + BIN_SEARCH_W_DUPS_JITTER)); + g_qsort_with_data (arr, + i_len, + sizeof (gpointer), + _test_bin_search2_cmp_p, + NULL); + for (i = 0; i < i_len + BIN_SEARCH_W_DUPS_JITTER; i++) { + gconstpointer p = GINT_TO_POINTER (i); + + idx = _nm_utils_ptrarray_find_binary_search (arr, i_len, p, _test_bin_search2_cmp, NULL, &idx_first, &idx_last); + + idx_first2 = _nm_utils_ptrarray_find_first (arr, i_len, p); + + idx2 = _nm_utils_array_find_binary_search (arr, sizeof (gpointer), i_len, &p, _test_bin_search2_cmp_p, NULL); + g_assert_cmpint (idx, ==, idx2); + + if (idx_first2 < 0) { + g_assert_cmpint (idx, <, 0); + g_assert_cmpint (idx, ==, idx_first); + g_assert_cmpint (idx, ==, idx_last); + idx = ~idx; + g_assert_cmpint (idx, >=, 0); + g_assert_cmpint (idx, <=, i_len); + if (i_len == 0) + g_assert_cmpint (idx, ==, 0); + else { + g_assert (idx == i_len || GPOINTER_TO_INT (arr[idx]) > i); + g_assert (idx == 0 || GPOINTER_TO_INT (arr[idx - 1]) < i); + } + } else { + g_assert_cmpint (idx_first, ==, idx_first2); + g_assert_cmpint (idx_first, >=, 0); + g_assert_cmpint (idx_last, <, i_len); + g_assert_cmpint (idx_first, <=, idx_last); + g_assert_cmpint (idx, >=, idx_first); + g_assert_cmpint (idx, <=, idx_last); + for (j = idx_first; j < idx_last; j++) + g_assert (GPOINTER_TO_INT (arr[j]) == i); + g_assert (idx_first == 0 || GPOINTER_TO_INT (arr[idx_first - 1]) < i); + g_assert (idx_last == i_len - 1 || GPOINTER_TO_INT (arr[idx_last + 1]) > i); + } + } + } + } +} + /*****************************************************************************/ static void test_nm_utils_enum_from_str_do (GType type, const char *str, @@ -6952,6 +7042,7 @@ int main (int argc, char **argv) g_test_add_func ("/core/general/_glib_compat_g_ptr_array_insert", test_g_ptr_array_insert); g_test_add_func ("/core/general/_glib_compat_g_hash_table_get_keys_as_array", test_g_hash_table_get_keys_as_array); g_test_add_func ("/core/general/_nm_utils_ptrarray_find_binary_search", test_nm_utils_ptrarray_find_binary_search); + g_test_add_func ("/core/general/_nm_utils_ptrarray_find_binary_search_with_duplicates", test_nm_utils_ptrarray_find_binary_search_with_duplicates); g_test_add_func ("/core/general/_nm_utils_strstrdictkey", test_nm_utils_strstrdictkey); g_test_add_func ("/core/general/nm_ptrarray_len", test_nm_ptrarray_len); diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index f0d7ecf5..e47fe394 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -616,17 +616,15 @@ need_secrets (NMSetting *setting) } static gboolean -compare_one_secret (NMSettingVPN *a, - NMSettingVPN *b, - NMSettingCompareFlags flags) +_compare_secrets (NMSettingVPN *a, + NMSettingVPN *b, + NMSettingCompareFlags flags) { - GHashTable *a_secrets, *b_secrets; + GHashTable *a_secrets; GHashTableIter iter; const char *key, *val; a_secrets = NM_SETTING_VPN_GET_PRIVATE (a)->secrets; - b_secrets = NM_SETTING_VPN_GET_PRIVATE (b)->secrets; - g_hash_table_iter_init (&iter, a_secrets); while (g_hash_table_iter_next (&iter, (gpointer) &key, (gpointer) &val)) { NMSettingSecretFlags a_secret_flags = NM_SETTING_SECRET_FLAG_NONE; @@ -655,6 +653,19 @@ compare_one_secret (NMSettingVPN *a, return TRUE; } +static gboolean +compare_one_secret (NMSettingVPN *a, + NMSettingVPN *b, + NMSettingCompareFlags flags) +{ + if (!_compare_secrets (a, b, flags)) + return FALSE; + if (!_compare_secrets (b, a, flags)) + return FALSE; + + return TRUE; +} + static gboolean compare_property (NMSetting *setting, NMSetting *other, diff --git a/libnm/nm-client.c b/libnm/nm-client.c index 8f9c50e9..c5a6f1cf 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -1408,7 +1408,7 @@ nm_client_get_connection_by_id (NMClient *client, const char *id) g_return_val_if_fail (id != NULL, NULL); if (!nm_client_get_nm_running (client)) - NULL; + return NULL; return nm_remote_settings_get_connection_by_id (NM_CLIENT_GET_PRIVATE (client)->settings, id); } @@ -1433,7 +1433,7 @@ nm_client_get_connection_by_path (NMClient *client, const char *path) g_return_val_if_fail (path != NULL, NULL); if (!nm_client_get_nm_running (client)) - NULL; + return NULL; return nm_remote_settings_get_connection_by_path (NM_CLIENT_GET_PRIVATE (client)->settings, path); } @@ -1458,7 +1458,7 @@ nm_client_get_connection_by_uuid (NMClient *client, const char *uuid) g_return_val_if_fail (uuid != NULL, NULL); if (!nm_client_get_nm_running (client)) - NULL; + return NULL; return nm_remote_settings_get_connection_by_uuid (NM_CLIENT_GET_PRIVATE (client)->settings, uuid); } diff --git a/libnm/nm-property-docs.xml b/libnm/nm-property-docs.xml index f05ba17b..6c6491a0 100644 --- a/libnm/nm-property-docs.xml +++ b/libnm/nm-property-docs.xml @@ -333,7 +333,7 @@ - + diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c index 76e4238d..c9dbb4ff 100644 --- a/libnm/nm-secret-agent-old.c +++ b/libnm/nm-secret-agent-old.c @@ -1118,7 +1118,7 @@ init_async_got_proxy (GObject *object, GAsyncResult *result, gpointer user_data) if (priv->auto_register) { nm_secret_agent_old_register_async (init_data->self, init_data->cancellable, - init_async_registered, init_data); + init_async_registered, init_data); } else init_async_complete (init_data, NULL); } @@ -1139,7 +1139,7 @@ init_async_got_bus (GObject *initable, GAsyncResult *result, gpointer user_data) nmdbus_agent_manager_proxy_new (priv->bus, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START, - NM_DBUS_INTERFACE_AGENT_MANAGER, + NM_DBUS_SERVICE, NM_DBUS_PATH_AGENT_MANAGER, init_data->cancellable, init_async_got_proxy, init_data); diff --git a/libnm/nm-settings-docs.xml b/libnm/nm-settings-docs.xml index 8711ad27..57553f8b 100644 --- a/libnm/nm-settings-docs.xml +++ b/libnm/nm-settings-docs.xml @@ -340,7 +340,7 @@ - + diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c index 31e12954..0a785396 100644 --- a/libnm/nm-vpn-service-plugin.c +++ b/libnm/nm-vpn-service-plugin.c @@ -996,11 +996,6 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) goto out; priv->dbus_vpn_service_plugin = nmdbus_vpn_plugin_skeleton_new (); - if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin), - connection, - NM_VPN_DBUS_PLUGIN_PATH, - error)) - goto out; _nm_dbus_bind_properties (plugin, priv->dbus_vpn_service_plugin); _nm_dbus_bind_methods (plugin, priv->dbus_vpn_service_plugin, @@ -1015,6 +1010,12 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) "SetFailure", impl_vpn_service_plugin_set_failure, NULL); + if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin), + connection, + NM_VPN_DBUS_PLUGIN_PATH, + error)) + goto out; + nm_vpn_service_plugin_set_connection (plugin, connection); nm_vpn_service_plugin_set_state (plugin, NM_VPN_SERVICE_STATE_INIT); @@ -1109,6 +1110,11 @@ dispose (GObject *object) g_error_free (err); } + if (priv->dbus_vpn_service_plugin) { + g_dbus_interface_skeleton_unexport (G_DBUS_INTERFACE_SKELETON (priv->dbus_vpn_service_plugin)); + g_clear_object (&priv->dbus_vpn_service_plugin); + } + G_OBJECT_CLASS (nm_vpn_service_plugin_parent_class)->dispose (object); } diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 36755432..2d12f01f 100644 --- a/m4/gtk-doc.m4 +++ b/m4/gtk-doc.m4 @@ -1,4 +1,29 @@ -dnl -*- mode: autoconf -*- +# -*- mode: autoconf -*- +# +# gtk-doc.m4 - configure macro to check for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2007-2017 Stefan Sauer +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# As a special exception, the above copyright owner gives unlimited +# permission to copy, distribute and modify the configure scripts that +# are the output of Autoconf when processing the Macro. You need not +# follow the terms of the GNU General Public License when using or +# distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. # serial 2 diff --git a/man/NetworkManager.8 b/man/NetworkManager.8 index a2238ee9..b0a29589 100644 --- a/man/NetworkManager.8 +++ b/man/NetworkManager.8 @@ -2,12 +2,12 @@ .\" Title: NetworkManager .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Network management daemons -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.10\&.2" "Network management daemons" +.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.10\&.4" "Network management daemons" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5 index aa31c809..16c17964 100644 --- a/man/NetworkManager.conf.5 +++ b/man/NetworkManager.conf.5 @@ -2,12 +2,12 @@ .\" Title: NetworkManager.conf .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-online.1 b/man/nm-online.1 index c185d50b..7719ab4b 100644 --- a/man/nm-online.1 +++ b/man/nm-online.1 @@ -2,12 +2,12 @@ .\" Title: nm-online .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" +.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.10\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7 index d1cc7551..e7086b91 100644 --- a/man/nm-openvswitch.7 +++ b/man/nm-openvswitch.7 @@ -2,12 +2,12 @@ .\" Title: nm-openvswitch .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: OpenVSwitch support overview -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.10\&.2" "OpenVSwitch support overview" +.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.10\&.4" "OpenVSwitch support overview" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -129,11 +129,11 @@ of the link (e\&.g\&. "wired", "bond", "dummy", etc\&.)\&. Other interfaces ("in .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-bridge conn\&.interface bridge0\fR +$ \fBnmcli conn add type ovs\-bridge conn\&.interface bridge0\fR Connection \*(Aqovs\-bridge\-bridge0\*(Aq (d10fc64d\-1d48\-4394\-a1b8\-e1aea72f27d5) successfully added\&. -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface port0 conn\&.master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port0 conn\&.master bridge0\fR Connection \*(Aqovs\-port\-port0\*(Aq (5ae22bae\-bba4\-4815\-9ade\-7e635633e1f0) successfully added\&. -$ \fBnmcli conn add conn\&.type ovs\-interface conn\&.interface iface0 conn\&.master port0 \e +$ \fBnmcli conn add type ovs\-interface conn\&.interface iface0 conn\&.master port0 \e ipv4\&.method manual ipv4\&.address 192\&.0\&.2\&.1/24\fR Connection \*(Aqovs\-interface\-iface0\*(Aq (3640d2a1\-a2fd\-4718\-92f1\-cffadb5b6cdc) successfully added\&. .fi @@ -150,9 +150,9 @@ As said above, you need to create a Port even for a single interface\&. Also, be .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface port1 conn\&.master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port1 conn\&.master bridge0\fR Connection \*(Aqovs\-port\-port1\*(Aq (67d041eb\-8e7b\-4458\-afee\-a1d07c9c4552) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth0 conn\&.master port1\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth0 conn\&.master port1\fR Connection \*(Aqovs\-slave\-eth0\*(Aq (d459c45c\-cf78\-4c1c\-b4b7\-505e71379624) successfully added\&. .fi .if n \{\ @@ -167,9 +167,9 @@ Again, you need a port\&. .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface port2 conn\&.master bridge0 ovs\-port\&.tag 120\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface port2 conn\&.master bridge0 ovs\-port\&.tag 120\fR Connection \*(Aqovs\-port\-port2\*(Aq (3994c093\-4ef7\-4549\-a4fd\-627b831c3cb8) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth1 conn\&.master port2\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth1 conn\&.master port2\fR Connection \*(Aqovs\-slave\-eth1\*(Aq (099be06e\-71ad\-484d\-8d5a\-fcadc5f207f5) successfully added\&. .fi .if n \{\ @@ -184,11 +184,11 @@ It\*(Aqs just a port with a tag\&. .RS 4 .\} .nf -$ \fBnmcli conn add conn\&.type ovs\-port conn\&.interface bond0 conn\&.master bridge0\fR +$ \fBnmcli conn add type ovs\-port conn\&.interface bond0 conn\&.master bridge0\fR Connection \*(Aqovs\-port\-bond0\*(Aq (d154ebf9\-e999\-4e1b\-a084\-a3de53d25d8a) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth2 conn\&.master bond0\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth2 conn\&.master bond0\fR Connection \*(Aqovs\-slave\-eth2\*(Aq (475ac1bf\-30b2\-4534\-a877\-27f33f58b082) successfully added\&. -$ \fBnmcli conn add conn\&.type ethernet conn\&.interface eth3 conn\&.master bond0\fR +$ \fBnmcli conn add type ethernet conn\&.interface eth3 conn\&.master bond0\fR Connection \*(Aqovs\-slave\-eth3\*(Aq (8dedeecb\-ed12\-482b\-b77a\-24a4fb835136) successfully added\&. .fi .if n \{\ diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 5573046c..c71e2008 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -130,11 +130,11 @@ Examples Creating a Bridge with a single internal Interface -$ nmcli conn add conn.type ovs-bridge conn.interface bridge0 +$ nmcli conn add type ovs-bridge conn.interface bridge0 Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added. -$ nmcli conn add conn.type ovs-port conn.interface port0 conn.master bridge0 +$ nmcli conn add type ovs-port conn.interface port0 conn.master bridge0 Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added. -$ nmcli conn add conn.type ovs-interface conn.interface iface0 conn.master port0 \ +$ nmcli conn add type ovs-interface conn.interface iface0 conn.master port0 \ ipv4.method manual ipv4.address 192.0.2.1/24 Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added. @@ -145,29 +145,29 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success Adding a Linux interface to a Bridge -$ nmcli conn add conn.type ovs-port conn.interface port1 conn.master bridge0 +$ nmcli conn add type ovs-port conn.interface port1 conn.master bridge0 Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth0 conn.master port1 +$ nmcli conn add type ethernet conn.interface eth0 conn.master port1 Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added. Again, you need a port. Creating a VLAN -$ nmcli conn add conn.type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120 +$ nmcli conn add type ovs-port conn.interface port2 conn.master bridge0 ovs-port.tag 120 Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth1 conn.master port2 +$ nmcli conn add type ethernet conn.interface eth1 conn.master port2 Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added. It's just a port with a tag. Creating a Bond -$ nmcli conn add conn.type ovs-port conn.interface bond0 conn.master bridge0 +$ nmcli conn add type ovs-port conn.interface bond0 conn.master bridge0 Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth2 conn.master bond0 +$ nmcli conn add type ethernet conn.interface eth2 conn.master bond0 Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added. -$ nmcli conn add conn.type ethernet conn.interface eth3 conn.master bond0 +$ nmcli conn add type ethernet conn.interface eth3 conn.master bond0 Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added. It's just a Port with multiple interfaces. See nm-settings manual for diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5 index 8ac7d7eb..5237910f 100644 --- a/man/nm-settings-ifcfg-rh.5 +++ b/man/nm-settings-ifcfg-rh.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-ifcfg-rh .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-ifcfg-rh.xml b/man/nm-settings-ifcfg-rh.xml index 8799e550..7d7037e8 100644 --- a/man/nm-settings-ifcfg-rh.xml +++ b/man/nm-settings-ifcfg-rh.xml @@ -1,6 +1,6 @@ -nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.10.2nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription +nm-settings-ifcfg-rhNetworkManager developersnm-settings-ifcfg-rh5NetworkManagerConfiguration1.10.4nm-settings-ifcfg-rhDescription of ifcfg-rh settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5 index 253777c7..549c9af8 100644 --- a/man/nm-settings-keyfile.5 +++ b/man/nm-settings-keyfile.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings-keyfile .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nm-settings-keyfile.xml b/man/nm-settings-keyfile.xml index 98242d6d..7d539d57 100644 --- a/man/nm-settings-keyfile.xml +++ b/man/nm-settings-keyfile.xml @@ -1,6 +1,6 @@ -nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.10.2nm-settings-keyfileDescription of keyfile settings pluginDescription +nm-settings-keyfileNetworkManager developersnm-settings-keyfile5NetworkManagerConfiguration1.10.4nm-settings-keyfileDescription of keyfile settings pluginDescription NetworkManager is based on the concept of connection profiles that contain network configuration (see nm-settings5 for details). The profiles can be stored in various formats. NetworkManager uses plugins for reading and writing diff --git a/man/nm-settings.5 b/man/nm-settings.5 index e920294a..6ad3b7e0 100644 --- a/man/nm-settings.5 +++ b/man/nm-settings.5 @@ -2,12 +2,12 @@ .\" Title: nm-settings .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Configuration -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.10\&.2" "Configuration" +.TH "NM\-SETTINGS" "5" "" "NetworkManager 1\&.10\&.4" "Configuration" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -3395,7 +3395,7 @@ string T}:T{ "roundrobin" T}:T{ -Corresponds to the teamd runner\&.name\&. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp"\&. +Corresponds to the teamd runner\&.name\&. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp"\&. When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value)\&. T} T{ runner\-active diff --git a/man/nm-settings.xml b/man/nm-settings.xml index 4aaedaff..dea3e6b5 100644 --- a/man/nm-settings.xml +++ b/man/nm-settings.xml @@ -1,6 +1,6 @@ -nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.10.2nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription +nm-settingsNetworkManager developersnm-settings5NetworkManagerConfiguration1.10.4nm-settingsDescription of settings and properties of NetworkManager connection profilesDescription NetworkManager is based on a concept of connection profiles, sometimes referred to as connections only. These connection profiles contain a network configuration. When NetworkManager activates a connection profile on a network device the configuration will @@ -370,7 +370,7 @@ namestringteamThe setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example "ppp" or "wireless" or "wired". notify-peers-countint320Corresponds to the teamd notify_peers.count. notify-peers-intervalint320Corresponds to the teamd notify_peers.interval. - runnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". + runnerstring"roundrobin"Corresponds to the teamd runner.name. Permitted values are: "roundrobin", "broadcast", "activebackup", "loadbalance", "lacp". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value). runner-activebooleanFALSECorresponds to the teamd runner.active. runner-agg-select-policystringCorresponds to the teamd runner.agg_select_policy. runner-fast-ratebooleanFALSECorresponds to the teamd runner.fast_rate. diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7 index 65fb1af3..78698a7f 100644 --- a/man/nmcli-examples.7 +++ b/man/nmcli-examples.7 @@ -2,12 +2,12 @@ .\" Title: nmcli-examples .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: Examples -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.10\&.2" "Examples" +.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.10\&.4" "Examples" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmcli.1 b/man/nmcli.1 index b584d056..f585d1ab 100644 --- a/man/nmcli.1 +++ b/man/nmcli.1 @@ -2,12 +2,12 @@ .\" Title: nmcli .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NMCLI" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" +.TH "NMCLI" "1" "" "NetworkManager 1\&.10\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/man/nmtui.1 b/man/nmtui.1 index d3a84594..5db4fbe6 100644 --- a/man/nmtui.1 +++ b/man/nmtui.1 @@ -2,12 +2,12 @@ .\" Title: nmtui .\" Author: .\" Generator: DocBook XSL Stylesheets vsnapshot -.\" Date: 12/12/2017 +.\" Date: 02/05/2018 .\" Manual: General Commands Manual -.\" Source: NetworkManager 1.10.2 +.\" Source: NetworkManager 1.10.4 .\" Language: English .\" -.TH "NMTUI" "1" "" "NetworkManager 1\&.10\&.2" "General Commands Manual" +.TH "NMTUI" "1" "" "NetworkManager 1\&.10\&.4" "General Commands Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/po/de.po b/po/de.po index b198c2f9..cb4ff2fe 100644 --- a/po/de.po +++ b/po/de.po @@ -15,20 +15,21 @@ # Christian Kirbach , 2009-2014. # Benjamin Steinwender , 2014. # Hedda Peters , 2014. +# lrintel , 2017. #zanata msgid "" msgstr "" -"Project-Id-Version: NetworkManager HEAD\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-10 15:29+0100\n" -"PO-Revision-Date: 2017-09-14 00:26+0200\n" -"Last-Translator: Christian Kirbach \n" +"POT-Creation-Date: 2017-12-12 10:50+0100\n" +"PO-Revision-Date: 2017-11-07 06:49+0000\n" +"Last-Translator: Copied by Zanata \n" "Language-Team: Deutsch \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.7.1\n" +"X-Generator: Zanata 4.3.2\n" #: ../clients/cli/agent.c:40 #, c-format @@ -197,7 +198,7 @@ msgstr "Verbindung(en) (Name, UUID oder Pfad)" msgid "Connection(s) (name, UUID, path or apath)" msgstr "Verbindung(en) (Name, UUID oder a-Pfad)" -#: ../clients/cli/connections.c:196 +#: ../clients/cli/connections.c:197 #, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" @@ -274,7 +275,7 @@ msgstr "" " export [id | uuid | path] []\n" "\n" -#: ../clients/cli/connections.c:218 +#: ../clients/cli/connections.c:219 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" @@ -325,7 +326,7 @@ msgstr "" "Die globale Option »--show-secrets« zeigt zusätzlich zugehörige Passwörter " "an.\n" -#: ../clients/cli/connections.c:239 +#: ../clients/cli/connections.c:240 #, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" @@ -372,7 +373,7 @@ msgstr "" "passwd-file - Datei mit Passwörtern zum Aktivieren der Verbindung\n" "\n" -#: ../clients/cli/connections.c:260 +#: ../clients/cli/connections.c:261 #, c-format msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" @@ -395,7 +396,7 @@ msgstr "" "anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n" "\n" -#: ../clients/cli/connections.c:272 +#: ../clients/cli/connections.c:273 #, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" @@ -703,7 +704,7 @@ msgstr "" " [ip6 ] [gw6 ]\n" "\n" -#: ../clients/cli/connections.c:390 +#: ../clients/cli/connections.c:391 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -752,7 +753,7 @@ msgstr "" "nmcli con mod bond0 -bond.options downdelay\n" "\n" -#: ../clients/cli/connections.c:413 +#: ../clients/cli/connections.c:414 #, c-format msgid "" "Usage: nmcli connection clone { ARGUMENTS | help }\n" @@ -775,7 +776,7 @@ msgstr "" "und der id (wird als Parameter angegeben).\n" "\n" -#: ../clients/cli/connections.c:425 +#: ../clients/cli/connections.c:426 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -803,7 +804,7 @@ msgstr "" "Fügt ein neues Verbindungsprofil in einem interaktiven Editor hinzu.\n" "\n" -#: ../clients/cli/connections.c:440 +#: ../clients/cli/connections.c:441 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -822,7 +823,7 @@ msgstr "" "Das Profil wird anhand dessen Name, UUID oder D-Bus-Pfad identifiziert.\n" "\n" -#: ../clients/cli/connections.c:451 +#: ../clients/cli/connections.c:452 #, c-format msgid "" "Usage: nmcli connection monitor { ARGUMENTS | help }\n" @@ -844,7 +845,7 @@ msgstr "" "Es werden alle Verbindungsprofile überwacht, sofern keines angegeben wird.\n" "\n" -#: ../clients/cli/connections.c:463 +#: ../clients/cli/connections.c:464 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -857,7 +858,7 @@ msgstr "" "Lädt alle Verbindungsdateien neu von der Festplatte.\n" "\n" -#: ../clients/cli/connections.c:471 +#: ../clients/cli/connections.c:472 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -880,7 +881,7 @@ msgstr "" "um sicherzustellen, dass der NetworkManager die Änderungen übernimmt.\n" "\n" -#: ../clients/cli/connections.c:483 +#: ../clients/cli/connections.c:484 #, c-format msgid "" "Usage: nmcli connection import { ARGUMENTS | help }\n" @@ -906,7 +907,7 @@ msgstr "" "\n" "\n" -#: ../clients/cli/connections.c:496 +#: ../clients/cli/connections.c:497 #, c-format msgid "" "Usage: nmcli connection export { ARGUMENTS | help }\n" @@ -927,23 +928,23 @@ msgstr "" "sofern eine angegeben wird.\n" "\n" -#: ../clients/cli/connections.c:530 +#: ../clients/cli/connections.c:531 msgid "activating" msgstr "wird aktiviert" -#: ../clients/cli/connections.c:532 +#: ../clients/cli/connections.c:533 msgid "activated" msgstr "aktiviert" -#: ../clients/cli/connections.c:534 ../clients/common/nm-client-utils.c:243 +#: ../clients/cli/connections.c:535 ../clients/common/nm-client-utils.c:243 msgid "deactivating" msgstr "wird deaktiviert" -#: ../clients/cli/connections.c:536 +#: ../clients/cli/connections.c:537 msgid "deactivated" msgstr "deaktiviert" -#: ../clients/cli/connections.c:539 ../clients/cli/connections.c:562 +#: ../clients/cli/connections.c:540 ../clients/cli/connections.c:563 #: ../clients/cli/devices.c:1210 ../clients/cli/devices.c:1254 #: ../clients/cli/devices.c:1256 ../clients/cli/general.c:41 #: ../clients/cli/general.c:79 ../clients/cli/general.c:146 @@ -951,65 +952,65 @@ msgstr "deaktiviert" #: ../clients/common/nm-client-utils.c:250 #: ../clients/common/nm-client-utils.c:266 #: ../clients/common/nm-client-utils.c:269 -#: ../clients/common/nm-meta-setting-desc.c:1335 -#: ../clients/common/nm-meta-setting-desc.c:1403 -#: ../clients/common/nm-meta-setting-desc.c:2545 -#: ../clients/common/nm-meta-setting-desc.c:2599 +#: ../clients/common/nm-meta-setting-desc.c:1480 +#: ../clients/common/nm-meta-setting-desc.c:1548 +#: ../clients/common/nm-meta-setting-desc.c:2693 +#: ../clients/common/nm-meta-setting-desc.c:2747 msgid "unknown" msgstr "unbekannt" -#: ../clients/cli/connections.c:548 +#: ../clients/cli/connections.c:549 msgid "VPN connecting (prepare)" msgstr "VPN wird verbunden (wird vorbereitet)" -#: ../clients/cli/connections.c:550 +#: ../clients/cli/connections.c:551 msgid "VPN connecting (need authentication)" msgstr "VPN wird verbunden (Legitimierung wird benötigt)" -#: ../clients/cli/connections.c:552 +#: ../clients/cli/connections.c:553 msgid "VPN connecting" msgstr "VPN wird verbunden" -#: ../clients/cli/connections.c:554 +#: ../clients/cli/connections.c:555 msgid "VPN connecting (getting IP configuration)" msgstr "VPN wird verbunden (IP-Einstellungen werden ermittelt)" -#: ../clients/cli/connections.c:556 +#: ../clients/cli/connections.c:557 msgid "VPN connected" msgstr "VPN verbunden" -#: ../clients/cli/connections.c:558 +#: ../clients/cli/connections.c:559 msgid "VPN connection failed" msgstr "VPN-Verbindung gescheitert" -#: ../clients/cli/connections.c:560 +#: ../clients/cli/connections.c:561 msgid "VPN disconnected" msgstr "VPN getrennt" -#: ../clients/cli/connections.c:630 +#: ../clients/cli/connections.c:631 #, c-format msgid "Error updating secrets for %s: %s\n" msgstr "Fehler beim Aktualisieren der Geheimnisse für %s: %s\n" -#: ../clients/cli/connections.c:650 +#: ../clients/cli/connections.c:651 msgid "Connection profile details" msgstr "Details des Verbindungsprofils" -#: ../clients/cli/connections.c:663 ../clients/cli/connections.c:1113 +#: ../clients/cli/connections.c:664 ../clients/cli/connections.c:1114 #, c-format msgid "Error: 'connection show': %s" msgstr "Fehler: »connection show«: %s" -#: ../clients/cli/connections.c:881 +#: ../clients/cli/connections.c:882 msgid "never" msgstr "nie" #. "CAPABILITIES" -#: ../clients/cli/connections.c:882 ../clients/cli/connections.c:884 -#: ../clients/cli/connections.c:886 ../clients/cli/connections.c:919 -#: ../clients/cli/connections.c:986 ../clients/cli/connections.c:987 -#: ../clients/cli/connections.c:989 ../clients/cli/connections.c:4432 -#: ../clients/cli/connections.c:6370 ../clients/cli/connections.c:6371 +#: ../clients/cli/connections.c:883 ../clients/cli/connections.c:885 +#: ../clients/cli/connections.c:887 ../clients/cli/connections.c:920 +#: ../clients/cli/connections.c:987 ../clients/cli/connections.c:988 +#: ../clients/cli/connections.c:990 ../clients/cli/connections.c:4433 +#: ../clients/cli/connections.c:6371 ../clients/cli/connections.c:6372 #: ../clients/cli/devices.c:884 ../clients/cli/devices.c:1173 #: ../clients/cli/devices.c:1174 ../clients/cli/devices.c:1175 #: ../clients/cli/devices.c:1176 ../clients/cli/devices.c:1177 @@ -1020,16 +1021,16 @@ msgstr "nie" #: ../clients/cli/devices.c:1252 ../clients/cli/devices.c:1253 #: ../clients/cli/devices.c:1255 ../clients/cli/devices.c:1257 #: ../clients/cli/general.c:152 ../clients/common/nm-client-utils.c:258 -#: ../clients/common/nm-meta-setting-desc.c:575 -#: ../clients/common/nm-meta-setting-desc.c:2538 +#: ../clients/common/nm-meta-setting-desc.c:720 +#: ../clients/common/nm-meta-setting-desc.c:2686 msgid "yes" msgstr "ja" -#: ../clients/cli/connections.c:882 ../clients/cli/connections.c:884 -#: ../clients/cli/connections.c:886 ../clients/cli/connections.c:986 -#: ../clients/cli/connections.c:987 ../clients/cli/connections.c:989 -#: ../clients/cli/connections.c:4431 ../clients/cli/connections.c:6370 -#: ../clients/cli/connections.c:6371 ../clients/cli/devices.c:884 +#: ../clients/cli/connections.c:883 ../clients/cli/connections.c:885 +#: ../clients/cli/connections.c:887 ../clients/cli/connections.c:987 +#: ../clients/cli/connections.c:988 ../clients/cli/connections.c:990 +#: ../clients/cli/connections.c:4432 ../clients/cli/connections.c:6371 +#: ../clients/cli/connections.c:6372 ../clients/cli/devices.c:884 #: ../clients/cli/devices.c:1173 ../clients/cli/devices.c:1174 #: ../clients/cli/devices.c:1175 ../clients/cli/devices.c:1176 #: ../clients/cli/devices.c:1177 ../clients/cli/devices.c:1214 @@ -1040,65 +1041,65 @@ msgstr "ja" #: ../clients/cli/devices.c:1253 ../clients/cli/devices.c:1255 #: ../clients/cli/devices.c:1257 ../clients/cli/general.c:153 #: ../clients/common/nm-client-utils.c:260 -#: ../clients/common/nm-meta-setting-desc.c:575 -#: ../clients/common/nm-meta-setting-desc.c:2541 +#: ../clients/common/nm-meta-setting-desc.c:720 +#: ../clients/common/nm-meta-setting-desc.c:2689 msgid "no" msgstr "nein" -#: ../clients/cli/connections.c:1103 +#: ../clients/cli/connections.c:1104 msgid "Activate connection details" msgstr "Verbindungsdetails aktivieren" -#: ../clients/cli/connections.c:1350 +#: ../clients/cli/connections.c:1351 #, c-format msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "Ungültiges Feld »%s«; erlaubte Felder: %s und %s oder %s,%s" -#: ../clients/cli/connections.c:1365 ../clients/cli/connections.c:1373 +#: ../clients/cli/connections.c:1366 ../clients/cli/connections.c:1374 #, c-format msgid "'%s' has to be alone" msgstr "»%s« muss allein stehen" -#: ../clients/cli/connections.c:1573 +#: ../clients/cli/connections.c:1574 #, c-format msgid "incorrect string '%s' of '--order' option" msgstr "Falsche Zeichenkette »%s« der Option »--order«" -#: ../clients/cli/connections.c:1599 +#: ../clients/cli/connections.c:1600 #, c-format msgid "incorrect item '%s' in '--order' option" msgstr "Falsches Objekt »%s« der Option »--order«" -#: ../clients/cli/connections.c:1629 +#: ../clients/cli/connections.c:1630 msgid "No connection specified" msgstr "Keine Verbindung angegeben" -#: ../clients/cli/connections.c:1644 +#: ../clients/cli/connections.c:1645 #, c-format msgid "%s argument is missing" msgstr "Argument %s fehlt" -#: ../clients/cli/connections.c:1654 +#: ../clients/cli/connections.c:1655 #, c-format msgid "unknown connection '%s'" msgstr "Unbekannte Verbindung »%s«" -#: ../clients/cli/connections.c:1687 +#: ../clients/cli/connections.c:1688 msgid "'--order' argument is missing" msgstr "Argument »--order« fehlt" -#: ../clients/cli/connections.c:1742 +#: ../clients/cli/connections.c:1743 msgid "NetworkManager active profiles" msgstr "NetworkManager aktive Profile" -#: ../clients/cli/connections.c:1743 +#: ../clients/cli/connections.c:1744 msgid "NetworkManager connection profiles" msgstr "NetworkManager Verbindungsprofile" -#: ../clients/cli/connections.c:1796 ../clients/cli/connections.c:2471 -#: ../clients/cli/connections.c:2483 ../clients/cli/connections.c:2495 -#: ../clients/cli/connections.c:2671 ../clients/cli/connections.c:8431 -#: ../clients/cli/connections.c:8448 ../clients/cli/devices.c:2681 +#: ../clients/cli/connections.c:1797 ../clients/cli/connections.c:2472 +#: ../clients/cli/connections.c:2484 ../clients/cli/connections.c:2496 +#: ../clients/cli/connections.c:2672 ../clients/cli/connections.c:8434 +#: ../clients/cli/connections.c:8451 ../clients/cli/devices.c:2681 #: ../clients/cli/devices.c:2692 ../clients/cli/devices.c:2934 #: ../clients/cli/devices.c:2945 ../clients/cli/devices.c:2963 #: ../clients/cli/devices.c:2972 ../clients/cli/devices.c:2993 @@ -1112,14 +1113,14 @@ msgstr "NetworkManager Verbindungsprofile" msgid "Error: %s argument is missing." msgstr "Fehler: Argument %s fehlt." -#: ../clients/cli/connections.c:1815 +#: ../clients/cli/connections.c:1816 #, c-format msgid "Error: %s - no such connection profile." msgstr "Fehler: Verbindungsprofil %s existiert nicht." -#: ../clients/cli/connections.c:1879 ../clients/cli/connections.c:2458 -#: ../clients/cli/connections.c:2522 ../clients/cli/connections.c:7941 -#: ../clients/cli/connections.c:8052 ../clients/cli/connections.c:8562 +#: ../clients/cli/connections.c:1880 ../clients/cli/connections.c:2459 +#: ../clients/cli/connections.c:2523 ../clients/cli/connections.c:7944 +#: ../clients/cli/connections.c:8055 ../clients/cli/connections.c:8565 #: ../clients/cli/devices.c:1582 ../clients/cli/devices.c:1868 #: ../clients/cli/devices.c:2037 ../clients/cli/devices.c:2145 #: ../clients/cli/devices.c:2334 ../clients/cli/devices.c:3590 @@ -1128,239 +1129,239 @@ msgstr "Fehler: Verbindungsprofil %s existiert nicht." msgid "Error: %s." msgstr "Fehler: %s." -#: ../clients/cli/connections.c:1977 +#: ../clients/cli/connections.c:1978 #, c-format msgid "no active connection on device '%s'" msgstr "Keine aktive Verbindung auf Gerät »%s«" -#: ../clients/cli/connections.c:1985 +#: ../clients/cli/connections.c:1986 msgid "no active connection or device" msgstr "Keine aktive Verbindung oder Gerät" -#: ../clients/cli/connections.c:2005 +#: ../clients/cli/connections.c:2006 #, c-format msgid "device '%s' not compatible with connection '%s':" msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel:" -#: ../clients/cli/connections.c:2041 +#: ../clients/cli/connections.c:2042 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "Gerät »%s« ist nicht mit der Verbindung »%s« kompatibel" -#: ../clients/cli/connections.c:2044 +#: ../clients/cli/connections.c:2045 #, c-format msgid "no device found for connection '%s'" msgstr "Für die Verbindung »%s« wurde kein Gerät gefunden" -#: ../clients/cli/connections.c:2072 -#, fuzzy, c-format +#: ../clients/cli/connections.c:2073 +#, c-format msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n" -msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n" +msgstr "" -#: ../clients/cli/connections.c:2076 ../clients/cli/connections.c:2224 -#: ../clients/cli/connections.c:6249 +#: ../clients/cli/connections.c:2077 ../clients/cli/connections.c:2225 +#: ../clients/cli/connections.c:6250 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "Verbindung wurde erfolgreich aktiviert (aktiver D-Bus-Pfad: %s)\n" -#: ../clients/cli/connections.c:2083 ../clients/cli/connections.c:2204 +#: ../clients/cli/connections.c:2084 ../clients/cli/connections.c:2205 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Fehler: Aktivierung der Verbindung ist gescheitert: %s" -#: ../clients/cli/connections.c:2119 +#: ../clients/cli/connections.c:2120 #, c-format msgid "Error: Timeout expired (%d seconds)" msgstr "Fehler: Zeitbeschränkung (%d Sekunden) ist abgelaufen." -#: ../clients/cli/connections.c:2285 +#: ../clients/cli/connections.c:2286 #, c-format msgid "failed to read passwd-file '%s': %s" msgstr "Fehler: Lesen der passwd-Datei »%s« ist fehlgeschlagen: %s" -#: ../clients/cli/connections.c:2297 +#: ../clients/cli/connections.c:2298 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "Fehlender Doppelpunkt im Passwort-Eintrag »%s«" -#: ../clients/cli/connections.c:2305 +#: ../clients/cli/connections.c:2306 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "Fehlender Punkt im Passwort-Eintrag »%s«" -#: ../clients/cli/connections.c:2318 +#: ../clients/cli/connections.c:2319 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "Ungültiger Einstellungsname im Passwort-Eintrag »%s«" -#: ../clients/cli/connections.c:2374 +#: ../clients/cli/connections.c:2375 #, c-format msgid "unknown device '%s'." msgstr "Unbekanntes Gerät »%s«." -#: ../clients/cli/connections.c:2379 +#: ../clients/cli/connections.c:2380 msgid "neither a valid connection nor device given" msgstr "weder eine gültige Verbindung noch ein Gerät angegeben" -#: ../clients/cli/connections.c:2505 ../clients/cli/devices.c:1533 +#: ../clients/cli/connections.c:2506 ../clients/cli/devices.c:1533 #: ../clients/cli/devices.c:2699 ../clients/cli/devices.c:3035 #: ../clients/cli/devices.c:3644 #, c-format msgid "Unknown parameter: %s\n" msgstr "Unbekannter Parameter: %s\n" -#: ../clients/cli/connections.c:2530 +#: ../clients/cli/connections.c:2531 msgid "preparing" msgstr "Vorbereitung läuft" -#: ../clients/cli/connections.c:2550 +#: ../clients/cli/connections.c:2551 #, c-format msgid "Connection '%s' (%s) successfully deleted.\n" msgstr "Verbindung »%s« (%s) erfolgreich gelöscht.\n" -#: ../clients/cli/connections.c:2566 +#: ../clients/cli/connections.c:2567 #, c-format msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "" "Verbindung »%s« wurde erfolgreich deaktiviert (aktiver D-Bus-Pfad: %s)\n" -#: ../clients/cli/connections.c:2647 ../clients/cli/connections.c:8167 -#: ../clients/cli/connections.c:8199 ../clients/cli/connections.c:8356 +#: ../clients/cli/connections.c:2648 ../clients/cli/connections.c:8170 +#: ../clients/cli/connections.c:8202 ../clients/cli/connections.c:8359 #, c-format msgid "Error: No connection specified." msgstr "Fehler: Keine Verbindung angegeben." -#: ../clients/cli/connections.c:2688 +#: ../clients/cli/connections.c:2689 #, c-format msgid "Error: '%s' is not an active connection.\n" msgstr "Fehler: »%s« ist keine aktive Verbindung.\n" -#: ../clients/cli/connections.c:2689 +#: ../clients/cli/connections.c:2690 #, c-format msgid "Error: not all active connections found." msgstr "Fehler: Es wurden nicht alle aktiven Verbindungen gefunden." -#: ../clients/cli/connections.c:2698 +#: ../clients/cli/connections.c:2699 #, c-format msgid "Error: no active connection provided." msgstr "Fehler: Keine aktive Verbindung angegeben." -#: ../clients/cli/connections.c:2732 +#: ../clients/cli/connections.c:2733 #, c-format msgid "Connection '%s' deactivation failed: %s\n" msgstr "Deaktivierung der Verbindung »%s« ist gescheitert: %s\n" -#: ../clients/cli/connections.c:2988 ../clients/cli/connections.c:3045 +#: ../clients/cli/connections.c:2989 ../clients/cli/connections.c:3046 #: ../clients/common/nm-client-utils.c:169 #, c-format msgid "'%s' not among [%s]" msgstr "»%s« ist nicht unter [%s]" #. We should not really come here -#: ../clients/cli/connections.c:3008 ../clients/cli/connections.c:3068 +#: ../clients/cli/connections.c:3009 ../clients/cli/connections.c:3069 #: ../clients/common/nm-client-utils.c:279 #, c-format msgid "Unknown error" msgstr "Unbekannter Fehler" -#: ../clients/cli/connections.c:3202 +#: ../clients/cli/connections.c:3203 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "Warnung: master=»%s« bezieht sich auf kein vorhandenes Profil.\n" -#: ../clients/cli/connections.c:3539 +#: ../clients/cli/connections.c:3540 #, c-format msgid "Error: invalid property '%s': %s." msgstr "Fehler: Ungültige Eigenschaft »%s«: %s." -#: ../clients/cli/connections.c:3556 +#: ../clients/cli/connections.c:3557 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "Fehler: Ändern ist fehlgeschlagen %s.%s: %s." -#: ../clients/cli/connections.c:3575 +#: ../clients/cli/connections.c:3576 #, c-format msgid "Error: failed to remove a value from %s.%s: %s." msgstr "Fehler: Entfernen eines Wertes von %s.%s: %s ist fehlgeschlagen." -#: ../clients/cli/connections.c:3609 +#: ../clients/cli/connections.c:3610 #, c-format msgid "Error: '%s' is mandatory." msgstr "Fehler: »%s« ist zwingend erforderlich." -#: ../clients/cli/connections.c:3636 +#: ../clients/cli/connections.c:3637 #, c-format msgid "Error: invalid slave type; %s." msgstr "Fehler: Unzulässiger Slave-Typ; %s." -#: ../clients/cli/connections.c:3644 +#: ../clients/cli/connections.c:3645 #, c-format msgid "Error: invalid connection type; %s." msgstr "Fehler: Unbekannter Verbindungstyp: %s." -#: ../clients/cli/connections.c:3721 +#: ../clients/cli/connections.c:3722 #, c-format msgid "Error: bad connection type: %s" msgstr "Fehler: Falscher Verbindungstyp: %s" -#: ../clients/cli/connections.c:3767 +#: ../clients/cli/connections.c:3768 #, c-format msgid "Error: '%s': %s" msgstr "Fehler: »%s«: %s" -#: ../clients/cli/connections.c:3788 +#: ../clients/cli/connections.c:3789 msgid "Error: master is required" msgstr "Fehler: »master« ist notwendig" -#: ../clients/cli/connections.c:3847 +#: ../clients/cli/connections.c:3848 #, c-format msgid "Error: error adding bond option '%s=%s'." msgstr "Fehler: Fehler beim Hinzufügen der bond-Option »%s=%s«." -#: ../clients/cli/connections.c:3878 +#: ../clients/cli/connections.c:3879 #, c-format msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n" msgstr "" "Fehler: »%s« ist kein gültiger Überwachungsmodus; verwenden Sie »%s« oder " "»%s«.\n" -#: ../clients/cli/connections.c:3909 +#: ../clients/cli/connections.c:3910 #, c-format msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]." msgstr "" "Fehler: »bt-type«: »%s« ist nicht gültig. Verwenden Sie [%s, %s, %s (%s), " "%s]." -#: ../clients/cli/connections.c:4158 +#: ../clients/cli/connections.c:4159 #, c-format msgid "Error: value for '%s' is missing." msgstr "Fehler: Wert für »%s« fehlt." -#: ../clients/cli/connections.c:4204 +#: ../clients/cli/connections.c:4205 msgid "Error: . argument is missing." msgstr "Fehler: Argument für Einstellung fehlt." -#: ../clients/cli/connections.c:4227 +#: ../clients/cli/connections.c:4228 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "Fehler: Ungültige oder nicht zulässige Einstellung »%s«: %s." -#: ../clients/cli/connections.c:4273 ../clients/cli/connections.c:4289 +#: ../clients/cli/connections.c:4274 ../clients/cli/connections.c:4290 #, c-format msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)." msgstr "Fehler: '%s' ist mehrdeutig (%s.%s oder %s.%s)." -#: ../clients/cli/connections.c:4307 +#: ../clients/cli/connections.c:4308 #, c-format msgid "Error: invalid . '%s'." msgstr "Fehler: Ungültiger Einstellungsname: »%s«." -#: ../clients/cli/connections.c:4351 ../clients/cli/connections.c:7992 +#: ../clients/cli/connections.c:4352 ../clients/cli/connections.c:7995 #, c-format msgid "Error: Failed to add '%s' connection: %s" msgstr "Fehler: Verbindung »%s« konnte nicht hinzugefügt werden: %s" -#: ../clients/cli/connections.c:4369 +#: ../clients/cli/connections.c:4370 #, c-format msgid "" "Warning: There is another connection with the name '%1$s'. Reference the " @@ -1371,12 +1372,12 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: ../clients/cli/connections.c:4378 +#: ../clients/cli/connections.c:4379 #, c-format msgid "Connection '%s' (%s) successfully added.\n" msgstr "Verbindung »%s« (%s) erfolgreich hinzugefügt.\n" -#: ../clients/cli/connections.c:4516 +#: ../clients/cli/connections.c:4517 #, c-format msgid "" "You can specify this option more than once. Press when you're done.\n" @@ -1385,36 +1386,36 @@ msgstr "" "fertig sind.\n" #. Ask for optional arguments. -#: ../clients/cli/connections.c:4615 +#: ../clients/cli/connections.c:4616 #, c-format msgid "There is %d optional setting for %s.\n" msgid_plural "There are %d optional settings for %s.\n" msgstr[0] "Es gibt %d optionale Einstellung für »%s«.\n" msgstr[1] "Es gibt %d optionale Einstellungen für »%s«.\n" -#: ../clients/cli/connections.c:4618 +#: ../clients/cli/connections.c:4619 #, c-format msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" msgstr[0] "Möchten Sie es zur Verfügung stellen? »%s«" msgstr[1] "Möchten Sie diese zur Verfügung stellen? »%s«" -#: ../clients/cli/connections.c:4754 ../clients/cli/utils.c:303 +#: ../clients/cli/connections.c:4755 ../clients/cli/utils.c:303 #, c-format msgid "Error: value for '%s' argument is required." msgstr "Fehler: Ein Wert ist für den Parameter »%s« notwendig." -#: ../clients/cli/connections.c:4760 +#: ../clients/cli/connections.c:4761 #, c-format msgid "Error: 'save': %s." msgstr "Fehler: »save«: %s." -#: ../clients/cli/connections.c:4848 ../clients/cli/connections.c:4859 +#: ../clients/cli/connections.c:4849 ../clients/cli/connections.c:4860 #, c-format msgid "Error: '%s' argument is required." msgstr "Fehler: Das Argument »%s« ist notwendig." -#: ../clients/cli/connections.c:5837 +#: ../clients/cli/connections.c:5838 #, c-format msgid "['%s' setting values]\n" msgstr "['%s' Werte werden gesetzt]\n" @@ -1423,7 +1424,7 @@ msgstr "['%s' Werte werden gesetzt]\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:5916 +#: ../clients/cli/connections.c:5917 #, c-format msgid "" "---[ Main menu ]---\n" @@ -1459,7 +1460,7 @@ msgstr "" "nmcli :: nmcli-Konfiguration\n" "quit :: nmcli beenden\n" -#: ../clients/cli/connections.c:5943 +#: ../clients/cli/connections.c:5944 #, c-format msgid "" "goto [.] | :: enter setting/property for editing\n" @@ -1479,7 +1480,7 @@ msgstr "" " nmcli connection> goto secondaries\n" " nmcli> goto ipv4.addresses\n" -#: ../clients/cli/connections.c:5950 +#: ../clients/cli/connections.c:5951 #, c-format msgid "" "remove [.] :: remove setting or reset property value\n" @@ -1501,7 +1502,7 @@ msgstr "" "Beispiele: nmcli> remove wifi-sec\n" " nmcli> remove eth.mtu\n" -#: ../clients/cli/connections.c:5957 +#: ../clients/cli/connections.c:5958 #, c-format msgid "" "set [. ] :: set property value\n" @@ -1516,7 +1517,7 @@ msgstr "" "\n" "Beispiel: nmcli> s con.id Meine Verbindung\n" -#: ../clients/cli/connections.c:5962 +#: ../clients/cli/connections.c:5963 #, c-format msgid "" "describe [.] :: describe property\n" @@ -1529,7 +1530,7 @@ msgstr "" "Zeigt die Eigenschaftsbeschreibung. Sie können die Hilfeseite nm-settings(5) " "zu Rate ziehen, um alle Einstellungen und Eigenschaften nachzulesen.\n" -#: ../clients/cli/connections.c:5967 +#: ../clients/cli/connections.c:5968 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -1544,7 +1545,7 @@ msgstr "" "\n" "Beispiel: nmcli ipv4> print all\n" -#: ../clients/cli/connections.c:5972 +#: ../clients/cli/connections.c:5973 #, c-format msgid "" "verify [all | fix] :: verify setting or connection validity\n" @@ -1570,7 +1571,7 @@ msgstr "" " nmcli> verify fix\n" " nmcli bond> verify\n" -#: ../clients/cli/connections.c:5981 +#: ../clients/cli/connections.c:5982 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -1597,7 +1598,7 @@ msgstr "" "Verbindung volständig löschen möchten, so muss das Verbindungsprofil\n" "gelöscht werden.\n" -#: ../clients/cli/connections.c:5992 +#: ../clients/cli/connections.c:5993 #, c-format msgid "" "activate [] [/|] :: activate the connection\n" @@ -1619,7 +1620,7 @@ msgstr "" "/| - Zugriffspunkt (WLAN) oder NSP (WiMAX) (stellen Sie " "»/« voraus wenn nicht angegeben wird)\n" -#: ../clients/cli/connections.c:5999 ../clients/cli/connections.c:6158 +#: ../clients/cli/connections.c:6000 ../clients/cli/connections.c:6159 #, c-format msgid "" "back :: go to upper menu level\n" @@ -1628,7 +1629,7 @@ msgstr "" "back :: Eine Menüebene nach oben gehen\n" "\n" -#: ../clients/cli/connections.c:6002 +#: ../clients/cli/connections.c:6003 #, c-format msgid "" "help/? [] :: help for the nmcli commands\n" @@ -1637,7 +1638,7 @@ msgstr "" "help/? [] :: Hilfe zu den nmcli-Befehlen\n" "\n" -#: ../clients/cli/connections.c:6005 +#: ../clients/cli/connections.c:6006 #, c-format msgid "" "nmcli [ ] :: nmcli configuration\n" @@ -1664,7 +1665,7 @@ msgstr "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" -#: ../clients/cli/connections.c:6027 ../clients/cli/connections.c:6164 +#: ../clients/cli/connections.c:6028 ../clients/cli/connections.c:6165 #, c-format msgid "" "quit :: exit nmcli\n" @@ -1677,8 +1678,8 @@ msgstr "" "Dieser Befehl beendet nmcli. Wenn die Verbindung in Bearbeitung nicht " "gespeichert ist wird der Benutzer gefragt, die Aktion zu bestätigen.\n" -#: ../clients/cli/connections.c:6032 ../clients/cli/connections.c:6169 -#: ../clients/cli/connections.c:6605 ../clients/cli/connections.c:7562 +#: ../clients/cli/connections.c:6033 ../clients/cli/connections.c:6170 +#: ../clients/cli/connections.c:6606 ../clients/cli/connections.c:7563 #, c-format msgid "Unknown command: '%s'\n" msgstr "Unbekannter Befehl: »%s«\n" @@ -1686,7 +1687,7 @@ msgstr "Unbekannter Befehl: »%s«\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6098 +#: ../clients/cli/connections.c:6099 #, c-format msgid "" "---[ Property menu ]---\n" @@ -1715,7 +1716,7 @@ msgstr "" "ausgeben\n" "quit :: nmcli beenden\n" -#: ../clients/cli/connections.c:6123 +#: ../clients/cli/connections.c:6124 #, c-format msgid "" "set [] :: set new value\n" @@ -1726,7 +1727,7 @@ msgstr "" "\n" "Dieser Befehl setzt den für die Eigenschaft\n" -#: ../clients/cli/connections.c:6127 +#: ../clients/cli/connections.c:6128 #, c-format msgid "" "add [] :: append new value to the property\n" @@ -1741,7 +1742,7 @@ msgstr "" "die Eigenschaft ein Container-Typ ist. Für einwertige Eigenschaften wird der " "Wert ersetzt (genau wie »set«).\n" -#: ../clients/cli/connections.c:6133 +#: ../clients/cli/connections.c:6134 #, c-format msgid "" "change :: change current value\n" @@ -1752,7 +1753,7 @@ msgstr "" "\n" "Zeigt den aktuellen Wert an und lässt ihn bearbeiten.\n" -#: ../clients/cli/connections.c:6137 +#: ../clients/cli/connections.c:6138 #, c-format msgid "" "remove [||