summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/krb5/ChangeLog10
-rw-r--r--src/lib/gssapi/krb5/import_name.c3
-rw-r--r--src/lib/gssapi/krb5/inq_names.c8
3 files changed, 20 insertions, 1 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ad1cb04f46..ec04ee0f4d 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 <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 d16cf45e3c..92972dc53f 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 948346dc6c..9c5f474509 100644
--- a/src/lib/gssapi/krb5/inq_names.c
+++ b/src/lib/gssapi/krb5/inq_names.c
@@ -71,6 +71,14 @@ krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
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)
) == GSS_S_COMPLETE)