Removed ISODE cruft

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4939 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog
index 1b51502a306114077d6cff20c94b3509e992d3cf..23bcddd9eb549a18c5f7577c5da614a987782765 100644 (file)
--- a/src/lib/krb5/error_tables/ChangeLog
+++ b/src/lib/krb5/error_tables/ChangeLog
@@ -1,3 +1,9 @@
+Fri Feb 10 14:56:57 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * Makefile:
+       * configure.in: 
+       * init_ets.c (krb5_init_ets): Remove isode cruft.
+
 Thu Feb  2 20:49:10 1995  Mark Eichin  (eichin@cygnus.com)
 
        * krb5_err.et (KRB5KRB_AP_ERR_V4_REPLY): new error code for V4

diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in
index 824370f0ceeff94d7410ed17ebe9c7cea9381b19..6b3614ef4fcc123e177376281cf4ca21542b733a 100644 (file)
--- a/src/lib/krb5/error_tables/Makefile.in
+++ b/src/lib/krb5/error_tables/Makefile.in
@@ -1,16 +1,11 @@
-ASN1_HDRS=@ASN1_HDRS@
-ASN1_OBJS=@ASN1_OBJS@
-ASN1_SRCS=@ASN1_SRCS@
-BOGUS=@BOGUS@
- 
 CFLAGS = $(CCOPTS) $(DEFS)
 LDFLAGS = -g
 
 EHDRDIR=$(BUILDTOP)/include/krb5
 
-HDRS=$(ASN1_HDRS) kdb5_err.h krb5_err.h kv5m_err.h adm_err.h
-OBJS=$(ASN1_OBJS) kdb5_err.o krb5_err.o kv5m_err.o adm_err.o init_ets.o
-ETSRCS=$(ASN1_SRCS) kdb5_err.c krb5_err.c kv5m_err.c adm_err.c
+HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h adm_err.h
+OBJS= asn1_err.o kdb5_err.o krb5_err.o kv5m_err.o adm_err.o init_ets.o
+ETSRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c adm_err.c
 SRCS=$(ETSRCS) $(srcdir)/init_ets.c
 
 all:: ${HDRS} includes ${OBJS}
@@ -25,8 +20,5 @@ krb5_err.o: krb5_err.c
 adm_err.o: adm_err.c
 kv5m_err.o: kv5m_err.c
 
-$(BOGUS)::
-       echo '/* not using isode */' > $@
-
 clean::
-       $(RM) $(HDRS) $(ETSRCS) $(BOGUS)
+       $(RM) $(HDRS) $(ETSRCS)

diff --git a/src/lib/krb5/error_tables/configure.in b/src/lib/krb5/error_tables/configure.in
index 89e9a19d269949d9325c665dbe4b8849eae0e470..f5357759a37909df844bc0c38843794e5f464afb 100644 (file)
--- a/src/lib/krb5/error_tables/configure.in
+++ b/src/lib/krb5/error_tables/configure.in
@@ -1,26 +1,15 @@
 AC_INIT(configure.in)
 WITH_CCOPTS
-ISODE_DEFS
 CONFIG_RULES
 AC_SET_BUILDTOP
 ET_RULES
 SS_RULES
 KRB_INCLUDE
-AC_ARG_ENABLE([isode],[build and use ISODE to generate ASN.1 stubs],[
-ASN1_HDRS=isode_err.h
-ASN1_OBJS=isode_err.o
-ASN1_SRCS=isode_err.c
-BOGUS=nosuchtarget],[
-ASN1_HDRS=asn1_err.h
-ASN1_OBJS=asn1_err.o
-ASN1_SRCS=asn1_err.c
-BOGUS="isode_err.c isode_err.h"])
 AC_SUBST(ASN1_HDRS)
 AC_SUBST(ASN1_OBJS)
 AC_SUBST(ASN1_SRCS)
 AC_SUBST(BOGUS)
 SubdirLibraryRule([${OBJS}])
-CopyHeader(isode_err.h,[$(EHDRDIR)])
 CopyHeader(krb5_err.h,[$(EHDRDIR)])
 CopyHeader(kv5m_err.h,[$(EHDRDIR)])
 CopyHeader(kdb5_err.h,[$(EHDRDIR)])

