diff mbox series

[01/12] ui: Replace the word 'whitelist'

Message ID 20210202205824.1085853-2-philmd@redhat.com
State New
Headers show
Series misc: Replace the words 'blacklist/whitelist' | expand

Commit Message

Philippe Mathieu-Daudé Feb. 2, 2021, 8:58 p.m. UTC
Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the words "whitelist"
appropriately.

[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 ui/console.c       | 2 +-
 ui/vnc-auth-sasl.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Gerd Hoffmann Feb. 3, 2021, 9:43 a.m. UTC | #1
On Tue, Feb 02, 2021 at 09:58:13PM +0100, Philippe Mathieu-Daudé wrote:
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the words "whitelist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Daniel P. Berrangé Feb. 3, 2021, 10:04 a.m. UTC | #2
On Tue, Feb 02, 2021 at 09:58:13PM +0100, Philippe Mathieu-Daudé wrote:
> Follow the inclusive terminology from the "Conscious Language in your
> Open Source Projects" guidelines [*] and replace the words "whitelist"
> appropriately.
> 
> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  ui/console.c       | 2 +-
>  ui/vnc-auth-sasl.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ui/console.c b/ui/console.c
> index d80ce7037c3..9e13bf9020f 100644
> --- a/ui/console.c
> +++ b/ui/console.c
> @@ -1661,7 +1661,7 @@ bool dpy_gfx_check_format(QemuConsole *con,
>                  return false;
>              }
>          } else {
> -            /* default is to whitelist native 32 bpp only */
> +            /* default is to allow native 32 bpp only */
>              if (format != qemu_default_pixman_format(32, true)) {
>                  return false;
>              }
> diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
> index f67111a3662..dde4b8d4144 100644
> --- a/ui/vnc-auth-sasl.c
> +++ b/ui/vnc-auth-sasl.c
> @@ -288,7 +288,7 @@ static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t le
>              goto authreject;
>          }
>  
> -        /* Check username whitelist ACL */
> +        /* Check username allowlist ACL */

ACL expands to "access control list" so this original comment
was already redundant, and so is the replacement. Using
acronyms is bad practice, so I'd suggest we go for

  "Check the username access control list"

>          if (vnc_auth_sasl_check_access(vs) < 0) {
>              goto authreject;
>          }
> @@ -409,7 +409,7 @@ static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t l
>              goto authreject;
>          }
>  
> -        /* Check username whitelist ACL */
> +        /* Check username allowlist ACL */

Likewise

>          if (vnc_auth_sasl_check_access(vs) < 0) {
>              goto authreject;
>          }

Regards,
Daniel
Philippe Mathieu-Daudé Feb. 4, 2021, 9:04 a.m. UTC | #3
On 2/3/21 11:04 AM, Daniel P. Berrangé wrote:
> On Tue, Feb 02, 2021 at 09:58:13PM +0100, Philippe Mathieu-Daudé wrote:
>> Follow the inclusive terminology from the "Conscious Language in your
>> Open Source Projects" guidelines [*] and replace the words "whitelist"
>> appropriately.
>>
>> [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
>>
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>>  ui/console.c       | 2 +-
>>  ui/vnc-auth-sasl.c | 4 ++--
>>  2 files changed, 3 insertions(+), 3 deletions(-)
>>

>> diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
>> index f67111a3662..dde4b8d4144 100644
>> --- a/ui/vnc-auth-sasl.c
>> +++ b/ui/vnc-auth-sasl.c
>> @@ -288,7 +288,7 @@ static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t le
>>              goto authreject;
>>          }
>>  
>> -        /* Check username whitelist ACL */
>> +        /* Check username allowlist ACL */
> 
> ACL expands to "access control list" so this original comment
> was already redundant, and so is the replacement. Using
> acronyms is bad practice, so I'd suggest we go for
> 
>   "Check the username access control list"

OK will do, thanks.
diff mbox series

Patch

diff --git a/ui/console.c b/ui/console.c
index d80ce7037c3..9e13bf9020f 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1661,7 +1661,7 @@  bool dpy_gfx_check_format(QemuConsole *con,
                 return false;
             }
         } else {
-            /* default is to whitelist native 32 bpp only */
+            /* default is to allow native 32 bpp only */
             if (format != qemu_default_pixman_format(32, true)) {
                 return false;
             }
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index f67111a3662..dde4b8d4144 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -288,7 +288,7 @@  static int protocol_client_auth_sasl_step(VncState *vs, uint8_t *data, size_t le
             goto authreject;
         }
 
-        /* Check username whitelist ACL */
+        /* Check username allowlist ACL */
         if (vnc_auth_sasl_check_access(vs) < 0) {
             goto authreject;
         }
@@ -409,7 +409,7 @@  static int protocol_client_auth_sasl_start(VncState *vs, uint8_t *data, size_t l
             goto authreject;
         }
 
-        /* Check username whitelist ACL */
+        /* Check username allowlist ACL */
         if (vnc_auth_sasl_check_access(vs) < 0) {
             goto authreject;
         }