From bdc9112651f27d893d3c94eb58a0416a99679613 Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Thu, 25 Nov 2010 18:36:55 -0800 Subject: [PATCH] add missing symbols --- lib/gssapi/gssapi/gssapi_oid.h | 8 +++++++- lib/gssapi/krb5/set_cred_option.c | 9 --------- lib/gssapi/mech/gss_oid.c | 8 +++++++- lib/gssapi/oid.txt | 7 +++---- 4 files changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/gssapi/gssapi/gssapi_oid.h b/lib/gssapi/gssapi/gssapi_oid.h index aa8b00d24..2c0e7b3f4 100644 --- a/lib/gssapi/gssapi/gssapi_oid.h +++ b/lib/gssapi/gssapi/gssapi_oid.h @@ -23,7 +23,7 @@ extern gss_OID_desc __gss_krb5_export_lucid_context_x_oid_desc; #define GSS_KRB5_EXPORT_LUCID_CONTEXT_X (&__gss_krb5_export_lucid_context_x_oid_desc) extern gss_OID_desc __gss_krb5_export_lucid_context_v1_x_oid_desc; -#define GSS_KRB5_EXPORT_LUCID_CONTEXT_v1_X (&__gss_krb5_export_lucid_context_v1_x_oid_desc) +#define GSS_KRB5_EXPORT_LUCID_CONTEXT_V1_X (&__gss_krb5_export_lucid_context_v1_x_oid_desc) extern gss_OID_desc __gss_krb5_set_dns_canonicalize_x_oid_desc; #define GSS_KRB5_SET_DNS_CANONICALIZE_X (&__gss_krb5_set_dns_canonicalize_x_oid_desc) @@ -91,6 +91,12 @@ extern gss_OID_desc __gss_c_ntlm_session_key_oid_desc; extern gss_OID_desc __gss_c_ntlm_force_v1_oid_desc; #define GSS_C_NTLM_FORCE_V1 (&__gss_c_ntlm_force_v1_oid_desc) +extern gss_OID_desc __gss_krb5_cred_no_ci_flags_x_oid_desc; +#define GSS_KRB5_CRED_NO_CI_FLAGS_X (&__gss_krb5_cred_no_ci_flags_x_oid_desc) + +extern gss_OID_desc __gss_krb5_import_cred_x_oid_desc; +#define GSS_KRB5_IMPORT_CRED_X (&__gss_krb5_import_cred_x_oid_desc) + /* glue for gss_inquire_saslname_for_mech */ extern gss_OID_desc __gss_ma_sasl_mech_name_oid_desc; #define GSS_MA_SASL_MECH_NAME (&__gss_ma_sasl_mech_name_oid_desc) diff --git a/lib/gssapi/krb5/set_cred_option.c b/lib/gssapi/krb5/set_cred_option.c index d6255bacb..5ff6172fb 100644 --- a/lib/gssapi/krb5/set_cred_option.c +++ b/lib/gssapi/krb5/set_cred_option.c @@ -32,15 +32,6 @@ #include "gsskrb5_locl.h" -/* 1.2.752.43.13.17 */ -gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_cred_no_ci_flags_x_oid_desc = -{6, rk_UNCONST("\x2a\x85\x70\x2b\x0d\x11")}; - -/* 1.2.752.43.13.18 */ -gss_OID_desc GSSAPI_LIB_VARIABLE __gss_krb5_import_cred_x_oid_desc = -{6, rk_UNCONST("\x2a\x85\x70\x2b\x0d\x12")}; - - static OM_uint32 import_cred(OM_uint32 *minor_status, krb5_context context, diff --git a/lib/gssapi/mech/gss_oid.c b/lib/gssapi/mech/gss_oid.c index f39978cf7..381f78ff8 100644 --- a/lib/gssapi/mech/gss_oid.c +++ b/lib/gssapi/mech/gss_oid.c @@ -18,7 +18,7 @@ gss_OID_desc __gss_krb5_register_acceptor_identity_x_oid_desc = { 6, "\x2a\xf0\x /* GSS_KRB5_EXPORT_LUCID_CONTEXT_X - 1.2.752.43.13.6 */ gss_OID_desc __gss_krb5_export_lucid_context_x_oid_desc = { 6, "\x2a\xf0\x05\x2b\x0d\x06" }; -/* GSS_KRB5_EXPORT_LUCID_CONTEXT_v1_X - 1.2.752.43.13.6.1 */ +/* GSS_KRB5_EXPORT_LUCID_CONTEXT_V1_X - 1.2.752.43.13.6.1 */ gss_OID_desc __gss_krb5_export_lucid_context_v1_x_oid_desc = { 7, "\x2a\xf0\x05\x2b\x0d\x06\x01" }; /* GSS_KRB5_SET_DNS_CANONICALIZE_X - 1.2.752.43.13.7 */ @@ -87,6 +87,12 @@ gss_OID_desc __gss_c_ntlm_session_key_oid_desc = { 6, "\x2a\xf0\x05\x2b\x0d\x1b" /* GSS_C_NTLM_FORCE_V1 - 1.2.752.43.13.28 */ gss_OID_desc __gss_c_ntlm_force_v1_oid_desc = { 6, "\x2a\xf0\x05\x2b\x0d\x1c" }; +/* GSS_KRB5_CRED_NO_CI_FLAGS_X - 1.2.752.43.13.29 */ +gss_OID_desc __gss_krb5_cred_no_ci_flags_x_oid_desc = { 6, "\x2a\xf0\x05\x2b\x0d\x1d" }; + +/* GSS_KRB5_IMPORT_CRED_X - 1.2.752.43.13.30 */ +gss_OID_desc __gss_krb5_import_cred_x_oid_desc = { 6, "\x2a\xf0\x05\x2b\x0d\x1e" }; + /* GSS_MA_SASL_MECH_NAME - 1.2.752.43.13.28 */ gss_OID_desc __gss_ma_sasl_mech_name_oid_desc = { 6, "\x2a\xf0\x05\x2b\x0d\x1c" }; diff --git a/lib/gssapi/oid.txt b/lib/gssapi/oid.txt index 11a044925..1e8ab4ec3 100644 --- a/lib/gssapi/oid.txt +++ b/lib/gssapi/oid.txt @@ -10,7 +10,7 @@ oid base GSS_KRB5_EXTRACT_AUTHZ_DATA_FROM_SEC_CONTEXT_X 1.2.752.43.13.3 oid base GSS_KRB5_COMPAT_DES3_MIC_X 1.2.752.43.13.4 oid base GSS_KRB5_REGISTER_ACCEPTOR_IDENTITY_X 1.2.752.43.13.5 oid base GSS_KRB5_EXPORT_LUCID_CONTEXT_X 1.2.752.43.13.6 -oid base GSS_KRB5_EXPORT_LUCID_CONTEXT_v1_X 1.2.752.43.13.6.1 +oid base GSS_KRB5_EXPORT_LUCID_CONTEXT_V1_X 1.2.752.43.13.6.1 oid base GSS_KRB5_SET_DNS_CANONICALIZE_X 1.2.752.43.13.7 oid base GSS_KRB5_GET_SUBKEY_X 1.2.752.43.13.8 oid base GSS_KRB5_GET_INITIATOR_SUBKEY_X 1.2.752.43.13.9 @@ -33,6 +33,8 @@ oid base GSS_C_NTLM_V1 1.2.752.43.13.25 oid base GSS_C_NTLM_V2 1.2.752.43.13.26 oid base GSS_C_NTLM_SESSION_KEY 1.2.752.43.13.27 oid base GSS_C_NTLM_FORCE_V1 1.2.752.43.13.28 +oid base GSS_KRB5_CRED_NO_CI_FLAGS_X 1.2.752.43.13.29 +oid base GSS_KRB5_IMPORT_CRED_X 1.2.752.43.13.30 # /* glue for gss_inquire_saslname_for_mech */ oid base GSS_MA_SASL_MECH_NAME 1.2.752.43.13.28 @@ -44,6 +46,3 @@ oid base GSS_MA_SASL_MECH_NAME 1.2.752.43.13.28 oid base GSS_SASL_DIGEST_MD5_MECHANISM 1.2.752.43.14.1 oid base GSS_C_PEER_HAS_UPDATED_SPNEGO 1.3.6.1.4.1.9513.19.5 - -gss_OID_desc GSSAPI_LIB_VARIABLE ___oid_desc = - {9, (void *)"\x2b\x06\x01\x04\x01\xa9\x4a\x13\x05"};