remove GSS_KRB5_NT_ENTERPRISE_NAME

git-svn-id: svn://anonsvn.mit.edu/krb5/users/lhoward/s4u@22550 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 2 insertions, 16 deletions

diff --git a/src/lib/gssapi/krb5/gssapi_krb5.c b/src/lib/gssapi/krb5/gssapi_krb5.c
index 7ec6c74..73ad896 100644
--- a/src/lib/gssapi/krb5/gssapi_krb5.c
+++ b/src/lib/gssapi/krb5/gssapi_krb5.c
@@ -141,9 +141,6 @@ const gss_OID_desc krb5_gss_oid_array[] = {
     /* gss_nt_krb5_principal.  Object identifier for a krb5_principal. Do not use. */
     {10, "\052\206\110\206\367\022\001\002\002\002"},
 
-    /* GSS_KRB5_NT_ENTERPRISE_NAME */
-    {10, "\052\206\110\206\367\022\001\002\002\003"}, /* XXX needs an assigned OID */
-
     { 0, 0 }
 };
 
@@ -153,7 +150,6 @@ const gss_OID_desc * const gss_mech_krb5_wrong        = krb5_gss_oid_array+2;
 const gss_OID_desc * const gss_nt_krb5_name           = krb5_gss_oid_array+4;
 const gss_OID_desc * const gss_nt_krb5_principal      = krb5_gss_oid_array+5;
 const gss_OID_desc * const GSS_KRB5_NT_PRINCIPAL_NAME = krb5_gss_oid_array+4;
-const gss_OID_desc * const GSS_KRB5_NT_ENTERPRISE_NAME= krb5_gss_oid_array+6;
 
 static const gss_OID_set_desc oidsets[] = {
     {1, (gss_OID) krb5_gss_oid_array+0},
diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
index e026bb4..6879c76 100644
--- a/src/lib/gssapi/krb5/import_name.c
+++ b/src/lib/gssapi/krb5/import_name.c
@@ -61,7 +61,6 @@ krb5_gss_import_name(minor_status, input_name_buffer,
 #ifndef NO_PASSWORD
     struct passwd *pw;
 #endif
-    krb5_flags flags = 0;
 
     code = krb5_gss_init_context(&context);
     if (code) {
@@ -143,9 +142,6 @@ krb5_gss_import_name(minor_status, input_name_buffer,
             g_OID_equal(input_name_type, gss_nt_krb5_name) ||
             g_OID_equal(input_name_type, gss_nt_user_name)) {
             stringrep = (char *) tmp;
-        } else if (g_OID_equal(input_name_type, GSS_KRB5_NT_ENTERPRISE_NAME)) {
-            stringrep = (char *) tmp;
-            flags |= KRB5_PRINCIPAL_PARSE_ENTERPRISE;
 #ifndef NO_PASSWORD
         } else if (g_OID_equal(input_name_type, gss_nt_machine_uid_name)) {
             uid = *(uid_t *) input_name_buffer->value;
@@ -201,7 +197,7 @@ krb5_gss_import_name(minor_status, input_name_buffer,
         /* at this point, stringrep is set, or if not, *minor_status is. */
 
         if (stringrep)
-            code = krb5_parse_name_flags(context, (char *) stringrep, 0, &princ);
+            code = krb5_parse_name(context, (char *) stringrep, &princ);
         else {
         fail_name:
             xfree(tmp);
diff --git a/src/lib/gssapi/krb5/inq_names.c b/src/lib/gssapi/krb5/inq_names.c
index 040300c..5db0ae0 100644
--- a/src/lib/gssapi/krb5/inq_names.c
+++ b/src/lib/gssapi/krb5/inq_names.c
@@ -81,10 +81,6 @@ krb5_gss_inquire_names_for_mech(minor_status, mechanism, name_types)
             ((major = generic_gss_add_oid_set_member(minor_status,
                                                      gss_nt_krb5_name,
                                                      name_types)
-            ) == GSS_S_COMPLETE) &&
-            ((major = generic_gss_add_oid_set_member(minor_status,
-                                                     GSS_KRB5_NT_ENTERPRISE_NAME,
-                                                     name_types)
             ) == GSS_S_COMPLETE)
         ) {
             major = generic_gss_add_oid_set_member(minor_status,
diff --git a/src/lib/gssapi/krb5/rel_oid.c b/src/lib/gssapi/krb5/rel_oid.c
index a9037c4..7a08da2 100644
--- a/src/lib/gssapi/krb5/rel_oid.c
+++ b/src/lib/gssapi/krb5/rel_oid.c
@@ -75,8 +75,7 @@ krb5_gss_internal_release_oid(minor_status, oid)
         (*oid != gss_mech_krb5_old) &&
         (*oid != gss_mech_krb5_wrong) &&
         (*oid != gss_nt_krb5_name) &&
-        (*oid != gss_nt_krb5_principal) &&
-        (*oid != GSS_KRB5_NT_ENTERPRISE_NAME)) {
+        (*oid != gss_nt_krb5_principal)) {
         /* We don't know about this OID */
         return(GSS_S_CONTINUE_NEEDED);
     }
diff --git a/src/lib/gssapi/libgssapi_krb5.exports b/src/lib/gssapi/libgssapi_krb5.exports
index a40b7bf..bebea76 100644
--- a/src/lib/gssapi/libgssapi_krb5.exports
+++ b/src/lib/gssapi/libgssapi_krb5.exports
@@ -7,7 +7,6 @@ GSS_C_NT_MACHINE_UID_NAME
 GSS_C_NT_STRING_UID_NAME
 GSS_C_NT_USER_NAME
 GSS_KRB5_NT_PRINCIPAL_NAME
-GSS_KRB5_NT_ENTERPRISE_NAME
 gss_accept_sec_context
 gss_acquire_cred
 gss_add_buffer_set_member