Thomas Haller
bb341900dd
all: avoid backslash escape double quote inside single quote
...
It's not necessary.
2019-02-06 09:30:59 +01:00
Thomas Haller
de1741e2d0
systemd: merge branch systemd into master
2019-02-06 09:28:36 +01:00
Thomas Haller
8372c0e9c0
systemd: update code from upstream (2019-02-05)
...
This is a direct dump from systemd git.
======
SYSTEMD_DIR=../systemd
COMMIT=6d6308f6774b4c684de7f3aab12cb752c59d5e2f
(
cd "$SYSTEMD_DIR"
git checkout "$COMMIT"
git reset --hard
git clean -fdx
)
git ls-files -z :/src/systemd/src/ \
:/shared/systemd/src/ \
:/shared/nm-utils/unaligned.h | \
xargs -0 rm -f
nm_copy_sd_shared() {
mkdir -p "./shared/systemd/$(dirname "$1")"
cp "$SYSTEMD_DIR/$1" "./shared/systemd/$1"
}
nm_copy_sd_core() {
mkdir -p "./src/systemd/$(dirname "$1")"
cp "$SYSTEMD_DIR/$1" "./src/systemd/$1"
}
nm_copy_sd_nmutils() {
mkdir -p "./shared/nm-utils/"
cp "$SYSTEMD_DIR/$1" "./shared/nm-utils/${1##*/}"
}
nm_copy_sd_core "src/libsystemd-network/arp-util.c"
nm_copy_sd_core "src/libsystemd-network/arp-util.h"
nm_copy_sd_core "src/libsystemd-network/dhcp-identifier.c"
nm_copy_sd_core "src/libsystemd-network/dhcp-identifier.h"
nm_copy_sd_core "src/libsystemd-network/dhcp-internal.h"
nm_copy_sd_core "src/libsystemd-network/dhcp-lease-internal.h"
nm_copy_sd_core "src/libsystemd-network/dhcp-network.c"
nm_copy_sd_core "src/libsystemd-network/dhcp-option.c"
nm_copy_sd_core "src/libsystemd-network/dhcp-packet.c"
nm_copy_sd_core "src/libsystemd-network/dhcp-protocol.h"
nm_copy_sd_core "src/libsystemd-network/dhcp6-internal.h"
nm_copy_sd_core "src/libsystemd-network/dhcp6-lease-internal.h"
nm_copy_sd_core "src/libsystemd-network/dhcp6-network.c"
nm_copy_sd_core "src/libsystemd-network/dhcp6-option.c"
nm_copy_sd_core "src/libsystemd-network/dhcp6-protocol.h"
nm_copy_sd_core "src/libsystemd-network/lldp-internal.h"
nm_copy_sd_core "src/libsystemd-network/lldp-neighbor.c"
nm_copy_sd_core "src/libsystemd-network/lldp-neighbor.h"
nm_copy_sd_core "src/libsystemd-network/lldp-network.c"
nm_copy_sd_core "src/libsystemd-network/lldp-network.h"
nm_copy_sd_core "src/libsystemd-network/network-internal.c"
nm_copy_sd_core "src/libsystemd-network/network-internal.h"
nm_copy_sd_core "src/libsystemd-network/sd-dhcp-client.c"
nm_copy_sd_core "src/libsystemd-network/sd-dhcp-lease.c"
nm_copy_sd_core "src/libsystemd-network/sd-dhcp6-client.c"
nm_copy_sd_core "src/libsystemd-network/sd-dhcp6-lease.c"
nm_copy_sd_core "src/libsystemd-network/sd-ipv4acd.c"
nm_copy_sd_core "src/libsystemd-network/sd-ipv4ll.c"
nm_copy_sd_core "src/libsystemd-network/sd-lldp.c"
nm_copy_sd_core "src/libsystemd/sd-event/event-source.h"
nm_copy_sd_core "src/libsystemd/sd-event/event-util.c"
nm_copy_sd_core "src/libsystemd/sd-event/event-util.h"
nm_copy_sd_core "src/libsystemd/sd-event/sd-event.c"
nm_copy_sd_core "src/libsystemd/sd-id128/id128-util.c"
nm_copy_sd_core "src/libsystemd/sd-id128/id128-util.h"
nm_copy_sd_core "src/libsystemd/sd-id128/sd-id128.c"
nm_copy_sd_core "src/shared/dns-domain.c"
nm_copy_sd_core "src/shared/dns-domain.h"
nm_copy_sd_core "src/systemd/_sd-common.h"
nm_copy_sd_core "src/systemd/sd-dhcp-client.h"
nm_copy_sd_core "src/systemd/sd-dhcp-lease.h"
nm_copy_sd_core "src/systemd/sd-dhcp6-client.h"
nm_copy_sd_core "src/systemd/sd-dhcp6-lease.h"
nm_copy_sd_core "src/systemd/sd-event.h"
nm_copy_sd_core "src/systemd/sd-id128.h"
nm_copy_sd_core "src/systemd/sd-ipv4acd.h"
nm_copy_sd_core "src/systemd/sd-ipv4ll.h"
nm_copy_sd_core "src/systemd/sd-lldp.h"
nm_copy_sd_core "src/systemd/sd-ndisc.h"
nm_copy_sd_nmutils "src/basic/unaligned.h"
nm_copy_sd_shared "src/basic/alloc-util.c"
nm_copy_sd_shared "src/basic/alloc-util.h"
nm_copy_sd_shared "src/basic/async.h"
nm_copy_sd_shared "src/basic/env-file.c"
nm_copy_sd_shared "src/basic/env-file.h"
nm_copy_sd_shared "src/basic/env-util.c"
nm_copy_sd_shared "src/basic/env-util.h"
nm_copy_sd_shared "src/basic/escape.c"
nm_copy_sd_shared "src/basic/escape.h"
nm_copy_sd_shared "src/basic/ether-addr-util.c"
nm_copy_sd_shared "src/basic/ether-addr-util.h"
nm_copy_sd_shared "src/basic/extract-word.c"
nm_copy_sd_shared "src/basic/extract-word.h"
nm_copy_sd_shared "src/basic/fd-util.c"
nm_copy_sd_shared "src/basic/fd-util.h"
nm_copy_sd_shared "src/basic/fileio.c"
nm_copy_sd_shared "src/basic/fileio.h"
nm_copy_sd_shared "src/basic/fs-util.c"
nm_copy_sd_shared "src/basic/fs-util.h"
nm_copy_sd_shared "src/basic/hash-funcs.c"
nm_copy_sd_shared "src/basic/hash-funcs.h"
nm_copy_sd_shared "src/basic/hashmap.c"
nm_copy_sd_shared "src/basic/hashmap.h"
nm_copy_sd_shared "src/basic/hexdecoct.c"
nm_copy_sd_shared "src/basic/hexdecoct.h"
nm_copy_sd_shared "src/basic/hostname-util.c"
nm_copy_sd_shared "src/basic/hostname-util.h"
nm_copy_sd_shared "src/basic/in-addr-util.c"
nm_copy_sd_shared "src/basic/in-addr-util.h"
nm_copy_sd_shared "src/basic/io-util.c"
nm_copy_sd_shared "src/basic/io-util.h"
nm_copy_sd_shared "src/basic/list.h"
nm_copy_sd_shared "src/basic/log.h"
nm_copy_sd_shared "src/basic/macro.h"
nm_copy_sd_shared "src/basic/mempool.c"
nm_copy_sd_shared "src/basic/mempool.h"
nm_copy_sd_shared "src/basic/missing_fcntl.h"
nm_copy_sd_shared "src/basic/missing_type.h"
nm_copy_sd_shared "src/basic/parse-util.c"
nm_copy_sd_shared "src/basic/parse-util.h"
nm_copy_sd_shared "src/basic/path-util.c"
nm_copy_sd_shared "src/basic/path-util.h"
nm_copy_sd_shared "src/basic/prioq.c"
nm_copy_sd_shared "src/basic/prioq.h"
nm_copy_sd_shared "src/basic/process-util.c"
nm_copy_sd_shared "src/basic/process-util.h"
nm_copy_sd_shared "src/basic/random-util.c"
nm_copy_sd_shared "src/basic/random-util.h"
nm_copy_sd_shared "src/basic/refcnt.h"
nm_copy_sd_shared "src/basic/set.h"
nm_copy_sd_shared "src/basic/signal-util.h"
nm_copy_sd_shared "src/basic/siphash24.h"
nm_copy_sd_shared "src/basic/socket-util.c"
nm_copy_sd_shared "src/basic/socket-util.h"
nm_copy_sd_shared "src/basic/sparse-endian.h"
nm_copy_sd_shared "src/basic/stat-util.c"
nm_copy_sd_shared "src/basic/stat-util.h"
nm_copy_sd_shared "src/basic/stdio-util.h"
nm_copy_sd_shared "src/basic/string-table.c"
nm_copy_sd_shared "src/basic/string-table.h"
nm_copy_sd_shared "src/basic/string-util.c"
nm_copy_sd_shared "src/basic/string-util.h"
nm_copy_sd_shared "src/basic/strv.c"
nm_copy_sd_shared "src/basic/strv.h"
nm_copy_sd_shared "src/basic/time-util.c"
nm_copy_sd_shared "src/basic/time-util.h"
nm_copy_sd_shared "src/basic/tmpfile-util.c"
nm_copy_sd_shared "src/basic/tmpfile-util.h"
nm_copy_sd_shared "src/basic/umask-util.h"
nm_copy_sd_shared "src/basic/utf8.c"
nm_copy_sd_shared "src/basic/utf8.h"
nm_copy_sd_shared "src/basic/util.c"
nm_copy_sd_shared "src/basic/util.h"
2019-02-06 09:11:37 +01:00
Thomas Haller
f6b6daa463
shared/n-acd: minor change to make sources identical to upsteam
...
Partly revert the change from 35171b3c3f .
It's not our place to patch sources that we import via git-subtree.
2019-02-06 08:40:42 +01:00
Thomas Haller
a3fe99bee7
shared/n-acd: re-import from latest nettools/n-acd
...
$ git subtree pull --prefix shared/n-acd/ git@github.com:nettools/n-acd.git master --squash
Import commit '9eb7bf717309fefb253d87e6a1af6660e977d791'.
2019-02-06 08:39:34 +01:00
Thomas Haller
7e77626675
Squashed 'shared/n-acd/' changes from a409492679..9eb7bf7173
...
9eb7bf7173 trivial: fix spelling in code comments
git-subtree-dir: shared/n-acd
git-subtree-split: 9eb7bf717309fefb253d87e6a1af6660e977d791
2019-02-06 08:37:39 +01:00
Thomas Haller
cec7d2b06e
shared/c-siphash: re-import from latest c-util/c-siphash
...
$ git subtree pull --prefix shared/c-siphash/ git@github.com:c-util/c-siphash.git master --squash
Import commit '211cfc5abc3813cddd10d237ba9d843b8d3a8995'.
2019-02-06 08:27:07 +01:00
Thomas Haller
4dd7869b6a
Squashed 'shared/c-siphash/' changes from 24e301e329..211cfc5abc
...
211cfc5abc fix spelling in API documentation and code comment
b24d2e2048 build: only run full matrix on default CI
8f1fdb72a0 build: update build system
git-subtree-dir: shared/c-siphash
git-subtree-split: 211cfc5abc3813cddd10d237ba9d843b8d3a8995
2019-02-06 08:24:00 +01:00
Thomas Haller
cf43ce533b
shared/c-rbtree: minor change to make sources identical to upsteam
...
Partly revert the change from 35171b3c3f .
It's not our place to patch sources that we import via git-subtree.
2019-02-06 08:19:51 +01:00
Thomas Haller
84f1dac1bf
shared/c-list: re-import from latest c-util/c-list
...
$ git subtree pull --prefix shared/c-list/ git@github.com:c-util/c-list.git master --squash
Import commit 'dda36d30c7d655b4d61358519168fa7ce0e9dae9'.
2019-02-06 07:54:19 +01:00
Thomas Haller
cd9f57a164
Squashed 'shared/c-list/' changes from 071841c28d..dda36d30c7
...
dda36d30c7 build: update build system
git-subtree-dir: shared/c-list
git-subtree-split: dda36d30c7d655b4d61358519168fa7ce0e9dae9
2019-02-06 07:53:13 +01:00
Thomas Haller
e4761a69d6
wifi-p2p: merge branch 'th/wifi-p2p-various' (pt2)
...
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/72
https://github.com/NetworkManager/NetworkManager/pull/290
2019-02-05 13:57:12 +01:00
Thomas Haller
8076025780
wifi-p2p: strict validate options argument to "StartFind"
...
Don't accept any unsupported options.
2019-02-05 13:55:32 +01:00
Thomas Haller
1a7303a04c
wifi-p2p: fix spelling of "timeout" argument in "StartFind"
...
Also in the documentation it's spelled as "timeout"
Fixes: dd0c59c468
2019-02-05 13:55:32 +01:00
Thomas Haller
4aa34043da
wifi-p2p: fix getting timeout argument from a{sv} variant for "StartFind"
...
Fixes: dd0c59c468
2019-02-05 13:55:32 +01:00
Benjamin Berg
60691d76ad
libnm: Add async start/stop routines for P2P find operations
...
These were dropped earlier as new sync API must not be the primary way
of calling new routines in libnm.
In this particular case the DBus calls are simple and unlikely to fail.
Most users should use the normal async API and call the finish routine.
However, if the API user is not interested in the result, then they can
simply set the callback to NULL to ignore it.
[thaller@redhat.com: added options argument to start-find method]
2019-02-05 13:55:13 +01:00
Thomas Haller
f1714b485d
gitlab-ci: minor cleanup of "contrib/scripts/nm-ci-run.sh" script
2019-02-05 13:49:20 +01:00
Thomas Haller
f444188b63
wwan: avoid deprecated mm_simple_connect_properties_set_number()
...
Since 1.10, mm_simple_connect_properties_set_number() is deprecated
and calling it does nothing. Moreover, it triggers a
"deprecated-declarations" warning.
Avoid calling it.
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/issues/99
55c3026643
2019-02-05 13:42:36 +01:00
Thomas Haller
8cb2d193e4
build/autotools: dist test files for ifcfg-rh tests
...
Fixes: 386e75ee04
2019-02-05 12:54:03 +01:00
Thomas Haller
ce2f3d8c1e
man: explain purpose of connectivity checking in man NetworkManager.conf
2019-02-05 11:12:07 +01:00
Thomas Haller
dc1187a161
clients/tests: fix client tests
...
Fixes: d081aa1d84
2019-02-05 11:12:07 +01:00
Lubomir Rintel
d081aa1d84
merge: branch 'lr/sae'
...
This adds support for SAE authentication as used for 802.11s Meshing, but
also WPA3-Personal.
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/9
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/65
2019-02-05 10:21:25 +01:00
Lubomir Rintel
ca58bcca0c
cli: verify connections before sending them over to daemon
...
This way we generate the error messages on the client side and therefore
can localize them.
2019-02-05 10:20:30 +01:00
Lubomir Rintel
fab1116494
clients/cli: if the AP supports SAE, claim WPA3 support
...
RSN with SAE is what's called WPA3-Personal.
Also, if there's neither PSK nor 802.1x, it's not WPA2.
2019-02-05 10:20:30 +01:00
Lubomir Rintel
640164e979
clients/test: vary RSN capabilities across APs
...
This allows us to test if we distinguish WPA1, WPA2 and WPA3 in the
client.
2019-02-05 10:20:29 +01:00
Lubomir Rintel
245c9c93d1
clients/cli: don't translate abbreviations
2019-02-05 10:20:27 +01:00
Lubomir Rintel
2344e958cf
client/cli: send a PSK when using SAE
2019-02-05 10:20:27 +01:00
Lubomir Rintel
998ebe731e
client/cli: add support for SAE key management flag
2019-02-05 10:20:27 +01:00
Lubomir Rintel
ab0d348792
client/devices: get rid of useless g_strdup()s
...
And, while at that, add a hint to the developer adding new items. It's
helps avoid a mistake that I believe is common (because I just made it
twice...).
2019-02-05 10:20:27 +01:00
Lubomir Rintel
fa2fe3688d
clients/secret-agent: respond to SAE password requests
2019-02-05 10:20:27 +01:00
Lubomir Rintel
fd64417f1d
clients/meta-setting-desc: allow setting wifi-sec.key-mgmt to SAE
2019-02-05 10:20:27 +01:00
Lubomir Rintel
8c91e8deaa
wifi/utils: complete key-mgmt=sae for SAE capable APs
...
Ordered before wpa-psk so that if the AP supports both WPA-PSK and SAE,
SAE ends up preferred.
2019-02-05 10:20:27 +01:00
Lubomir Rintel
386e75ee04
settings/ifcfg: add support for KEY_MGMT=SAE
2019-02-05 10:20:27 +01:00
Lubomir Rintel
6640fb4b36
supplicant: add support for SAE key management
...
When SAE key managmenet is used, the supplicant can still use the "psk"
property. Only when the pass phrase doesn't conform to WPA-PSK
limitations, the sae_password must be used.
2019-02-05 10:20:27 +01:00
Lubomir Rintel
2d3e42b5a7
libnm-core/setting-wireless-security: add support for SAE key management
...
This adds support for configuring the Wi-Fi connections to use SAE. SAE
is a password-based authentication mechanism that replaces WPA-PSK in
WPA3-Personal.
The pass phrase is still stored in the "psk" property, with some
limitations lifted.
2019-02-05 10:20:27 +01:00
Lubomir Rintel
5af08ded75
wifi/ap: expose SAE capability
...
wpa_supplicant as of version 2.7 still doesn't tell us whether it
supports SAE.
Patch in review: http://lists.infradead.org/pipermail/hostap/2019-January/039338.html
2019-02-05 10:20:27 +01:00
Lubomir Rintel
04f3476029
libnm-core/dbus: add flag that indicates SAE support for an AP
2019-02-05 10:20:27 +01:00
Lubomir Rintel
49ac11f84b
clients/common: drop unuseful wifi-sec.psk validation
...
The generic connection validation produces a good result:
Error: failed to modify 802-11-wireless-security.psk: ':(' is not a valid PSK.
vs.:
Error: Failed to add 'wifi666' connection: 802-11-wireless-security.psk: property is invalid
2019-02-05 10:20:27 +01:00
Lubomir Rintel
009f756086
settings: don't allow updating a connection with invalid secrets
...
Validate them, like we do on a connection addition.
2019-02-05 10:20:27 +01:00
Lubomir Rintel
58ee6be348
man: fix a typo
2019-02-05 10:20:27 +01:00
Thomas Haller
c67ebc8abf
build/meson: add intermediate shared/nm-utils base library
...
Like also done for autotools, create and use intermediate libraries
from "shared/nm-utils/".
Also, replace "shared_dep" by "shared_nm_utils_base_dep". We don't
need super fine-grained selection of what we link. We can always
link in "shared/libnm-utils-base.a", and let the linker throw away
unsed parts.
2019-02-05 09:53:24 +01:00
Thomas Haller
15995c9700
build/meson: always set SESSION_TRACKING_SYSTEMD define
...
Like we do with autotools, otherwise we get a warning:
[576/1030] Compiling C object src/25a6634@@NetworkManager@sta/nm-session-monitor.c.o.
../src/nm-session-monitor.c:31:5: warning: "SESSION_TRACKING_SYSTEMD" is not defined, evaluates to 0 [-Wundef]
#if SESSION_TRACKING_SYSTEMD && SESSION_TRACKING_ELOGIND
^~~~~~~~~~~~~~~~~~~~~~~~
2019-02-05 09:51:27 +01:00
Thomas Haller
d3d8611066
secret-agent: merge branch 'th/secret-agent-cleanup'
...
https://github.com/NetworkManager/NetworkManager/pull/288
2019-02-05 08:42:40 +01:00
Thomas Haller
472f89da6b
wifi,clients/secret-agent: use defines for property names in secret hints
2019-02-05 08:34:23 +01:00
Thomas Haller
bd590579da
core: pass hints as strv to nm_act_request_get_secrets()
...
Extend nm_act_request_get_secrets() API to allow for the underlying
flexibility (of the API that it calls) to accept a strv list of hints.
2019-02-05 08:34:23 +01:00
Thomas Haller
787f5f7a46
clients/secret-agent: refactor code in request_secrets_from_ui() to return early
2019-02-05 08:34:23 +01:00
Thomas Haller
1a0fc8d437
clients/secret-agent: fix leaks in request_secrets_from_ui()
...
Fixes: 3bda3fb60c
2019-02-05 08:34:23 +01:00
Thomas Haller
883978ec99
clients/secret-agent: use g_hash_table_get_keys_as_array() in nm_secret_agent_simple_enable()
2019-02-05 08:34:23 +01:00
Thomas Haller
d52fd81b91
libnm/secret-agent/trivial: rename internal init-data structure
...
No "NM" prefix for internal structure.
2019-02-05 08:34:23 +01:00
Thomas Haller
43b3e19c88
libnm/secret-agent: use cleanup attribute in NMSecretAgentOldPrivate
...
Refactor memory handling to use cleanup attribute.
2019-02-05 08:34:23 +01:00