svn rev #24050: trunk/src/lib/gssapi/krb5/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24050
Commit By: ghudson
Log Message:
The mechglue never invokes a mech's gss_add_cred function.  Remove the
krb5 mech's add_cred implementation and null it out in the table.
(This has the effect of removing the IAKERB add_cred implementation.
SPNEGO already had it nulled out.)



Changed Files:
U   trunk/src/lib/gssapi/krb5/Makefile.in
D   trunk/src/lib/gssapi/krb5/add_cred.c
U   trunk/src/lib/gssapi/krb5/gssapiP_krb5.h
U   trunk/src/lib/gssapi/krb5/gssapi_krb5.c
Modified: trunk/src/lib/gssapi/krb5/Makefile.in
===================================================================
--- trunk/src/lib/gssapi/krb5/Makefile.in	2010-05-17 12:56:58 UTC (rev 24049)
+++ trunk/src/lib/gssapi/krb5/Makefile.in	2010-05-17 17:11:28 UTC (rev 24050)
@@ -39,7 +39,6 @@
 SRCS = \
 	$(srcdir)/accept_sec_context.c \
 	$(srcdir)/acquire_cred.c \
-	$(srcdir)/add_cred.c \
 	$(srcdir)/canon_name.c \
 	$(srcdir)/compare_name.c \
 	$(srcdir)/context_time.c \
@@ -94,7 +93,6 @@
 OBJS = \
 	$(OUTPRE)accept_sec_context.$(OBJEXT) \
 	$(OUTPRE)acquire_cred.$(OBJEXT) \
-	$(OUTPRE)add_cred.$(OBJEXT) \
 	$(OUTPRE)canon_name.$(OBJEXT) \
 	$(OUTPRE)compare_name.$(OBJEXT) \
 	$(OUTPRE)context_time.$(OBJEXT) \
@@ -152,7 +150,6 @@
 STLIBOBJS = \
 	accept_sec_context.o \
 	acquire_cred.o \
-	add_cred.o \
 	canon_name.o \
 	compare_name.o \
 	context_time.o \

Modified: trunk/src/lib/gssapi/krb5/gssapiP_krb5.h
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapiP_krb5.h	2010-05-17 12:56:58 UTC (rev 24049)
+++ trunk/src/lib/gssapi/krb5/gssapiP_krb5.h	2010-05-17 17:11:28 UTC (rev 24050)
@@ -802,20 +802,6 @@
  void * *                    /* output_name */
 );
 
-OM_uint32 krb5_gss_add_cred
-(OM_uint32 *,           /* minor_status */
- gss_cred_id_t,              /* input_cred_handle */
- gss_name_t,                 /* desired_name */
- gss_OID,                    /* desired_mech */
- gss_cred_usage_t,           /* cred_usage */
- OM_uint32,                  /* initiator_time_req */
- OM_uint32,                  /* acceptor_time_req */
- gss_cred_id_t *,            /* output_cred_handle */
- gss_OID_set *,              /* actual_mechs */
- OM_uint32 *,                /* initiator_time_rec */
- OM_uint32 *                 /* acceptor_time_rec */
-);
-
 OM_uint32 krb5_gss_inquire_cred_by_mech
 (OM_uint32  *,          /* minor_status */
  gss_cred_id_t,              /* cred_handle */

Modified: trunk/src/lib/gssapi/krb5/gssapi_krb5.c
===================================================================
--- trunk/src/lib/gssapi/krb5/gssapi_krb5.c	2010-05-17 12:56:58 UTC (rev 24049)
+++ trunk/src/lib/gssapi/krb5/gssapi_krb5.c	2010-05-17 17:11:28 UTC (rev 24050)
@@ -659,7 +659,7 @@
     krb5_gss_import_name,
     krb5_gss_release_name,
     krb5_gss_inquire_cred,
-    krb5_gss_add_cred,
+    NULL,                /* add_cred */
 #ifdef LEAN_CLIENT
     NULL,
     NULL,