From afab2ff86778340fc54f532c2dcf2d383f393a48 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Fri, 31 Jul 2015 15:01:07 +1200 Subject: [PATCH] GSSAPI: use rk_UNCONST() on password and cert oid These missed out on the rk_UNCONST()ification by virtue of being added in a parallel branch. In the diagram below, they got added in 02cf28e, while the rk_UNCONSTs were added in f5f9014. * cc47c8f Turn on -Wextra -Wno-sign-compare -Wno-unused-paramter and fix issues. * 3069d80 Merge branch 'master' into lukeh/acquire-cred-ex |\ | * f5f9014 Warning fixes from Christos Zoulas * | 02cf28e implement gss_acquire_cred_ex with password support |/ * 2170219 add more oids rk_UNCONST amounts to a cast to (void *), removing const. Signed-off-by: Douglas Bagnall --- lib/gssapi/mech/gss_oid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/gssapi/mech/gss_oid.c b/lib/gssapi/mech/gss_oid.c index de70cca6a..a2d3bca44 100644 --- a/lib/gssapi/mech/gss_oid.c +++ b/lib/gssapi/mech/gss_oid.c @@ -104,10 +104,10 @@ gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_ma_mech_name_oid_desc = { 6, rk_UNCONST gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_ma_mech_description_oid_desc = { 6, rk_UNCONST("\x2a\x85\x70\x2b\x0d\x66") }; /* GSS_C_CRED_PASSWORD - 1.2.752.43.13.200 */ -gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_password_oid_desc = { 7, "\x2a\x85\x70\x2b\x0d\x81\x48" }; +gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_password_oid_desc = { 7, rk_UNCONST("\x2a\x85\x70\x2b\x0d\x81\x48") }; /* GSS_C_CRED_CERTIFICATE - 1.2.752.43.13.201 */ -gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_certificate_oid_desc = { 7, "\x2a\x85\x70\x2b\x0d\x81\x49" }; +gss_OID_desc GSSAPI_LIB_VARIABLE __gss_c_cred_certificate_oid_desc = { 7, rk_UNCONST("\x2a\x85\x70\x2b\x0d\x81\x49") }; /* GSS_SASL_DIGEST_MD5_MECHANISM - 1.2.752.43.14.1 */ gss_OID_desc GSSAPI_LIB_VARIABLE __gss_sasl_digest_md5_mechanism_oid_desc = { 6, rk_UNCONST("\x2a\x85\x70\x2b\x0e\x01") }; -- 2.11.4.GIT