From 57256a3ae56068501070fecdf434357f6ff9eda7 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Wed, 30 Jul 1997 03:07:37 +0000 Subject: [PATCH] inq_names.c (krb5_gss_inquire_names_for_mech): Add the the new OID value for the host-based service name and the exported name OID to the list of OID's supported by this mechanism. import_name.c (krb5_gss_import_name): Add support for the new OID value for the host-based service name. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10141 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/gssapi/krb5/ChangeLog | 10 ++++++++++ src/lib/gssapi/krb5/import_name.c | 3 ++- src/lib/gssapi/krb5/inq_names.c | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index ad1cb04f4..ec04ee0f4 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,13 @@ +Tue Jul 29 22:56:04 1997 Theodore Y. Ts'o + + * inq_names.c (krb5_gss_inquire_names_for_mech): Add the + the new OID value for the host-based service name and + the exported name OID to the list of OID's supported by + this mechanism. + + * import_name.c (krb5_gss_import_name): Add support for the new + OID value for the host-based service name. + Mon Jul 21 20:32:14 1997 Ezra Peisach * accept_sec_context.c (krb5_gss_accept_sec_context): Initialize diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c index d16cf45e3..92972dc53 100644 --- a/src/lib/gssapi/krb5/import_name.c +++ b/src/lib/gssapi/krb5/import_name.c @@ -71,7 +71,8 @@ krb5_gss_import_name(minor_status, input_name_buffer, /* Go find the appropriate string rep to pass into parse_name */ if ((input_name_type != GSS_C_NULL_OID) && - g_OID_equal(input_name_type, gss_nt_service_name)) { + (g_OID_equal(input_name_type, gss_nt_service_name) || + g_OID_equal(input_name_type, gss_nt_service_name_v2))) { char *service, *host; if ((tmp = diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c index 948346dc6..9c5f47450 100644 --- a/src/lib/gssapi/krb5/inq_names.c +++ b/src/lib/gssapi/krb5/inq_names.c @@ -70,6 +70,14 @@ krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types) (gss_OID) gss_nt_service_name, name_types) ) == GSS_S_COMPLETE) && + ((major = gss_add_oid_set_member(minor_status, + (gss_OID) gss_nt_service_name_v2, + name_types) + ) == GSS_S_COMPLETE) && + ((major = gss_add_oid_set_member(minor_status, + (gss_OID) gss_nt_exported_name, + name_types) + ) == GSS_S_COMPLETE) && ((major = gss_add_oid_set_member(minor_status, (gss_OID) gss_nt_krb5_name, name_types) -- 2.26.2