From 497a561b4d12efabb062d1ffd6dd12877af7954f Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 17 May 2021 10:09:01 +1000 Subject: [PATCH] gss: avoid string concatenation warning in error message init Some compilers with -Wstring-concatenation enabled warned about a suspicious concatenation of string literals in the initialization of the GSS-API error message array. At the expense of a long line, avoid this warning but explicitly concatenating the offending string literal. Fixes: #775 --- lib/gssapi/krb5/display_status.c | 3 +-- lib/gssapi/mech/gss_display_status.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/gssapi/krb5/display_status.c b/lib/gssapi/krb5/display_status.c index d53f7f6d8..cca5f677e 100644 --- a/lib/gssapi/krb5/display_status.c +++ b/lib/gssapi/krb5/display_status.c @@ -64,8 +64,7 @@ routine_error(OM_uint32 v) "Incorrect channel bindings were supplied", "An invalid status code was supplied", "A token had an invalid MIC", - "No credentials were supplied, " - "or the credentials were unavailable or inaccessible.", + "No credentials were supplied, or the credentials were unavailable or inaccessible.", "No context has been established", "A token was invalid", "A credential was invalid", diff --git a/lib/gssapi/mech/gss_display_status.c b/lib/gssapi/mech/gss_display_status.c index 7b3afafff..dca5d1b42 100644 --- a/lib/gssapi/mech/gss_display_status.c +++ b/lib/gssapi/mech/gss_display_status.c @@ -91,8 +91,7 @@ routine_error(OM_uint32 v) "Incorrect channel bindings were supplied", "An invalid status code was supplied", "A token had an invalid MIC", - "No credentials were supplied, " - "or the credentials were unavailable or inaccessible.", + "No credentials were supplied, or the credentials were unavailable or inaccessible.", "No context has been established", "A token was invalid", "A credential was invalid",