diff --git a/src/lib/krb5/error_tables/init_ets.c b/src/lib/krb5/error_tables/init_ets.c
index 78b9ef1e78f2e1a18c41df7d1fe4acd221a6112e..ca440f818e1b7ddc03e77e7d559ad0d81ed503cc 100644 (file)
--- a/src/lib/krb5/error_tables/init_ets.c
+++ b/src/lib/krb5/error_tables/init_ets.c
@@ -39,9 +39,5 @@ krb5_init_ets PROTOTYPE((krb5_context context))
     initialize_krb5_error_table();
     initialize_kv5m_error_table();
     initialize_kdb5_error_table();
-#ifdef KRB5_USE_ISODE
-    initialize_isod_error_table();
-#else
     initialize_asn1_error_table();
-#endif
 }

diff --git a/src/lib/krb5/error_tables/isode_err.et b/src/lib/krb5/error_tables/isode_err.et
deleted file mode 100644 (file)
index d5752fc..0000000
--- a/src/lib/krb5/error_tables/isode_err.et
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# $Source$
-# $Author$
-#
-# Copyright 1989 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.  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.
-# 
-#
-# The Kerberos v5/ISODE 5.0 error table mappings
-#
-# see <isode/psap.h>
-
-error_table isod
-
-error_code ISODE_50_RCSID,     "$Id$"
-
-error_code     ISODE_50_PS_ERR_NONE, "isode (ps): No error"
-error_code     ISODE_50_PS_ERR_OVERID, "isode (ps):Overflow in ID"
-error_code     ISODE_50_PS_ERR_OVERLEN, "isode (ps):Overflow in length"
-error_code     ISODE_50_PS_ERR_NMEM, "isode (ps):Out of memory"
-error_code     ISODE_50_PS_ERR_EOF, "isode (ps):End of file"
-error_code     ISODE_50_PS_ERR_EOFID, "isode (ps):End of file reading extended ID"
-error_code     ISODE_50_PS_ERR_EOFLEN, "isode (ps):End of file reading extended length"
-error_code     ISODE_50_PS_ERR_LEN, "isode (ps):Length mismatch"
-error_code     ISODE_50_PS_ERR_TRNC, "isode (ps):Truncated"
-error_code     ISODE_50_PS_ERR_INDF, "isode (ps):Indefinite length in primitive form"
-error_code     ISODE_50_PS_ERR_IO, "isode (ps):I/O error"
-error_code     ISODE_50_PS_ERR_EXTRA, "isode (ps): Extraneous octets"
-error_code     ISODE_50_PS_ERR_XXX, "isode (ps):XXX"
-
-error_code     ISODE_50_PE_ERR_NONE, "isode(pe):No error"
-error_code     ISODE_50_PE_ERR_OVER, "isode(pe):Overflow"
-error_code     ISODE_50_PE_ERR_NMEM, "isode(pe):Out of memory"
-error_code     ISODE_50_PE_ERR_BIT, "isode(pe):No such bit"
-error_code     ISODE_50_PE_ERR_UTCT, "isode(pe):Malformed universal timestring"
-error_code     ISODE_50_PE_ERR_GENT, "isode(pe):Malformed generalized timestring"
-error_code     ISODE_50_PE_ERR_MBER, "isode(pe):No such member"
-error_code     ISODE_50_PE_ERR_PRIM, "isode(pe):Not a primitive form"
-error_code     ISODE_50_PE_ERR_CONS, "isode(pe):Not a constructor form"
-error_code     ISODE_50_PE_ERR_TYPE, "isode(pe):Class/ID mismatch in constructor"
-error_code     ISODE_50_PE_ERR_OID, "isode(pe):Malformed object identifier"
-error_code     ISODE_50_PE_ERR_BITS, "isode(pe):Malformed bitstring"
-error_code     ISODE_50_PE_ERR_NOSUPP, "isode(pe):Type not supported"
-error_code     ISODE_50_PE_ERR_SIGNED, "isode(pe):Signed integer not expected"
-
-error_code     ISODE_50_LOCAL_ERR_BADDECODE,   "isode: ASN.1 decode failed"
-error_code     ISODE_50_LOCAL_ERR_BADMSGTYPE,  "isode: wrong message type after decoding"
-error_code     ISODE_50_LOCAL_ERR_BADCOMBO,    "isode: unacceptable combination of options"
-error_code     ISODE_LOCAL_ERR_MISSING_PART,   "isode: missing element during translation"
-
-end