Remove unused functions (older API residue) krb5_realm_iterator* and krb5_free_realm_...
authorZhanna Tsitkov <tsitkova@mit.edu>
Wed, 4 Jan 2012 15:47:52 +0000 (15:47 +0000)
committerZhanna Tsitkov <tsitkova@mit.edu>
Wed, 4 Jan 2012 15:47:52 +0000 (15:47 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25606 dc483132-0cff-0310-8789-dd5450dbe970

src/include/k5-int.h
src/lib/krb5/libkrb5.exports
src/lib/krb5/os/Makefile.in
src/lib/krb5/os/deps
src/lib/krb5/os/realm_iter.c [deleted file]
src/lib/krb5/os/t_realm_iter.c [deleted file]
src/windows/include/loadfuncs-krb5.h

index 906fb24ee59135c82068cf0e7097276d798d99ce..f1bd1faabc2ed7359b08a175a11d96632d80c82b 100644 (file)
@@ -2698,20 +2698,6 @@ krb5_error_code krb5_set_debugging_time(krb5_context, krb5_timestamp,
 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
index 183d5ee76dc9368cd3bc387ef491f40d49372b89..2d65e7f5b538806b70a3a5613dc970ef139d6b45 100644 (file)
@@ -321,7 +321,6 @@ krb5_free_priv
 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_rd_safe
 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
index 8032fa5d21aa2f94e6d197a416d7bda18fa82db2..19f5c33b4a119667df5444f7a488439b4bac46e7 100644 (file)
@@ -45,7 +45,6 @@ STLIBOBJS= \
        read_msg.o      \
        read_pwd.o      \
        realm_dom.o     \
-       realm_iter.o    \
        sendto_kdc.o    \
        sn2princ.o      \
         thread_safe.o   \
@@ -90,7 +89,6 @@ OBJS= \
        $(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 @@ SRCS= \
        $(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 @@ SRCS= \
        $(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_AN_TO_LN_OBJS = t_an_to_ln.o an_to_ln.o
 
 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_an_to_ln: $(T_AN_TO_LN_OBJS) $(KRB5_BASE_DEPLIBS)
 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)
 
index 3c5a5e6ec25405a969a9d84708c78d2712201d97..9116cbf3ddb1672cf00aa0e926e95afb9d2131f3 100644 (file)
@@ -374,17 +374,6 @@ realm_dom.so realm_dom.po $(OUTPRE)realm_dom.$(OBJEXT): \
   $(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 @@ t_locate_kdc.so t_locate_kdc.po $(OUTPRE)t_locate_kdc.$(OBJEXT): \
   $(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 \
diff --git a/src/lib/krb5/os/realm_iter.c b/src/lib/krb5/os/realm_iter.c
deleted file mode 100644 (file)
index 2fb1f03..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-/* lib/krb5/os/realm_iter.c */
-/*
- * Copyright 1998 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- *
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- */
-
-#include "k5-int.h"
-#include <ctype.h>
-#include <stdio.h>
-
-krb5_error_code KRB5_CALLCONV
-krb5_realm_iterator_create(krb5_context context, void **iter_p)
-{
-    static const char *const names[] = { "realms", 0 };
-
-    return profile_iterator_create(context->profile, names,
-                                   PROFILE_ITER_LIST_SECTION |
-                                   PROFILE_ITER_SECTIONS_ONLY,
-                                   iter_p);
-}
-
-krb5_error_code KRB5_CALLCONV
-krb5_realm_iterator(krb5_context context, void **iter_p, char **ret_realm)
-{
-    return profile_iterator(iter_p, ret_realm, 0);
-}
-
-void KRB5_CALLCONV
-krb5_realm_iterator_free(krb5_context context, void **iter_p)
-{
-    profile_iterator_free(iter_p);
-}
-
-void KRB5_CALLCONV
-krb5_free_realm_string(krb5_context context, char *str)
-{
-    profile_release_string(str);
-}
diff --git a/src/lib/krb5/os/t_realm_iter.c b/src/lib/krb5/os/t_realm_iter.c
deleted file mode 100644 (file)
index 9603189..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#include "krb5.h"
-
-#include <stdio.h>
-
-void
-test_realm_iterator(int ctx)
-{
-    krb5_error_code retval;
-    char *realm;
-    void *iter;
-
-    if ((retval = krb5_realm_iterator_create(ctx, &iter))) {
-        com_err("krb5_realm_iterator_create", retval, 0);
-        return;
-    }
-    while (iter) {
-        if ((retval = krb5_realm_iterator(ctx, &iter, &realm))) {
-            com_err("krb5_realm_iterator", retval, 0);
-            krb5_realm_iterator_free(ctx, &iter);
-            return;
-        }
-        if (realm) {
-            printf("Realm: '%s'\n", realm);
-            krb5_free_realm_string(ctx, realm);
-        }
-    }
-}
-
-int
-main(int argc, char **argv)
-{
-    krb5_context ctx;
-    krb5_error_code retval;
-
-    retval = krb5_init_context(&ctx);
-    if (retval) {
-        fprintf(stderr, "krb5_init_context returned error %ld\n",
-                retval);
-        exit(1);
-    }
-
-    test_realm_iterator(ctx);
-
-    krb5_free_context(ctx);
-    return 0;
-}
index bff0ceae5604bba23f64f219b16e403e508b407f..2e3c1e347c1d4f7d837f0ca0b723ac0550635878 100644 (file)
@@ -1570,34 +1570,6 @@ TYPEDEF_FUNC(
 
 /* ------------------------------------------------------------------------- */
 
-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,