diff options
Diffstat (limited to 'src/libnm-core-impl/nm-setting-connection.c')
| -rw-r--r-- | src/libnm-core-impl/nm-setting-connection.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c index bc14c767..0ec36a89 100644 --- a/src/libnm-core-impl/nm-setting-connection.c +++ b/src/libnm-core-impl/nm-setting-connection.c @@ -339,7 +339,7 @@ nm_setting_connection_get_permission(NMSettingConnection *setting, g_return_val_if_fail(idx < nm_g_array_len(priv->permissions), FALSE); - permission = &g_array_index(priv->permissions, Permission, idx); + permission = &nm_g_array_index(priv->permissions, Permission, idx); switch (permission->ptype) { case PERM_TYPE_USER: NM_SET_OUT(out_ptype, NM_SETTINGS_CONNECTION_PERMISSION_USER); @@ -384,7 +384,7 @@ nm_setting_connection_permissions_user_allowed(NMSettingConnection *setting, con } for (i = 0; i < priv->permissions->len; i++) { - const Permission *permission = &g_array_index(priv->permissions, Permission, i); + const Permission *permission = &nm_g_array_index(priv->permissions, Permission, i); if (permission->ptype == PERM_TYPE_USER && nm_streq(permission->item, uname)) return TRUE; @@ -440,7 +440,7 @@ nm_setting_connection_add_permission(NMSettingConnection *setting, } for (i = 0; i < priv->permissions->len; i++) { - const Permission *permission = &g_array_index(priv->permissions, Permission, i); + const Permission *permission = &nm_g_array_index(priv->permissions, Permission, i); if (permission->ptype == PERM_TYPE_USER && nm_streq(permission->item, pitem)) return TRUE; @@ -511,7 +511,7 @@ nm_setting_connection_remove_permission_by_value(NMSettingConnection *setting, priv = NM_SETTING_CONNECTION_GET_PRIVATE(setting); if (priv->permissions) { for (i = 0; i < priv->permissions->len; i++) { - const Permission *permission = &g_array_index(priv->permissions, Permission, i); + const Permission *permission = &nm_g_array_index(priv->permissions, Permission, i); if (permission->ptype == PERM_TYPE_USER && nm_streq(permission->item, pitem)) { g_array_remove_index(priv->permissions, i); @@ -1023,7 +1023,7 @@ nm_setting_connection_get_dns_over_tls(NMSettingConnection *setting) * * Returns: the #NMSettingConnection:mptcp-flags property of the setting. * - * Since: 1.42, 1.40.4 + * Since: 1.42 **/ NMMptcpFlags nm_setting_connection_get_mptcp_flags(NMSettingConnection *setting) @@ -1490,7 +1490,7 @@ after_interface_name: guint i; for (i = 0; i < priv->permissions->len; i++) { - const Permission *permissions = &g_array_index(priv->permissions, Permission, i); + const Permission *permissions = &nm_g_array_index(priv->permissions, Permission, i); if (permissions->ptype != PERM_TYPE_USER) { g_set_error_literal(error, @@ -1709,7 +1709,7 @@ get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) strv = g_new(char *, l + 1u); for (i = 0; i < l; i++) - strv[i] = _permission_to_string(&g_array_index(priv->permissions, Permission, i)); + strv[i] = _permission_to_string(&nm_g_array_index(priv->permissions, Permission, i)); strv[i] = NULL; g_value_take_boxed(value, strv); @@ -1848,6 +1848,18 @@ nm_setting_connection_class_init(NMSettingConnectionClass *klass) * be generated by nm_utils_uuid_generate() or * nm_uuid_generate_from_string_str(). **/ + /* ---nmcli--- + * property: uuid + * format: a valid RFC4122 universally unique identifier (UUID). + * description: The connection.uuid is the real identifier of a profile. + * It cannot change and it must be unique. It is therefore often best + * to refer to a profile by UUID, for example with `nmcli connection up uuid $UUID`. + * + * The UUID cannot be changed, except in offline mode. In that case, + * the special values "new", "generate" and "" are allowed to generate + * a new random UUID. + * ---end--- + */ /* ---ifcfg-rh--- * property: uuid * variable: UUID(+) |