From 27cc30d38e86fde3d97df64842367c06ae64cfd4 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 21 Jul 2011 11:46:15 -0400 Subject: [PATCH] GSS_C_ATTR_LOCAL_LOGIN_USER Be consistent with other GSSAPI global variables. GSS_C_ATTR_LOCAL_LOGIN_USER becomes a macro in gssapi.h that refers to an exported variable __gss_c_attr_local_login_user Change-Id: I2661d74cd0f760780f75b35f92d6b4f9112080dc --- lib/gssapi/gssapi/gssapi.h | 3 ++- lib/gssapi/mech/gss_authorize_localname.c | 2 +- lib/gssapi/version-script.map | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h index fa53a29d2..4eb8362a4 100644 --- a/lib/gssapi/gssapi/gssapi.h +++ b/lib/gssapi/gssapi/gssapi.h @@ -1041,7 +1041,8 @@ GSSAPI_LIB_FUNCTION int GSSAPI_LIB_CALL gss_userok(const gss_name_t name, const char *user); -extern GSSAPI_LIB_VARIABLE gss_buffer_t GSS_C_ATTR_LOCAL_LOGIN_USER; +extern GSSAPI_LIB_VARIABLE gss_buffer_t __gss_c_attr_local_login_user; +#define GSS_C_ATTR_LOCAL_LOGIN_USER (&__gss_c_attr_local_login_user) /* * Naming extensions diff --git a/lib/gssapi/mech/gss_authorize_localname.c b/lib/gssapi/mech/gss_authorize_localname.c index 9d55abfda..b0281208a 100644 --- a/lib/gssapi/mech/gss_authorize_localname.c +++ b/lib/gssapi/mech/gss_authorize_localname.c @@ -37,7 +37,7 @@ static gss_buffer_desc localLoginUserAttr = { "local-login-user" }; -gss_buffer_t GSSAPI_LIB_VARIABLE GSS_C_ATTR_LOCAL_LOGIN_USER = &localLoginUserAttr; +gss_buffer_t GSSAPI_LIB_VARIABLE __gss_c_attr_local_login_user = &localLoginUserAttr; static OM_uint32 mech_authorize_localname(OM_uint32 *minor_status, diff --git a/lib/gssapi/version-script.map b/lib/gssapi/version-script.map index ebd8ee21a..bcb79bf8f 100644 --- a/lib/gssapi/version-script.map +++ b/lib/gssapi/version-script.map @@ -14,7 +14,7 @@ HEIMDAL_GSS_2.0 { __gss_c_attr_stream_sizes_oid_desc; __gss_c_cred_password_oid_desc; __gss_c_cred_certificate_oid_desc; - GSS_C_ATTR_LOCAL_LOGIN_USER; + __gss_c_attr_local_login_user; gss_accept_sec_context; gss_acquire_cred; gss_acquire_cred_with_password;