fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-06-19 08:58:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cloud-setup: fix constructing URL from NM_CLOUD_SETUP_EC2_HOST in _ec2_base()

Browse source
This commit is contained in:
Thomas Haller 2021-07-12 18:08:28 +02:00
parent 8dddb7544f
commit 78adf4796e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/nm-cloud-setup/nmcs-provider-ec2.c
View file

@ -30,8 +30,9 @@ again:
* Consider this private API! */
base = g_getenv(NMCS_ENV_VARIABLE("NM_CLOUD_SETUP_EC2_HOST"));
if (base && base[0] && !strchr(base, '/')) {
if (NM_STR_HAS_PREFIX(base, "http://") || NM_STR_HAS_PREFIX(base, "https://"))
if (!nm_str_is_empty(base)) {
if (NM_STR_HAS_PREFIX(base, "http://") || NM_STR_HAS_PREFIX(base, "https://")
|| strchr(base, '/'))
base = g_intern_string(base);
else {
gs_free char *s = NULL;
@ -40,7 +41,7 @@ again:
base = g_intern_string(s);
}
}
if (!base)
if (nm_str_is_empty(base))
base = NM_EC2_BASE;
nm_assert(!NM_STR_HAS_SUFFIX(base, "/"));