svn rev #25606: trunk/src/ include/ lib/krb5/ lib/krb5/os/ windows/include/
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Wed Jan 4 10:47:52 EST 2012
http://src.mit.edu/fisheye/changelog/krb5/?cs=25606
Commit By: tsitkova
Log Message:
Remove unused functions (older API residue) krb5_realm_iterator* and krb5_free_realm_string
Changed Files:
U trunk/src/include/k5-int.h
U trunk/src/lib/krb5/libkrb5.exports
U trunk/src/lib/krb5/os/Makefile.in
U trunk/src/lib/krb5/os/deps
D trunk/src/lib/krb5/os/realm_iter.c
D trunk/src/lib/krb5/os/t_realm_iter.c
U trunk/src/windows/include/loadfuncs-krb5.h
Modified: trunk/src/include/k5-int.h
===================================================================
--- trunk/src/include/k5-int.h 2011-12-28 01:31:59 UTC (rev 25605)
+++ trunk/src/include/k5-int.h 2012-01-04 15:47:52 UTC (rev 25606)
@@ -2698,21 +2698,7 @@
krb5_error_code krb5_use_natural_time(krb5_context);
krb5_error_code krb5_set_time_offsets(krb5_context, krb5_timestamp,
krb5_int32);
-/*
- * The realm iterator functions
- */
-krb5_error_code KRB5_CALLCONV
-krb5_realm_iterator_create(krb5_context context, void **iter_p);
-
-krb5_error_code KRB5_CALLCONV
-krb5_realm_iterator(krb5_context context, void **iter_p, char **ret_realm);
-
-void KRB5_CALLCONV
-krb5_realm_iterator_free(krb5_context context, void **iter_p);
-
-void KRB5_CALLCONV krb5_free_realm_string(krb5_context context, char *str);
-
/* Internal principal function used by KIM to avoid code duplication */
krb5_error_code KRB5_CALLCONV
krb5int_build_principal_alloc_va(krb5_context context,
Modified: trunk/src/lib/krb5/libkrb5.exports
===================================================================
--- trunk/src/lib/krb5/libkrb5.exports 2011-12-28 01:31:59 UTC (rev 25605)
+++ trunk/src/lib/krb5/libkrb5.exports 2012-01-04 15:47:52 UTC (rev 25606)
@@ -321,7 +321,6 @@
krb5_free_priv_enc_part
krb5_free_pwd_data
krb5_free_pwd_sequences
-krb5_free_realm_string
krb5_free_realm_tree
krb5_free_safe
krb5_free_sam_challenge
@@ -528,9 +527,6 @@
krb5_read_message
krb5_read_password
krb5_realm_compare
-krb5_realm_iterator
-krb5_realm_iterator_create
-krb5_realm_iterator_free
krb5_recvauth
krb5_recvauth_version
krb5_register_serializer
Modified: trunk/src/lib/krb5/os/Makefile.in
===================================================================
--- trunk/src/lib/krb5/os/Makefile.in 2011-12-28 01:31:59 UTC (rev 25605)
+++ trunk/src/lib/krb5/os/Makefile.in 2012-01-04 15:47:52 UTC (rev 25606)
@@ -45,7 +45,6 @@
read_msg.o \
read_pwd.o \
realm_dom.o \
- realm_iter.o \
sendto_kdc.o \
sn2princ.o \
thread_safe.o \
@@ -90,7 +89,6 @@
$(OUTPRE)read_msg.$(OBJEXT) \
$(OUTPRE)read_pwd.$(OBJEXT) \
$(OUTPRE)realm_dom.$(OBJEXT) \
- $(OUTPRE)realm_iter.$(OBJEXT) \
$(OUTPRE)sendto_kdc.$(OBJEXT) \
$(OUTPRE)sn2princ.$(OBJEXT) \
$(OUTPRE)thread_safe.$(OBJEXT) \
@@ -134,7 +132,6 @@
$(srcdir)/read_msg.c \
$(srcdir)/read_pwd.c \
$(srcdir)/realm_dom.c \
- $(srcdir)/realm_iter.c \
$(srcdir)/port2ip.c \
$(srcdir)/sendto_kdc.c \
$(srcdir)/sn2princ.c \
@@ -147,7 +144,7 @@
$(srcdir)/write_msg.c
EXTRADEPSRCS = \
- t_an_to_ln.c t_gifconf.c t_locate_kdc.c t_realm_iter.c \
+ t_an_to_ln.c t_gifconf.c t_locate_kdc.c \
t_std_conf.c
##DOS##LIBOBJS = $(OBJS)
@@ -166,8 +163,6 @@
T_KUSEROK_OBJS = t_kuserok.o
-T_REALM_ITER_OBJS = t_realm_iter.o realm_iter.o
-
t_std_conf: $(T_STD_CONF_OBJS) $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o t_std_conf $(T_STD_CONF_OBJS) $(KRB5_BASE_LIBS)
@@ -177,9 +172,6 @@
t_kuserok: $(T_KUSEROK_OBJS) $(KRB5_BASE_DEPLIBS)
$(CC_LINK) -o t_kuserok $(T_KUSEROK_OBJS) $(KRB5_BASE_LIBS)
-t_realm_iter: $(T_REALM_ITER_OBJS) $(KRB5_BASE_DEPLIBS)
- $(CC_LINK) -o t_realm_iter $(T_REALM_ITER_OBJS) $(KRB5_BASE_LIBS)
-
t_localaddr: localaddr.c
$(CC_LINK) $(ALL_CFLAGS) -DTEST -o t_localaddr $(srcdir)/localaddr.c $(KRB5_BASE_LIBS) $(LIBS)
Modified: trunk/src/lib/krb5/os/deps
===================================================================
--- trunk/src/lib/krb5/os/deps 2011-12-28 01:31:59 UTC (rev 25605)
+++ trunk/src/lib/krb5/os/deps 2012-01-04 15:47:52 UTC (rev 25606)
@@ -374,17 +374,6 @@
$(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
$(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
$(top_srcdir)/include/socket-utils.h realm_dom.c
-realm_iter.so realm_iter.po $(OUTPRE)realm_iter.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
- $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
- $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
- $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
- $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
- $(top_srcdir)/include/k5-trace.h $(top_srcdir)/include/krb5.h \
- $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/plugin.h \
- $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
- $(top_srcdir)/include/socket-utils.h realm_iter.c
port2ip.so port2ip.po $(OUTPRE)port2ip.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
$(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
$(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
@@ -519,9 +508,6 @@
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
dnsglue.c dnsglue.h dnssrv.c locate_kdc.c os-proto.h \
t_locate_kdc.c
-t_realm_iter.so t_realm_iter.po $(OUTPRE)t_realm_iter.$(OBJEXT): \
- $(BUILDTOP)/include/krb5/krb5.h $(COM_ERR_DEPS) $(top_srcdir)/include/krb5.h \
- t_realm_iter.c
t_std_conf.so t_std_conf.po $(OUTPRE)t_std_conf.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
$(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
Modified: trunk/src/windows/include/loadfuncs-krb5.h
===================================================================
--- trunk/src/windows/include/loadfuncs-krb5.h 2011-12-28 01:31:59 UTC (rev 25605)
+++ trunk/src/windows/include/loadfuncs-krb5.h 2012-01-04 15:47:52 UTC (rev 25606)
@@ -1571,34 +1571,6 @@
/* ------------------------------------------------------------------------- */
TYPEDEF_FUNC(
- krb5_error_code,
- KRB5_CALLCONV,
- krb5_realm_iterator_create,
- (krb5_context context, void **iter_p)
- );
-
-TYPEDEF_FUNC(
- krb5_error_code,
- KRB5_CALLCONV,
- krb5_realm_iterator,
- (krb5_context context, void **iter_p, char **ret_realm)
- );
-
-TYPEDEF_FUNC(
- void,
- KRB5_CALLCONV,
- krb5_realm_iterator_free,
- (krb5_context context, void **iter_p)
- );
-
-TYPEDEF_FUNC(
- void,
- KRB5_CALLCONV,
- krb5_free_realm_string,
- (krb5_context context, char *str)
- );
-
-TYPEDEF_FUNC(
krb5_prompt_type*,
KRB5_CALLCONV,
krb5_get_prompt_types,
More information about the cvs-krb5
mailing list