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

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ad1cb04f4693a782e6c682c37987ebd4821084f2..ec04ee0f4db57c815320997e42ea782c783608fd 100644 (file)
--- 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  <tytso@mit.edu>
+
+       * 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  <epeisach@mit.edu>
 
        * 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 d16cf45e3c541adc4a57ae26381f0801fd5d2a2e..92972dc53fc517eafb320bf4e16c5ab91cbeeeda 100644 (file)
--- 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 948346dc6c28b82f6227bda2ad5bf28927158bf4..9c5f4745091206ac5887255b8aaf0f6f0e7b9a1c 100644 (file)
--- 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)