Added two new error messages: KRB5KDC_PREAUTH_FAILED and KRB5KDC_SERVER_NOMATCH

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

1 files changed, 27 insertions, 21 deletions

diff --git a/src/lib/krb5/error_tables/krb5_err.et b/src/lib/krb5/error_tables/krb5_err.et
index 30fb555aae..5c60a40a12 100644
--- a/src/lib/krb5/error_tables/krb5_err.et
+++ b/src/lib/krb5/error_tables/krb5_err.et
@@ -29,40 +29,40 @@
 error_table krb5
 
 # vv 0
-error_code KRB5KDC_ERR_NONE,			"No error"
-error_code KRB5KDC_ERR_NAME_EXP,		"Client's entry in database has expired"
-error_code KRB5KDC_ERR_SERVICE_EXP,		"Server's entry in database has expired"
-error_code KRB5KDC_ERR_BAD_PVNO,		"Requested protocol version not supported"
+error_code KRB5KDC_ERR_NONE,		"No error"
+error_code KRB5KDC_ERR_NAME_EXP,	"Client's entry in database has expired"
+error_code KRB5KDC_ERR_SERVICE_EXP,	"Server's entry in database has expired"
+error_code KRB5KDC_ERR_BAD_PVNO,	"Requested protocol version not supported"
 error_code KRB5KDC_ERR_C_OLD_MAST_KVNO,	"Client's key is encrypted in an old master key"
 error_code KRB5KDC_ERR_S_OLD_MAST_KVNO,	"Server's key is encrypted in an old master key"
-error_code KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN,	"Client not found in Kerberos database"
-error_code KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN,	"Server not found in Kerberos database"
-error_code KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE,	"Principal has multiple entries in Kerberos database"
-error_code KRB5KDC_ERR_NULL_KEY,		"Client or server has a null key"
+error_code KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN, "Client not found in Kerberos database"
+error_code KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN, "Server not found in Kerberos database"
+error_code KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE, "Principal has multiple entries in Kerberos database"
+error_code KRB5KDC_ERR_NULL_KEY,	"Client or server has a null key"
 error_code KRB5KDC_ERR_CANNOT_POSTDATE,	"Ticket is ineligible for postdating"
-error_code KRB5KDC_ERR_NEVER_VALID,		"Requested effective lifetime is negative or too short"
-error_code KRB5KDC_ERR_POLICY,			"KDC policy rejects request"
-error_code KRB5KDC_ERR_BADOPTION,		"KDC can't fulfill requested option"
+error_code KRB5KDC_ERR_NEVER_VALID,	"Requested effective lifetime is negative or too short"
+error_code KRB5KDC_ERR_POLICY,		"KDC policy rejects request"
+error_code KRB5KDC_ERR_BADOPTION,	"KDC can't fulfill requested option"
 error_code KRB5KDC_ERR_ETYPE_NOSUPP,	"KDC has no support for encryption type"
 error_code KRB5KDC_ERR_SUMTYPE_NOSUPP,	"KDC has no support for checksum type"
 error_code KRB5KDC_ERR_PADATA_TYPE_NOSUPP, "KDC has no support for padata type"
 error_code KRB5KDC_ERR_TRTYPE_NOSUPP,	"KDC has no support for transited type"
-error_code KDC_ERR_CLIENT_REVOKED,	"Clients credentials have been revoked"
-error_code KDC_ERR_SERVICE_REVOKED,	"Credentials for server have been revoked"
-error_code KDC_ERR_TGT_REVOKED,		"TGT has been revoked"
-error_code KDC_ERR_CLIENT_NOTYET,	"Client not yet valid - try again later"
-error_code KDC_ERR_SERVICE_NOTYET,	"Server not yet valid - try again later"
-error_code KDC_ERR_KEY_EXP,  		"Password has expired."
-# ^^ 23
-error_code KRB5PLACEHOLD_24,		"KRB5 error code 24"
-error_code KRB5PLACEHOLD_25,		"KRB5 error code 25"
+error_code KRB5KDC_ERR_CLIENT_REVOKED,	"Clients credentials have been revoked"
+error_code KRB5KDC_ERR_SERVICE_REVOKED,	"Credentials for server have been revoked"
+error_code KRB5KDC_ERR_TGT_REVOKED,	"TGT has been revoked"
+error_code KRB5KDC_ERR_CLIENT_NOTYET,	"Client not yet valid - try again later"
+error_code KRB5KDC_ERR_SERVICE_NOTYET,	"Server not yet valid - try again later"
+error_code KRB5KDC_ERR_KEY_EXP,  	"Password has expired."
+error_code KRB5KDC_PREAUTH_FAILED,  	"Preauthentication information was invalid"
+# ^^ 24
+error_code KRB5KDC_SERVER_NOMATCH,	"Requested server and ticket don't match"
 error_code KRB5PLACEHOLD_26,		"KRB5 error code 26"
 error_code KRB5PLACEHOLD_27,		"KRB5 error code 27"
 error_code KRB5PLACEHOLD_28,		"KRB5 error code 28"
 error_code KRB5PLACEHOLD_29,		"KRB5 error code 29"
 error_code KRB5PLACEHOLD_30,		"KRB5 error code 30"
 # vv 31
-error_code KRB5KRB_AP_ERR_BAD_INTEGRITY,	"Decrypt integrity check failed"
+error_code KRB5KRB_AP_ERR_BAD_INTEGRITY, "Decrypt integrity check failed"
 error_code KRB5KRB_AP_ERR_TKT_EXPIRED,	"Ticket expired"
 error_code KRB5KRB_AP_ERR_TKT_NYV,	"Ticket not yet valid"
 error_code KRB5KRB_AP_ERR_REPEAT,	"Request is a replay"
@@ -264,6 +264,12 @@ error_code KRB5_SENDAUTH_BADRESPONSE,	"Bad response (during sendauth exchange)"
 error_code KRB5_SENDAUTH_REJECTED,	"Server rejected authentication (during sendauth exchange)"
 error_code KRB5_SENDAUTH_MUTUAL_FAILED,	"Mutual authentication failed (during sendauth exchange)"
 
+# errors for preauthentication
+
+error_code KRB5_PREAUTH_BAD_TYPE,	"Unsupported preauthentication type"
+error_code KRB5_PREAUTH_NO_KEY,		"Required preauthentication key not supplied"
+error_code KRB5_PREAUTH_FAILED,		"Generic preauthentication failure"
+
 # version number errors
 
 error_code KRB5_RCACHE_BADVNO,	"Unsupported replay cache format version number"