diff options
Diffstat (limited to 'libnm-core')
| -rw-r--r-- | libnm-core/nm-dbus-interface.h | 4 | ||||
| -rw-r--r-- | libnm-core/nm-dbus-types.xml | 4 | ||||
| -rw-r--r-- | libnm-core/nm-setting-connection.c | 14 | ||||
| -rw-r--r-- | libnm-core/nm-setting-ip4-config.c | 10 | ||||
| -rw-r--r-- | libnm-core/nm-setting-wired.c | 3 | ||||
| -rw-r--r-- | libnm-core/nm-utils.c | 2 |
6 files changed, 24 insertions, 13 deletions
diff --git a/libnm-core/nm-dbus-interface.h b/libnm-core/nm-dbus-interface.h index 8abc91bb..4c8e46fc 100644 --- a/libnm-core/nm-dbus-interface.h +++ b/libnm-core/nm-dbus-interface.h @@ -810,9 +810,9 @@ typedef enum { * @NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL: when creating * a new checkpoint, destroy all existing ones. * @NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS: upon rollback, - * delete any new connection added after the checkpoint. + * delete any new connection added after the checkpoint (Since: 1.6) * @NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES: upon rollback, - * disconnect any new device appeared after the checkpoint. + * disconnect any new device appeared after the checkpoint (Since: 1.6) * * The flags for CheckpointCreate call * diff --git a/libnm-core/nm-dbus-types.xml b/libnm-core/nm-dbus-types.xml index 4e30034c..c9d5d74d 100644 --- a/libnm-core/nm-dbus-types.xml +++ b/libnm-core/nm-dbus-types.xml @@ -1450,12 +1450,12 @@ <row role="constant"> <entry role="enum_member_name"><para>NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS</para><para></para></entry> <entry role="enum_member_value"><para>= <literal>0x02</literal></para><para></para></entry> - <entry role="enum_member_description"><para>upon rollback, delete any new connection added after the checkpoint.</para><para></para></entry> + <entry role="enum_member_description"><para>upon rollback, delete any new connection added after the checkpoint (Since: 1.6)</para><para></para></entry> </row> <row role="constant"> <entry role="enum_member_name"><para>NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES</para><para></para></entry> <entry role="enum_member_value"><para>= <literal>0x04</literal></para><para></para></entry> - <entry role="enum_member_description"><para>upon rollback, disconnect any new device appeared after the checkpoint.</para><para></para></entry> + <entry role="enum_member_description"><para>upon rollback, disconnect any new device appeared after the checkpoint (Since: 1.6)</para><para></para></entry> </row> </tbody> </tgroup> diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 38f3bf44..bf205e9a 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -1561,9 +1561,10 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * An array of strings defining what access a given user has to this * connection. If this is %NULL or empty, all users are allowed to access - * this connection. Otherwise a user is allowed to access this connection - * if and only if they are in this list. Each entry is of the form - * "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". + * this connection; otherwise users are allowed if and only if they are in + * this list. When this is not empty, the connection can be active only when + * one of the specified users is logged into an active session. Each entry + * is of the form "[type]:[id]:[reserved]"; for example, "user:dcbw:blah". * * At this time only the "user" [type] is allowed. Any other values are * ignored and reserved for future use. [id] is the username that this @@ -1574,8 +1575,9 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) /* ---ifcfg-rh--- * property: permissions * variable: USERS(+) - * description: USERS restrict the access for this conenction to certain - * users only. + * description: Restrict to certain users the access to this connection, and + * allow the connection to be active only when at least one of the + * specified users is logged into an active session. * example: USERS="joe bob" * ---end--- */ @@ -1793,7 +1795,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) **/ /* ---ifcfg-rh--- * property: autoconnect-slaves - * variable: AUTOCONNECT-SLAVES(+) + * variable: AUTOCONNECT_SLAVES(+) * default: missing variable means global default * description: Whether slaves of this connection should be auto-connected * when this connection is activated. diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 3a366161..3f396b75 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -696,12 +696,20 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class) * * A string sent to the DHCP server to identify the local machine which the * DHCP server may use to customize the DHCP lease and options. + * When the property is a hex string ('aa:bb:cc') it is interpreted as a + * binary client ID, in which case the first byte is assumed to be the + * 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be + * an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet + * ARP type and the rest is a MAC address). + * If the property is not a hex string it is considered as a + * non-hardware-address client ID and the 'type' field is set to 0. **/ /* ---ifcfg-rh--- * property: dhcp-client-id * variable: DHCP_CLIENT_ID(+) * description: A string sent to the DHCP server to identify the local machine. - * example: DHCP_CLIENT_ID=ax-srv-1 + * A binary value can be specified using hex notation ('aa:bb:cc'). + * example: DHCP_CLIENT_ID=ax-srv-1; DHCP_CLIENT_ID=01:44:44:44:44:44:44" * ---end--- */ g_object_class_install_property diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 5569f558..5476e357 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -1150,7 +1150,8 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_wired_class) * Beside explicitly specifing a MAC address, the special values "preserve", "permanent", * "random" and "stable" are supported. * "preserve" means not to touch the MAC address on activation. - * "permanent" means to use the permanent hardware address of the device. + * "permanent" means to use the permanent hardware address if the device + * has one (otherwise this is treated as "preserve"). * "random" creates a random MAC address on each connect. * "stable" creates a hashed MAC address based on connection.stable-id and a * machine dependent key. diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 1feee7ac..8a80d2d3 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -3262,7 +3262,7 @@ nm_utils_hwaddr_ntoa_buf (gconstpointer addr, gsize addr_len, gboolean upper_cas if (buf_len < addr_len * 3) g_return_val_if_reached (NULL); - _bin2str (addr, addr_len, ':', TRUE, buf); + _bin2str (addr, addr_len, ':', upper_case, buf); return buf; } |