1. 19 Nov, 2014 40 commits
    • Lubomir Rintel's avatar
    • Lubomir Rintel's avatar
      vpn: Propagate daemon exec error correctly · 282d9b0e
      Lubomir Rintel authored
      NetworkManager[31624]: <warn>  VPN service 'openvpn': could not launch the VPN service. error: (8) Failed to execute child process "/usr/local/libexec/nm-openvpn-service" (No such file or directory).
      **
      NetworkManager:ERROR:nm-manager.c:3094:_activation_auth_done: assertion failed: (error)
      282d9b0e
    • Lubomir Rintel's avatar
      cli: Only escape VPN banner if it's present · 51974196
      Lubomir Rintel authored
      If the connection is in ACTIVATING state, the banner is still NULL.
      51974196
    • Dan Winship's avatar
      Merge branch 'dhcp-fixes' · 9f5cff0b
      Dan Winship authored
      9f5cff0b
    • Dan Winship's avatar
      man: document the "internal" DHCP client · 93799e68
      Dan Winship authored
      93799e68
    • Dan Winship's avatar
      dhcp: Simplify nm-dhcp-systemd lease-handling code · 4f2c5531
      Dan Winship authored
      An sd_dhcp_lease will always have an associated address, netmask, and
      lifetime, so we don't have to check for errors when fetching them.
      (The systemd code will fill in a default netmask if the server didn't
      provide one; nm-dhcp-systemd's code to do that itself was redundant
      and unused.)
      
      Also, log the expiration time and NTP servers, for consistency with
      everything else.
      4f2c5531
    • Dan Winship's avatar
      dhcp: fix startup warnings with dhcp=internal · 7bf7ebc4
      Dan Winship authored
      If asked to read a file that doesn't exist, sd_dhcp_lease_load()
      returns 0 (success) without setting the out lease argument. So we need
      to check both the return status and the lease before proceeding.
      7bf7ebc4
    • Dan Winship's avatar
      dhcp: fix systemd-dhcp's writing of routes in lease file · 71b67659
      Dan Winship authored
      inet_ntoa() uses a static buffer, so you can't call it twice in the
      same fprintf() call.
      
      https://bugs.freedesktop.org/show_bug.cgi?id=86438
      71b67659
    • Dan Winship's avatar
      dhcp: update system-dhcp code from upstream · 44eb50d1
      Dan Winship authored
      44eb50d1
    • Dan Winship's avatar
      dhcp: update nm-dhcp-systemd code for system-dhcp re-import · e30b0714
      Dan Winship authored
      Some of the patches we proposed were committed in slightly different
      form.
      e30b0714
    • Dan Winship's avatar
      74678cf5
    • Dan Winship's avatar
      Merge branch 'master' into dhcp-merge · 1ea0dd41
      Dan Winship authored
      Conflicts:
      	src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
      	src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
      	src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
      	src/dhcp-manager/systemd-dhcp/src/shared/util.c
      	src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
      	src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
      1ea0dd41
    • Jiří Klimeš's avatar
      af525e8a
    • Dan Winship's avatar
      dhcp: update systemd DHCP code · e2e4637c
      Dan Winship authored
      This is a direct dump from systemd git on 2014-11-19, git commit
      a4962513.  Only relevant files were included.
      
          SYSTEMD_DIR=../systemd
          COMMIT=a4962513c555fe3ac4b5bebf97a71701361a45b0
      
          (
             cd "$SYSTEMD_DIR"
             git checkout "$COMMIT"
             git clean -fdx
          )
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp-internal.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-internal.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp-lease-internal.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp-network.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp-option.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp-packet.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp-protocol.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp6-internal.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-internal.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp6-lease-internal.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-lease-internal.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp6-network.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp6-option.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/dhcp6-protocol.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/network-internal.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/network-internal.h ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.h
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/sd-dhcp-client.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/sd-dhcp-lease.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/sd-dhcp6-client.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
          /bin/cp "$SYSTEMD_DIR"/src/libsystemd-network/sd-dhcp6-lease.c ./src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/async.h ./src/dhcp-manager/systemd-dhcp/src/shared/async.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/fileio.c ./src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/fileio.h ./src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/list.h ./src/dhcp-manager/systemd-dhcp/src/shared/list.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/macro.h ./src/dhcp-manager/systemd-dhcp/src/shared/macro.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/refcnt.h ./src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/siphash24.c ./src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/siphash24.h ./src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/socket-util.h ./src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/sparse-endian.h ./src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/strv.c ./src/dhcp-manager/systemd-dhcp/src/shared/strv.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/strv.h ./src/dhcp-manager/systemd-dhcp/src/shared/strv.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/time-util.c ./src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/time-util.h ./src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/utf8.c ./src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/utf8.h ./src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/util.c ./src/dhcp-manager/systemd-dhcp/src/shared/util.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/util.h ./src/dhcp-manager/systemd-dhcp/src/shared/util.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/unaligned.h ./src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
          /bin/cp "$SYSTEMD_DIR"/src/shared/in-addr-util.c ./src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
          /bin/cp "$SYSTEMD_DIR"/src/shared/in-addr-util.h ./src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/_sd-common.h ./src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/sd-dhcp-client.h ./src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/sd-dhcp-lease.h ./src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/sd-dhcp6-client.h ./src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/sd-dhcp6-lease.h ./src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/sd-event.h ./src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
          /bin/cp "$SYSTEMD_DIR"/src/systemd/sd-id128.h ./src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
      e2e4637c
    • Thomas Haller's avatar
    • Lubomir Rintel's avatar
      cli: Watch for device as well as AC state changes when activating · 653b7e48
      Lubomir Rintel authored
      The signals might be delivered in no particular order and we need to wait for
      the device to reach stable state (whether it's successfully conntected or not)
      as well as the active connection to leave ACTIVATING state.
      
      https://bugzilla.gnome.org/show_bug.cgi?id=740320
      653b7e48
    • Jiří Klimeš's avatar
      9503d35d
    • Jiří Klimeš's avatar
      3c8dfb91
    • Jiří Klimeš's avatar
      dispatcher: introduce new env variables for gateway address (bgo #740363) · 9a133787
      Jiří Klimeš authored
      IP4_GATEWAY
      VPN_IP4_GATEWAY
      IP6_GATEWAY
      VPN_IP6_GATEWAY
      
      We still put gateway into IP[46]_ADDRESS_N for backward compatibility.
      
      https://bugzilla.gnome.org/show_bug.cgi?id=740363
      9a133787
    • Lubomir Rintel's avatar
      libnm-core: Add missing type cast · c30379e0
      Lubomir Rintel authored
      Fixes testing on 32-bit arches:
      
      /core/general/test_setting_compare_timestamp:
      (./test-general:29331): GLib-GObject-WARNING **: g_object_set_valist: object class `NMSettingConnection' has no property named `$?\xff\xff\x89t$0\x89|$4\xe8\u001c\x98\xff\xff\x85\xc0tM\x83\xf8\xfft3\x8dT$(\xc7D$\u0008'
      /bin/sh: line 5: 29331 Trace/breakpoint trap   ${dir}$tst
      FAIL: test-general
      
      Fixes: 093a3c88
      c30379e0
    • Dan Winship's avatar
      tui: refresh the "nmtui connect" list when connections are added/removed · 8473bb31
      Dan Winship authored
      We were refreshing the list when the set of available devices changed,
      or the set of active connections changed, but not when the set of
      available connections changed.
      
      https://bugzilla.gnome.org/show_bug.cgi?id=740333
      8473bb31
    • Dan Winship's avatar
    • Jiří Klimeš's avatar
      485edd52
    • Jiří Klimeš's avatar
      a4d4fa04
    • Jiří Klimeš's avatar
      libnm-core: update BAND and CHANNEL ifcfg-rh description · 3bcba5dd
      Jiří Klimeš authored
      We support BAND variable now.
      3bcba5dd
    • Jiří Klimeš's avatar
    • Jiří Klimeš's avatar
      man: ifcfg-rh manual page text update · 07bd9a1b
      Jiří Klimeš authored
      07bd9a1b
    • Dan Winship's avatar
      man, docs: add the secret flags notes non-hackishly · c7341c98
      Dan Winship authored
      Since libnm-core secret-flags properties are now enum-typed rather
      than just being uints, we can now actually recognize them when
      generating docs, rather than just assuming that every property whose
      name ends in '-flags', but isn't in NMSettingDcb, is a secret-flags
      property.
      c7341c98
    • Dan Winship's avatar
      cli, libnm: don't use D-Bus-specific documentation in nmcli · e43ba45f
      Dan Winship authored
      Now that nm-setting-docs.xml is more D-Bus-specific, it's less
      appropriate for nmcli's internal documentation. So generate a second
      copy of the docs without using the overrides file, and use that one
      for nmcli's documentation.
      e43ba45f
    • Dan Winship's avatar
      libnm: Override parts of nm-setting-docs.xml · 36156b70
      Dan Winship authored
      Add "---dbus---" sections to the NMSetting property docs, in the same
      style as the plugin docs, parse them out into a file
      "nm-setting-docs-overrides.xml", and use them to override the GObject
      property docs in nm-setting-docs.xml.
      
      This lets us put more D-Bus-specific information in the setting docs,
      without cluttering up the property docs, and it also lets us document
      dbus-only properties.
      36156b70
    • Dan Winship's avatar
      libnm: fix nm-setting-docs.xml property types · 780d8bf2
      Dan Winship authored
      Add nm_setting_get_dbus_property_type(), and use this to get the
      correct type for properties in nm-seting-docs.xml, in situations where
      the D-Bus and GObject property types don't match.
      
      In the case of enum/flags-valued properties, give both the enum name
      and the underlying D-Bus type.
      780d8bf2
    • Dan Winship's avatar
      libnm-core: make GBytes D-Bus marshalling be built-in to NMSetting · 2f81a8bc
      Dan Winship authored
      Each GBytes-valued property was using
      _nm_setting_class_transform_property() to register a GBytes<->'ay'
      transform. So just build that rule into the generic machinery in
      nm-setting.c.
      2f81a8bc
    • Dan Winship's avatar
      libnm, libnm-util: move settings doc generation to libnm-core · c1448698
      Dan Winship authored
      Move the settings/plugins doc generation from libnm-util to
      libnm-core, since libnm-util isn't being updated for all new
      properties.
      
      With this commit, the keyfile and ifcfg-rh documentation is basically
      unchanged, except that deprecated properties are now gone, and new
      properties have been added, and the sections are in a different order.
      (generate-plugin-docs.pl just outputs the settings in Makefile order,
      and they were unsorted in libnm-util, but are sorted in libnm-core).
      
      The settings documentation used for nm-settings.5, the D-Bus API docs,
      and the nmcli help is changed a bit more at this point, and mostly for
      the worse, since the libnm-core setting properties don't match up with
      the D-Bus API as well as the libnm-util ones do. To be fixed...
      
      (I also removed the "plugins docs" line in each plugin docs comment
      block while moving them, since those blocks will be used for more than
      just plugins soon, and it's sort of obvious anyway.)
      c1448698
    • Jiří Klimeš's avatar
      man: update nmcli-examples manual page · 3889ff86
      Jiří Klimeš authored
      3889ff86
    • Jiří Klimeš's avatar
      man: fix a typo in nmtui manual page · 3595bef1
      Jiří Klimeš authored
      3595bef1
    • Thomas Haller's avatar
    • Thomas Haller's avatar
    • Thomas Haller's avatar
      11417276
    • Thomas Haller's avatar
      firewall: invoke FwAddToZoneFunc callback also when cancelling · 90a33321
      Thomas Haller authored
      
      
      Not invoking a callback when cancelling the operation is counter
      intuitive.
      
      Note that NMPolicy refs the device, cancelling the call would leave
      the reference hanging. That was not an issue because the call was
      never cancelled. But still the behavior of NMFirewallManager is
      unexpected.
      Signed-off-by: Thomas Haller's avatarThomas Haller <thaller@redhat.com>
      90a33321
    • Thomas Haller's avatar
      b0b7473a