remove final, unknown argument to gss_inquire_name per ietf-kitten discussion

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

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index bac2b0cfe9b130d9ff95522a043817246c492e8a..6f000aaf924bf72ef84251db9cd98eabdba6a289 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -1380,8 +1380,7 @@ krb5_authdata_get_attribute_types
 (krb5_context kcontext,
  krb5_authdata_context context,
  krb5_data **verified,
- krb5_data **asserted,
- krb5_data **all_attrs);
+ krb5_data **asserted);
 
 krb5_error_code KRB5_CALLCONV krb5_authdata_get_attribute
 (krb5_context kcontext,

diff --git a/src/include/krb5/authdata_plugin.h b/src/include/krb5/authdata_plugin.h
index 328961667dbc488cfc54ec64a9c572cd4fefe4fa..f6b945a40e865dbdf985f77cf11d875e214e131f 100644 (file)
--- a/src/include/krb5/authdata_plugin.h
+++ b/src/include/krb5/authdata_plugin.h
@@ -211,8 +211,7 @@ typedef krb5_error_code
                                            void *plugin_context,
                                            void *request_context,
                                            krb5_data **verified,
-                                           krb5_data **asserted,
-                                           krb5_data **all_attrs);
+                                           krb5_data **asserted);
 
 typedef krb5_error_code
 (*authdata_client_get_attribute_proc)(krb5_context kcontext,

diff --git a/src/lib/gssapi/generic/gssapi_ext.h b/src/lib/gssapi/generic/gssapi_ext.h
index 4a8db057b61edb6535ddbf4574e749dda33016a6..b3ba97cb8d0ad22b8a0a0aa55f201ea3adfb6293 100644 (file)
--- a/src/lib/gssapi/generic/gssapi_ext.h
+++ b/src/lib/gssapi/generic/gssapi_ext.h
@@ -302,8 +302,7 @@ OM_uint32 KRB5_CALLCONV gss_inquire_name
     int *,             /* name_is_MN */
     gss_OID *,         /* MN_mech */
     gss_buffer_set_t *,        /* authenticated */
-    gss_buffer_set_t *,        /* asserted */
-    gss_buffer_set_t * /* complete */
+    gss_buffer_set_t * /* asserted */
 );
 
 OM_uint32 KRB5_CALLCONV gss_get_name_attribute

diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index f85e03835dc5c10031e7deacd66a1e661585139b..fd7acda75a18899cadf62de417daf82762762f38 100644 (file)
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -868,8 +868,7 @@ krb5_gss_inquire_name(OM_uint32 *minor_status,
                       int *name_is_MN,
                       gss_OID *MN_mech,
                       gss_buffer_set_t *authenticated,
-                      gss_buffer_set_t *asserted,
-                      gss_buffer_set_t *complete);
+                      gss_buffer_set_t *asserted);
 
 OM_uint32
 krb5_gss_get_name_attribute(OM_uint32 *minor_status,

diff --git a/src/lib/gssapi/krb5/naming_exts.c b/src/lib/gssapi/krb5/naming_exts.c
index 94832d1031efbfc9e9f3512316affc097cf9a97a..18513660d267cd994cb99ac02e76a90bdb0ff832 100644 (file)
--- a/src/lib/gssapi/krb5/naming_exts.c
+++ b/src/lib/gssapi/krb5/naming_exts.c
@@ -215,15 +215,13 @@ krb5_gss_inquire_name(OM_uint32 *minor_status,
                       int *name_is_MN,
                       gss_OID *MN_mech,
                       gss_buffer_set_t *authenticated,
-                      gss_buffer_set_t *asserted,
-                      gss_buffer_set_t *all_attrs)
+                      gss_buffer_set_t *asserted)
 {
     krb5_context context;
     krb5_error_code code;
     krb5_gss_name_t kname;
     krb5_data *kauthenticated = NULL;
     krb5_data *kasserted = NULL;
-    krb5_data *kall_attrs = NULL;
 
     if (minor_status != NULL)
         *minor_status = 0;
@@ -232,8 +230,6 @@ krb5_gss_inquire_name(OM_uint32 *minor_status,
         *authenticated = GSS_C_NO_BUFFER_SET;
     if (asserted != NULL)
         *asserted = GSS_C_NO_BUFFER_SET;
-    if (all_attrs != NULL)
-        *all_attrs = GSS_C_NO_BUFFER_SET;
 
     code = krb5_gss_init_context(&context);
     if (code != 0) {
@@ -264,8 +260,7 @@ krb5_gss_inquire_name(OM_uint32 *minor_status,
     code = krb5_authdata_get_attribute_types(context,
                                              kname->ad_context,
                                              &kauthenticated,
-                                             &kasserted,
-                                             &kall_attrs);
+                                             &kasserted);
     if (code != 0)
         goto cleanup;
 
@@ -279,16 +274,10 @@ krb5_gss_inquire_name(OM_uint32 *minor_status,
     if (code != 0)
         goto cleanup;
 
-    code = kg_data_list_to_buffer_set_nocopy(&kall_attrs,
-                                             all_attrs);
-    if (code != 0)
-        goto cleanup;
-
 cleanup:
     k5_mutex_unlock(&kname->lock);
     krb5int_free_data_list(context, kauthenticated);
     krb5int_free_data_list(context, kasserted);
-    krb5int_free_data_list(context, kall_attrs);
 
     krb5_free_context(context);
 

diff --git a/src/lib/gssapi/mechglue/g_inq_name.c b/src/lib/gssapi/mechglue/g_inq_name.c
index 9ce5c49aa56f0785dd5e35023a64333e4849fe8f..9a08e0e841e991a348a20fb9ca1d14fe6e0e7d0e 100644 (file)
--- a/src/lib/gssapi/mechglue/g_inq_name.c
+++ b/src/lib/gssapi/mechglue/g_inq_name.c
@@ -36,8 +36,7 @@ gss_inquire_name(OM_uint32 *minor_status,
                  int *name_is_MN,
                  gss_OID *MN_mech,
                  gss_buffer_set_t *authenticated,
-                 gss_buffer_set_t *asserted,
-                 gss_buffer_set_t *complete)
+                 gss_buffer_set_t *asserted)
 {
     OM_uint32           status, tmp;
     gss_union_name_t    union_name;
@@ -57,8 +56,6 @@ gss_inquire_name(OM_uint32 *minor_status,
         *authenticated = GSS_C_NO_BUFFER_SET;
     if (asserted != NULL)
         *asserted = GSS_C_NO_BUFFER_SET;
-    if (complete != NULL)
-        *complete = GSS_C_NO_BUFFER_SET;
 
     *minor_status = 0;
     union_name = (gss_union_name_t)name;
@@ -98,8 +95,7 @@ gss_inquire_name(OM_uint32 *minor_status,
                                        NULL,
                                        NULL,
                                        authenticated,
-                                       asserted,
-                                       complete);
+                                       asserted);
     if (status != GSS_S_COMPLETE) {
         generic_gss_release_oid(&tmp, MN_mech);
         map_error(minor_status, mech);

diff --git a/src/lib/gssapi/mechglue/mglueP.h b/src/lib/gssapi/mechglue/mglueP.h
index 93e9a2b071f8fb832211e848415842f48250c8ac..8065e8c28b89c197c9795218fc18fec750e1fef5 100644 (file)
--- a/src/lib/gssapi/mechglue/mglueP.h
+++ b/src/lib/gssapi/mechglue/mglueP.h
@@ -519,8 +519,7 @@ typedef struct gss_config {
            int *,                      /* name_is_MN */
            gss_OID *,                  /* MN_mech */
            gss_buffer_set_t *,         /* authenticated */
-           gss_buffer_set_t *,         /* asserted */
-           gss_buffer_set_t *          /* complete */
+           gss_buffer_set_t *          /* asserted */
        /* */);
 
        OM_uint32       (*gss_get_name_attribute)

diff --git a/src/lib/gssapi/spnego/gssapiP_spnego.h b/src/lib/gssapi/spnego/gssapiP_spnego.h
index 7793383ca1f83d7b24e79e59501265c90ace6e21..51986f7d60b9492c6c5fda52ddff8adb4eb02074 100644 (file)
--- a/src/lib/gssapi/spnego/gssapiP_spnego.h
+++ b/src/lib/gssapi/spnego/gssapiP_spnego.h
@@ -459,8 +459,7 @@ spnego_gss_inquire_name
        int *name_is_MN,
        gss_OID *MN_mech,
        gss_buffer_set_t *authenticated,
-       gss_buffer_set_t *asserted,
-       gss_buffer_set_t *complete
+       gss_buffer_set_t *asserted
 );
 
 OM_uint32

diff --git a/src/lib/gssapi/spnego/spnego_mech.c b/src/lib/gssapi/spnego/spnego_mech.c
index eddefe60706eae8a08b2df516d4e57f2e0118d69..7ddf59588550f54025228c93cbf28722b4852b5f 100644 (file)
--- a/src/lib/gssapi/spnego/spnego_mech.c
+++ b/src/lib/gssapi/spnego/spnego_mech.c
@@ -2383,8 +2383,7 @@ spnego_gss_inquire_name(OM_uint32 *minor_status,
                        int *name_is_MN,
                        gss_OID *MN_mech,
                        gss_buffer_set_t *authenticated,
-                       gss_buffer_set_t *asserted,
-                       gss_buffer_set_t *complete)
+                       gss_buffer_set_t *asserted)
 {
        OM_uint32 ret;
        ret = gss_inquire_name(minor_status,
@@ -2392,8 +2391,7 @@ spnego_gss_inquire_name(OM_uint32 *minor_status,
                               name_is_MN,
                               MN_mech,
                               authenticated,
-                              asserted,
-                              complete);
+                              asserted);
        return (ret);
 }
 

diff --git a/src/lib/krb5/krb/authdata.c b/src/lib/krb5/krb/authdata.c
index 22aa77a8b760a62028c6e9820cb16a7a197a6d99..9b5b6466d114f0a348469e65ec7b6b992d1d92fa 100644 (file)
--- a/src/lib/krb5/krb/authdata.c
+++ b/src/lib/krb5/krb/authdata.c
@@ -462,23 +462,19 @@ krb5_error_code KRB5_CALLCONV
 krb5_authdata_get_attribute_types(krb5_context kcontext,
                                   krb5_authdata_context context,
                                   krb5_data **verified_attrs,
-                                  krb5_data **asserted_attrs,
-                                  krb5_data **all_attrs)
+                                  krb5_data **asserted_attrs)
 {
     int i;
     krb5_error_code code = 0;
     krb5_data *verified = NULL;
     krb5_data *asserted = NULL;
-    krb5_data *all = NULL;
     unsigned int verified_len = 0;
     unsigned int asserted_len = 0;
-    unsigned int all_len = 0;
 
     for (i = 0; i < context->n_modules; i++) {
         struct _krb5_authdata_context_module *module = &context->modules[i];
         krb5_data *verified2 = NULL;
         krb5_data *asserted2 = NULL;
-        krb5_data *all2 = NULL;
 
         if (module->ftable->get_attribute_types == NULL)
             continue;
@@ -490,9 +486,7 @@ krb5_authdata_get_attribute_types(krb5_context kcontext,
                                                    verified_attrs ?
                                                        &verified2 : NULL,
                                                    asserted_attrs ?
-                                                       &asserted2 : NULL,
-                                                   all_attrs ?
-                                                       &all2 : NULL))
+                                                       &asserted2 : NULL))
             continue;
 
         if (verified_attrs != NULL) {
@@ -514,16 +508,6 @@ krb5_authdata_get_attribute_types(krb5_context kcontext,
             if (asserted2 != NULL)
                 free(asserted2);
         }
-
-        if (all_attrs != NULL) {
-            code = k5_merge_data_list(&all, all2, &all_len);
-            if (code != 0)  {
-                krb5int_free_data_list(kcontext, all2);
-                break;
-            }
-            if (all2 != NULL)
-                free(all2);
-        }
     }
 
     if (code != 0) {
@@ -532,17 +516,12 @@ krb5_authdata_get_attribute_types(krb5_context kcontext,
 
         krb5int_free_data_list(kcontext, asserted);
         asserted = NULL;
-
-        krb5int_free_data_list(kcontext, all);
-        all = NULL;
     }
 
     if (verified_attrs != NULL)
         *verified_attrs = verified;
     if (asserted_attrs != NULL)
         *asserted_attrs = asserted;
-    if (all_attrs != NULL)
-        *all_attrs = all;
 
     return code;
 }

diff --git a/src/lib/krb5/krb/pac.c b/src/lib/krb5/krb/pac.c
index ce5784a69f729c1a8172abdf234c0e05428e226f..fad78fa100b0a4f1cf11c426dd6830eef923569d 100644 (file)
--- a/src/lib/krb5/krb/pac.c
+++ b/src/lib/krb5/krb/pac.c
@@ -1142,8 +1142,7 @@ mspac_get_attribute_types(krb5_context kcontext,
                          void *plugin_context,
                          void *request_context,
                          krb5_data **verified,
-                         krb5_data **asserted,
-                         krb5_data **complete)
+                         krb5_data **asserted)
 {
     struct mspac_context *pacctx = (struct mspac_context *)request_context;
     unsigned int i, j;

diff --git a/src/plugins/authdata/greet_client/greet.c b/src/plugins/authdata/greet_client/greet.c
index fa57dbaac5f042192812d182e6239b2aae40db5f..1720c9b4ab0a29693fe818f5f4bdca51d1856b2b 100644 (file)
--- a/src/plugins/authdata/greet_client/greet.c
+++ b/src/plugins/authdata/greet_client/greet.c
@@ -131,8 +131,7 @@ greet_get_attribute_types(krb5_context kcontext,
                           void *plugin_context,
                           void *request_context,
                           krb5_data **verified,
-                          krb5_data **asserted,
-                          krb5_data **all_attrs)
+                          krb5_data **asserted)
 {
     krb5_error_code code;
     struct greet_context *greet = (struct greet_context *)request_context;