From: Tom Yu Date: Wed, 25 May 1994 22:32:36 +0000 (+0000) Subject: using krb_err.et now X-Git-Tag: krb5-1.0-beta4~203 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=89acbb53d5a42ce0fd98dfaf02bcea9a52257c71;p=krb5.git using krb_err.et now git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3644 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/lib/krb425/Imakefile b/src/lib/krb425/Imakefile index b8b1855ad..cd2604935 100644 --- a/src/lib/krb425/Imakefile +++ b/src/lib/krb425/Imakefile @@ -22,14 +22,19 @@ # or implied warranty. # # +ETSRCS=krb_err.c +ETOBJS=krb_err.o +ETHDRS=krb_err.h +EHDRDIR=$(TOP)/include/kerberosIV NormalLibraryObjectRule() +ErrorTableObjectRule() INCLUDES=-I$(TOP)/include/kerberosIV -OBJS= 425data.o \ +OBJS= $(ETOBJS) \ + 425data.o \ 425error.o \ des_sched.o \ - err_txt.o \ get_cred.o \ get_krbhst.o \ get_lrealm.o \ @@ -50,10 +55,10 @@ OBJS= 425data.o \ sendauth.o \ set_key.o -SRCS= 425data.c \ +SRCS= $(ETSRCS) \ + 425data.c \ 425error.c \ des_sched.c \ - err_txt.c \ get_cred.c \ get_krbhst.c \ get_lrealm.c \ @@ -73,5 +78,11 @@ SRCS= 425data.c \ recvauth.c \ sendauth.c \ set_key.c - +all:: $(ETSRCS) $(ETHDRS) includes $(OBJS) +clean:: + $(RM) $(ETHDRS) $(ETSRCS) +depend:: $(ETSRCS) +DependTarget() +Krb5InstallHeaders($(ETHDRS),$(KRB5_INCDIR)/kerberosIV) +CopyHeader(krb_err.h,$(EHDRDIR)) Krb5LibraryTarget(krb425,${OBJS}) diff --git a/src/lib/krb425/err_txt.c b/src/lib/krb425/err_txt.c deleted file mode 100644 index 87c02084f..000000000 --- a/src/lib/krb425/err_txt.c +++ /dev/null @@ -1,294 +0,0 @@ -/* - * $Source$ - * $Author$ - * - * Copyright 1990,1991 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. - * - */ - -#if !defined(lint) && !defined(SABER) -static char rcsid_err_txt_c[] = -"$Id$"; -#endif /* !lint & !SABER */ - -/* - * This file contains an array of error text strings. - * The associated error codes (which are defined in "krb.h") - * follow the string in the comments at the end of each line. - */ - -char *krb_err_txt[256] = { - "OK", /* 000 */ - "Principal expired (kerberos)", /* 001 */ - "Service expired (kerberos)", /* 002 */ - "Authentication expired (kerberos)", /* 003 */ - "Unknown protocol version number (kerberos)", /* 004 */ - "Principal: Incorrect master key version (kerberos)", /* 005 */ - "Service: Incorrect master key version (kerberos)", /* 006 */ - "Bad byte order (kerberos)", /* 007 */ - "Principal unknown (kerberos)", /* 008 */ - "Principal not unique (kerberos)", /* 009 */ - "Principal has null key (kerberos)", /* 010 */ - "Reserved error message 11 (kerberos)", /* 011 */ - "Reserved error message 12 (kerberos)", /* 012 */ - "Reserved error message 13 (kerberos)", /* 013 */ - "Reserved error message 14 (kerberos)", /* 014 */ - "Reserved error message 15 (kerberos)", /* 015 */ - "Reserved error message 16 (kerberos)", /* 016 */ - "Reserved error message 17 (kerberos)", /* 017 */ - "Reserved error message 18 (kerberos)", /* 018 */ - "Reserved error message 19 (kerberos)", /* 019 */ - "Permission Denied (kerberos)", /* 020 */ - "Can't read ticket file (krb_get_cred)", /* 021 */ - "Can't find ticket (krb_get_cred)", /* 022 */ - "Reserved error message 23 (krb_get_cred)", /* 023 */ - "Reserved error message 24 (krb_get_cred)", /* 024 */ - "Reserved error message 25 (krb_get_cred)", /* 025 */ - "Ticket granting ticket expired (krb_mk_req)", /* 026 */ - "Reserved error message 27 (krb_mk_req)", /* 027 */ - "Reserved error message 28 (krb_mk_req)", /* 028 */ - "Reserved error message 29 (krb_mk_req)", /* 029 */ - "Reserved error message 30 (krb_mk_req)", /* 030 */ - "Can't decode authenticator (krb_rd_req)", /* 031 */ - "Ticket expired (krb_rd_req)", /* 032 */ - "Ticket issue date too far in the future (krb_rd_req)",/* 033 */ - "Repeat request (krb_rd_req)", /* 034 */ - "Ticket for wrong server (krb_rd_req)", /* 035 */ - "Request inconsistent (krb_rd_req)", /* 036 */ - "Time is out of bounds (krb_rd_req)", /* 037 */ - "Incorrect network address (krb_rd_req)", /* 038 */ - "Protocol version mismatch (krb_rd_req)", /* 039 */ - "Illegal message type (krb_rd_req)", /* 040 */ - "Message integrity error (krb_rd_req)", /* 041 */ - "Message duplicate or out of order (krb_rd_req)", /* 042 */ - "Unauthorized request (krb_rd_req)", /* 043 */ - "Reserved error message 44 (krb_rd_req)", /* 044 */ - "Reserved error message 45 (krb_rd_req)", /* 045 */ - "Reserved error message 46 (krb_rd_req)", /* 046 */ - "Reserved error message 47 (krb_rd_req)", /* 047 */ - "Reserved error message 48 (krb_rd_req)", /* 048 */ - "Reserved error message 49 (krb_rd_req)", /* 049 */ - "Reserved error message 50 (krb_rd_req)", /* 050 */ - "Current password is NULL (get_pw_tkt)", /* 051 */ - "Current password incorrect (get_pw_tkt)", /* 052 */ - "Protocol error (gt_pw_tkt)", /* 053 */ - "Error returned by KDC (gt_pw_tkt)", /* 054 */ - "Null ticket returned by KDC (gt_pw_tkt)", /* 055 */ - "Retry count exceeded (send_to_kdc)", /* 056 */ - "Can't send request (send_to_kdc)", /* 057 */ - "Reserved error message 58 (send_to_kdc)", /* 058 */ - "Reserved error message 59 (send_to_kdc)", /* 059 */ - "Reserved error message 60 (send_to_kdc)", /* 060 */ - "Warning: Not ALL tickets returned", /* 061 */ - "Password incorrect", /* 062 */ - "Protocol error (get_intkt)", /* 063 */ - "Reserved error message 64 (get_in_tkt)", /* 064 */ - "Reserved error message 65 (get_in_tkt)", /* 065 */ - "Reserved error message 66 (get_in_tkt)", /* 066 */ - "Reserved error message 67 (get_in_tkt)", /* 067 */ - "Reserved error message 68 (get_in_tkt)", /* 068 */ - "Reserved error message 69 (get_in_tkt)", /* 069 */ - "Generic error (get_intkt)", /* 070 */ - "Don't have ticket granting ticket (get_ad_tkt)", /* 071 */ - "Reserved error message 72 (get_ad_tkt)", /* 072 */ - "Reserved error message 73 (get_ad_tkt)", /* 073 */ - "Reserved error message 74 (get_ad_tkt)", /* 074 */ - "Reserved error message 75 (get_ad_tkt)", /* 075 */ - "No ticket file (tf_util)", /* 076 */ - "Can't access ticket file (tf_util)", /* 077 */ - "Can't lock ticket file; try later (tf_util)", /* 078 */ - "Bad ticket file format (tf_util)", /* 079 */ - "Read ticket file before tf_init (tf_util)", /* 080 */ - "Bad Kerberos name format (kname_parse)", /* 081 */ - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "(reserved)", - "Generic kerberos error (kfailure)", /* 255 */ -}; diff --git a/src/lib/krb425/krb_err.h b/src/lib/krb425/krb_err.h deleted file mode 100644 index 50fdbc3c4..000000000 --- a/src/lib/krb425/krb_err.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - * $Source$ - * $Author$ - * $Id$ - * - * Copyright 1990 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. - * - * - * krb_err.h for krb425 - */ - -#ifndef KRB5_KRB_ERR_H__ -#define KRB5_KRB_ERR_H__ - -#define KRBET_KSUCCESS ((int)39525376) -#define KRBET_KDC_NAME_EXP ((int)39525377) -#define KRBET_KDC_SERVICE_EXP ((int)39525378) -#define KRBET_KDC_AUTH_EXP ((int)39525379) -#define KRBET_KDC_PKT_VER ((int)39525380) -#define KRBET_KDC_P_MKEY_VER ((int)39525381) -#define KRBET_KDC_S_MKEY_VER ((int)39525382) -#define KRBET_KDC_BYTE_ORDER ((int)39525383) -#define KRBET_KDC_PR_UNKNOWN ((int)39525384) -#define KRBET_KDC_PR_N_UNIQUE ((int)39525385) -#define KRBET_KDC_NULL_KEY ((int)39525386) -#define KRBET_KRB_RES11 ((int)39525387) -#define KRBET_KRB_RES12 ((int)39525388) -#define KRBET_KRB_RES13 ((int)39525389) -#define KRBET_KRB_RES14 ((int)39525390) -#define KRBET_KRB_RES15 ((int)39525391) -#define KRBET_KRB_RES16 ((int)39525392) -#define KRBET_KRB_RES17 ((int)39525393) -#define KRBET_KRB_RES18 ((int)39525394) -#define KRBET_KRB_RES19 ((int)39525395) -#define KRBET_KDC_GEN_ERR ((int)39525396) -#define KRBET_GC_TKFIL ((int)39525397) -#define KRBET_GC_NOTKT ((int)39525398) -#define KRBET_KRB_RES23 ((int)39525399) -#define KRBET_KRB_RES24 ((int)39525400) -#define KRBET_KRB_RES25 ((int)39525401) -#define KRBET_MK_AP_TGTEXP ((int)39525402) -#define KRBET_KRB_RES27 ((int)39525403) -#define KRBET_KRB_RES28 ((int)39525404) -#define KRBET_KRB_RES29 ((int)39525405) -#define KRBET_KRB_RES30 ((int)39525406) -#define KRBET_RD_AP_UNDEC ((int)39525407) -#define KRBET_RD_AP_EXP ((int)39525408) -#define KRBET_RD_AP_NYV ((int)39525409) -#define KRBET_RD_AP_REPEAT ((int)39525410) -#define KRBET_RD_AP_NOT_US ((int)39525411) -#define KRBET_RD_AP_INCON ((int)39525412) -#define KRBET_RD_AP_TIME ((int)39525413) -#define KRBET_RD_AP_BADD ((int)39525414) -#define KRBET_RD_AP_VERSION ((int)39525415) -#define KRBET_RD_AP_MSG_TYPE ((int)39525416) -#define KRBET_RD_AP_MODIFIED ((int)39525417) -#define KRBET_RD_AP_ORDER ((int)39525418) -#define KRBET_RD_AP_UNAUTHOR ((int)39525419) -#define KRBET_KRB_RES44 ((int)39525420) -#define KRBET_KRB_RES45 ((int)39525421) -#define KRBET_KRB_RES46 ((int)39525422) -#define KRBET_KRB_RES47 ((int)39525423) -#define KRBET_KRB_RES48 ((int)39525424) -#define KRBET_KRB_RES49 ((int)39525425) -#define KRBET_KRB_RES50 ((int)39525426) -#define KRBET_GT_PW_NULL ((int)39525427) -#define KRBET_GT_PW_BADPW ((int)39525428) -#define KRBET_GT_PW_PROT ((int)39525429) -#define KRBET_GT_PW_KDCERR ((int)39525430) -#define KRBET_GT_PW_NULLTKT ((int)39525431) -#define KRBET_SKDC_RETRY ((int)39525432) -#define KRBET_SKDC_CANT ((int)39525433) -#define KRBET_KRB_RES58 ((int)39525434) -#define KRBET_KRB_RES59 ((int)39525435) -#define KRBET_KRB_RES60 ((int)39525436) -#define KRBET_INTK_W_NOTALL ((int)39525437) -#define KRBET_INTK_BADPW ((int)39525438) -#define KRBET_INTK_PROT ((int)39525439) -#define KRBET_KRB_RES64 ((int)39525440) -#define KRBET_KRB_RES65 ((int)39525441) -#define KRBET_KRB_RES66 ((int)39525442) -#define KRBET_KRB_RES67 ((int)39525443) -#define KRBET_KRB_RES68 ((int)39525444) -#define KRBET_KRB_RES69 ((int)39525445) -#define KRBET_INTK_ERR ((int)39525446) -#define KRBET_AD_NOTGT ((int)39525447) -#define KRBET_KRB_RES72 ((int)39525448) -#define KRBET_KRB_RES73 ((int)39525449) -#define KRBET_KRB_RES74 ((int)39525450) -#define KRBET_KRB_RES75 ((int)39525451) -#define KRBET_NO_TKT_FIL ((int)39525452) -#define KRBET_TKT_FIL_ACC ((int)39525453) -#define KRBET_TKT_FIL_LCK ((int)39525454) -#define KRBET_TKT_FIL_FMT ((int)39525455) -#define KRBET_TKT_FIL_INI ((int)39525456) -#define KRBET_KNAME_FMT ((int)39525457) -extern int init_krb_err_tbl(); -extern int krb_err_base; - -#endif /* __KRB5_KRB_ERR_H__ */