Add an expansion error table for libkrb5, since krb5_err.et is full
authorGreg Hudson <ghudson@mit.edu>
Thu, 26 Aug 2010 16:59:37 +0000 (16:59 +0000)
committerGreg Hudson <ghudson@mit.edu>
Thu, 26 Aug 2010 16:59:37 +0000 (16:59 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24258 dc483132-0cff-0310-8789-dd5450dbe970

src/Makefile.in
src/include/Makefile.in
src/lib/krb5/error_tables/Makefile.in
src/lib/krb5/error_tables/k5e1_err.et [new file with mode: 0644]

index 35040a1eeb889291cd7a8559ad45cfb8d4146af8..3d342bc3d1ea77a07d138376fcf76af83dd0671e 100644 (file)
@@ -445,6 +445,7 @@ ETOUT =     \
        $(INC)asn1_err.h $(ET)asn1_err.c \
        $(INC)kdb5_err.h $(ET)kdb5_err.c \
        $(INC)krb5_err.h $(ET)krb5_err.c \
+       $(INC)k5e1_err.h $(ET)k5e1_err.c \
        $(INC)kv5m_err.h $(ET)kv5m_err.c \
        $(INC)krb524_err.h $(ET)krb524_err.c \
        $(PR)prof_err.h $(PR)prof_err.c \
@@ -501,6 +502,8 @@ $(INC)kdb5_err.h: $(AH) $(ET)kdb5_err.et
        $(AWK) -f $(AH) outfile=$@ $(ET)kdb5_err.et
 $(INC)krb5_err.h: $(AH) $(ET)krb5_err.et
        $(AWK) -f $(AH) outfile=$@ $(ET)krb5_err.et
+$(INC)k5e1_err.h: $(AH) $(ET)k5e1_err.et
+       $(AWK) -f $(AH) outfile=$@ $(ET)k5e1_err.et
 $(INC)kv5m_err.h: $(AH) $(ET)kv5m_err.et
        $(AWK) -f $(AH) outfile=$@ $(ET)kv5m_err.et
 $(INC)krb524_err.h: $(AH) $(ET)krb524_err.et
@@ -524,6 +527,8 @@ $(ET)kdb5_err.c: $(AC) $(ET)kdb5_err.et
        $(AWK) -f $(AC) outfile=$@ $(ET)kdb5_err.et
 $(ET)krb5_err.c: $(AC) $(ET)krb5_err.et
        $(AWK) -f $(AC) outfile=$@ $(ET)krb5_err.et
+$(ET)k5e1_err.c: $(AC) $(ET)k5e1_err.et
+       $(AWK) -f $(AC) outfile=$@ $(ET)k5e1_err.et
 $(ET)kv5m_err.c: $(AC) $(ET)kv5m_err.et
        $(AWK) -f $(AC) outfile=$@ $(ET)kv5m_err.et
 $(ET)krb524_err.c: $(AC) $(ET)krb524_err.et
@@ -541,8 +546,8 @@ $(CE)test1.c: $(AC) $(CE)test1.et
 $(CE)test2.c: $(AC) $(CE)test2.et
        $(AWK) -f $(AC) outfile=$@ $(CE)test2.et
 
-KRBHDEP = $(INC)krb5\krb5.hin $(INC)krb5_err.h $(INC)kdb5_err.h \
-       $(INC)kv5m_err.h $(INC)krb524_err.h $(INC)asn1_err.h
+KRBHDEP = $(INC)krb5\krb5.hin $(INC)krb5_err.h $(INC)k5e1_err.h \
+       $(INC)kdb5_err.h $(INC)kv5m_err.h $(INC)krb524_err.h $(INC)asn1_err.h
 
 $(INC)krb5\krb5.h: $(KRBHDEP)
        rm -f $@
index 81cd6e18da2e3a760cad4ec9e0c3078356f6b5df..651bd3df8343ed9857bb1f021dcaaf53686349c3 100644 (file)
@@ -17,9 +17,10 @@ maybe-make-db.h-sys:
 maybe-make-db.h-redirect:
        test -r db.h || echo '#include <@DB_HEADER@>' > db.h
 
-ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h
+ET_HEADERS = adm_err.h asn1_err.h kdb5_err.h krb5_err.h k5e1_err.h
 K5_ET_HEADERS = \
        ../lib/krb5/error_tables/krb5_err.h \
+       ../lib/krb5/error_tables/k5e1_err.h \
        ../lib/krb5/error_tables/kdb5_err.h \
        ../lib/krb5/error_tables/kv5m_err.h \
        ../lib/krb5/error_tables/krb524_err.h \
@@ -103,7 +104,7 @@ private-and-public-decls: $(HEADERS_TO_CHECK)
 
 #
 # Build the error table include files:
-# asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h krb524_err.h
+# asn1_err.h kdb5_err.h krb5_err.h k5e1_err.h kv5m_err.h krb524_err.h
 
 $(K5_ET_HEADERS): rebuild-error-tables
        : $@
@@ -114,8 +115,8 @@ rebuild-error-tables:
 force:
 
 clean-unix::
-       $(RM) krb5/krb5.h krb5_err.h kdb5_err.h kv5m_err.h krb524_err.h \
-               asn1_err.h private-and-public-decls krb5.stamp
+       $(RM) krb5/krb5.h krb5_err.h k5e1_err.h kdb5_err.h kv5m_err.h \
+               krb524_err.h asn1_err.h private-and-public-decls krb5.stamp
        $(RM) $(ET_HEADERS) autoconf.stamp
 
 clean-windows::
index 497236326ad48875b461af42990f2f636c5aa5d3..d340b7b150ee1c5f44d796d2f6e70eabc3003fc6 100644 (file)
@@ -10,14 +10,15 @@ THDRDIR=$(BUILDTOP)$(S)include
 EHDRDIR=$(BUILDTOP)$(S)include
 ETDIR=$(top_srcdir)$(S)util$(S)et
 
-STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o \
+STLIBOBJS= asn1_err.o kdb5_err.o krb5_err.o k5e1_err.o \
       kv5m_err.o krb524_err.o
 
-HDRS= asn1_err.h kdb5_err.h krb5_err.h kv5m_err.h krb524_err.h
-OBJS= $(OUTPRE)asn1_err.$(OBJEXT) $(OUTPRE)kdb5_err.$(OBJEXT) $(OUTPRE)krb5_err.$(OBJEXT) \
+HDRS= asn1_err.h kdb5_err.h krb5_err.h k5e1_err.h kv5m_err.h krb524_err.h
+OBJS= $(OUTPRE)asn1_err.$(OBJEXT) $(OUTPRE)kdb5_err.$(OBJEXT) \
+      $(OUTPRE)krb5_err.$(OBJEXT) $(OUTPRE)k5e1_err.$(OBJEXT) \
       $(OUTPRE)kv5m_err.$(OBJEXT) $(OUTPRE)krb524_err.$(OBJEXT)
-ETSRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c krb524_err.c
-SRCS= asn1_err.c kdb5_err.c krb5_err.c kv5m_err.c krb524_err.c
+ETSRCS= asn1_err.c kdb5_err.c krb5_err.c k5e1_err.c kv5m_err.c krb524_err.c
+SRCS= asn1_err.c kdb5_err.c krb5_err.c k5e1_err.c kv5m_err.c krb524_err.c
 
 ##DOS##LIBOBJS = $(OBJS)
 
@@ -30,16 +31,19 @@ awk-windows:
        $(AWK) -f $(ETDIR)/et_h.awk outfile=asn1_err.h asn1_err.et
        $(AWK) -f $(ETDIR)/et_h.awk outfile=kdb5_err.h kdb5_err.et
        $(AWK) -f $(ETDIR)/et_h.awk outfile=krb5_err.h krb5_err.et
+       $(AWK) -f $(ETDIR)/et_h.awk outfile=k5e1_err.h k5e1_err.et
        $(AWK) -f $(ETDIR)/et_h.awk outfile=kv5m_err.h kv5m_err.et
        $(AWK) -f $(ETDIR)/et_h.awk outfile=krb524_err.h krb524_err.et
        $(AWK) -f $(ETDIR)/et_c.awk outfile=asn1_err.c asn1_err.et
        $(AWK) -f $(ETDIR)/et_c.awk outfile=kdb5_err.c kdb5_err.et
        $(AWK) -f $(ETDIR)/et_c.awk outfile=krb5_err.c krb5_err.et
+       $(AWK) -f $(ETDIR)/et_c.awk outfile=k5e1_err.c k5e1_err.et
        $(AWK) -f $(ETDIR)/et_c.awk outfile=kv5m_err.c kv5m_err.et
        $(AWK) -f $(ETDIR)/et_c.awk outfile=krb524_err.c krb524_err.et
        if exist asn1_err.h copy asn1_err.h "$(EHDRDIR)"
        if exist kdb5_err.h copy kdb5_err.h "$(EHDRDIR)"
        if exist krb5_err.h copy krb5_err.h "$(EHDRDIR)"
+       if exist k5e1_err.h copy k5e1_err.h "$(EHDRDIR)"
        if exist kv5m_err.h copy kv5m_err.h "$(EHDRDIR)"
        if exist krb524_err.h copy krb524_err.h "$(EHDRDIR)"
 
@@ -49,6 +53,7 @@ awk-windows:
 $(OUTPRE)asn1_err.$(OBJEXT): asn1_err.c
 $(OUTPRE)kdb5_err.$(OBJEXT): kdb5_err.c
 $(OUTPRE)krb5_err.$(OBJEXT): krb5_err.c
+$(OUTPRE)k5e1_err.$(OBJEXT): k5e1_err.c
 $(OUTPRE)kv5m_err.$(OBJEXT): kv5m_err.c
 $(OUTPRE)krb524_err.$(OBJEXT): krb524_err.c
 
diff --git a/src/lib/krb5/error_tables/k5e1_err.et b/src/lib/krb5/error_tables/k5e1_err.et
new file mode 100644 (file)
index 0000000..6d56210
--- /dev/null
@@ -0,0 +1,33 @@
+#
+# lib/krb5/error_tables/k5e1_err.et
+#
+# Copyright 2010 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.
+# 
+#
+# The Kerberos v5 library error code expansion table (#1).
+# This table exists to hold new libkrb5 error codes since the
+# original krb5 error table is full.
+#
+error_table k5e1
+
+end