From a7ec7532e48660a0239aa8938f22a6b0d90864ab Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 22 Dec 2016 22:23:58 -0500 Subject: [PATCH] lib/et/testcases: checked in imap_err.et from cyrus-imapd version 2.5.10 This version of imap_err.et has a 4-clause BSD license, which should hopefully be more comforting to lawyers than the license with prohibits non-commercial use --- which shouldn't be a problem since it's in a test case that would never show up in any binary, and so license compatibility wouldn't be an issue. Signed-off-by: Theodore Ts'o --- lib/et/test_cases/imap_err.c | 39 +++++++++-- lib/et/test_cases/imap_err.et | 159 +++++++++++++++++++++++++++++++++++------- lib/et/test_cases/imap_err.h | 91 ++++++++++++++++-------- 3 files changed, 231 insertions(+), 58 deletions(-) diff --git a/lib/et/test_cases/imap_err.c b/lib/et/test_cases/imap_err.c index 6f576d3..4d2ffc6 100644 --- a/lib/et/test_cases/imap_err.c +++ b/lib/et/test_cases/imap_err.c @@ -8,16 +8,28 @@ #define N_(a) a static const char * const text[] = { + N_( "Internal Error"), N_( "System I/O error"), + N_( "Item does not exist"), + N_( "Operating System Error"), + N_( "mail system storage has been exceeded"), N_( "Permission denied"), N_( "Over quota"), + N_( "Message size exceeds fixed limit"), N_( "Too many user flags in mailbox"), + N_( "Invalid namespace prefix in configuration file"), N_( "Mailbox has an invalid format"), + N_( "Replication inconsistency detected"), + N_( "Mailbox format corruption detected"), N_( "Operation is not supported on mailbox"), N_( "Mailbox does not exist"), N_( "Mailbox already exists"), N_( "Invalid mailbox name"), - N_( "Mailbox is locked by POP server"), + N_( "Invalid mailbox type"), + N_( "Mailbox has been moved to another server"), + N_( "Mailbox is currently reserved"), + N_( "Mailbox is locked"), + N_( "Delivery to mailbox is disabled"), N_( "Unknown/invalid partition"), N_( "Invalid identifier"), N_( "Message contains NUL characters"), @@ -26,16 +38,35 @@ static const char * const text[] = { N_( "Message contains invalid header"), N_( "Message has no header/body separator"), N_( "Quota root does not exist"), + N_( "Bad protocol"), + N_( "Syntax error in parameters"), + N_( "Invalid annotation entry"), + N_( "Invalid annotation attribute"), + N_( "Invalid annotation value"), + N_( "Bad URL"), + N_( "Zero-length message literal"), + N_( "Invalid server requested"), + N_( "Server(s) unavailable to complete operation"), + N_( "The remote Server(s) denied the operation"), + N_( "Retry operation"), + N_( "This mailbox hierarchy does not exist on a single backend server."), + N_( "The remote server does not support MULTIAPPEND"), N_( "Unrecognized character set"), N_( "Invalid user"), N_( "Login incorrect"), N_( "Anonymous login is not permitted"), N_( "Unsupported quota resource"), - N_( "Mailbox is over quota"), - N_( "Mailbox is at %d%% of quota"), + N_( "Authentication failed"), + N_( "Client cancelled authentication"), + N_( "Protocol error during authentication"), + N_( "Mailbox is over %s quota"), + N_( "Mailbox is at %d%% of %s quota"), N_( "Message %d no longer exists"), N_( "Unable to checkpoint \\Seen state"), N_( "Unable to preserve \\Seen state"), + N_( "No matching messages"), + N_( "No matching annotations"), + N_( "[UNKNOWN-CTE] Can not process the binary data"), N_( "LOGOUT received"), N_( "Completed"), 0 @@ -52,7 +83,7 @@ struct et_list { }; extern struct et_list *_et_list; -const struct error_table et_imap_error_table = { text, -1904809472L, 30 }; +const struct error_table et_imap_error_table = { text, -1904809472L, 61 }; static struct et_list link = { 0, 0 }; diff --git a/lib/et/test_cases/imap_err.et b/lib/et/test_cases/imap_err.et index 33f5bbc..bfae243 100644 --- a/lib/et/test_cases/imap_err.et +++ b/lib/et/test_cases/imap_err.et @@ -1,46 +1,85 @@ # imap_err.et -- Error codes for Cyrus IMAP server programs # -# Copyright 1998 Carnegie Mellon University -# -# No warranties, either expressed or implied, are made regarding the -# operation, use, or results of the software. +# Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved. # -# Permission to use, copy, modify and distribute this software and its -# documentation is hereby granted for non-commercial purposes only -# provided that this copyright notice appears in all copies and in -# supporting documentation. +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: # -# Permission is also granted to Internet Service Providers and others -# entities to use the software for internal purposes. +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. # -# The distribution, modification or sale of a product which uses or is -# based on the software, in whole or in part, for commercial purposes or -# benefits requires specific, additional permission from: +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. # -# Office of Technology Transfer -# Carnegie Mellon University -# 5000 Forbes Avenue -# Pittsburgh, PA 15213-3890 -# (412) 268-4387, fax: (412) 268-7395 -# tech-transfer@andrew.cmu.edu -# +# 3. The name "Carnegie Mellon University" must not be used to +# endorse or promote products derived from this software without +# prior written permission. For permission or any legal +# details, please contact +# Carnegie Mellon University +# Center for Technology Transfer and Enterprise Creation +# 4615 Forbes Avenue +# Suite 302 +# Pittsburgh, PA 15213 +# (412) 268-7393, fax: (412) 268-7395 +# innovation@andrew.cmu.edu +# +# 4. Redistributions of any form whatsoever must retain the following +# acknowledgment: +# "This product includes software developed by Computing Services +# at Carnegie Mellon University (http://www.cmu.edu/computing/)." +# +# CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO +# THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +# AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE +# FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN +# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING +# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + error_table imap +ec IMAP_INTERNAL, + "Internal Error" + ec IMAP_IOERROR, "System I/O error" +ec IMAP_NOTFOUND, + "Item does not exist" + +ec IMAP_SYS_ERROR, + "Operating System Error" + +ec IMAP_NOSPACE, + "mail system storage has been exceeded" + ec IMAP_PERMISSION_DENIED, "Permission denied" ec IMAP_QUOTA_EXCEEDED, "Over quota" +ec IMAP_MESSAGE_TOO_LARGE, + "Message size exceeds fixed limit" + ec IMAP_USERFLAG_EXHAUSTED, "Too many user flags in mailbox" +ec IMAP_NAMESPACE_BADPREFIX, + "Invalid namespace prefix in configuration file" + ec IMAP_MAILBOX_BADFORMAT, "Mailbox has an invalid format" +ec IMAP_SYNC_CHECKSUM, + "Replication inconsistency detected" + +ec IMAP_MAILBOX_CHECKSUM, + "Mailbox format corruption detected" + ec IMAP_MAILBOX_NOTSUPPORTED, "Operation is not supported on mailbox" @@ -53,8 +92,20 @@ ec IMAP_MAILBOX_EXISTS, ec IMAP_MAILBOX_BADNAME, "Invalid mailbox name" -ec IMAP_MAILBOX_POPLOCKED, - "Mailbox is locked by POP server" +ec IMAP_MAILBOX_BADTYPE, + "Invalid mailbox type" + +ec IMAP_MAILBOX_MOVED, + "Mailbox has been moved to another server" + +ec IMAP_MAILBOX_RESERVED, + "Mailbox is currently reserved" + +ec IMAP_MAILBOX_LOCKED, + "Mailbox is locked" + +ec IMAP_MAILBOX_DISABLED, + "Delivery to mailbox is disabled" ec IMAP_PARTITION_UNKNOWN, "Unknown/invalid partition" @@ -80,6 +131,46 @@ ec IMAP_MESSAGE_NOBLANKLINE, ec IMAP_QUOTAROOT_NONEXISTENT, "Quota root does not exist" +ec IMAP_PROTOCOL_ERROR, + "Bad protocol" + +ec IMAP_PROTOCOL_BAD_PARAMETERS, + "Syntax error in parameters" + +ec IMAP_ANNOTATION_BADENTRY, + "Invalid annotation entry" + +ec IMAP_ANNOTATION_BADATTRIB, + "Invalid annotation attribute" + +ec IMAP_ANNOTATION_BADVALUE, + "Invalid annotation value" + +ec IMAP_BADURL, + "Bad URL" + +ec IMAP_ZERO_LENGTH_LITERAL, + "Zero-length message literal" + +# following used only proxy/db operations +ec IMAP_BAD_SERVER, + "Invalid server requested" + +ec IMAP_SERVER_UNAVAILABLE, + "Server(s) unavailable to complete operation" + +ec IMAP_REMOTE_DENIED, + "The remote Server(s) denied the operation" + +ec IMAP_AGAIN, + "Retry operation" + +ec IMAP_NOT_SINGULAR_ROOT, + "This mailbox hierarchy does not exist on a single backend server." + +ec IMAP_REMOTE_NO_MULTIAPPEND, + "The remote server does not support MULTIAPPEND" + # Following only used for internationalization of error messages ec IMAP_UNRECOGNIZED_CHARSET, @@ -97,13 +188,24 @@ ec IMAP_ANONYMOUS_NOT_PERMITTED, ec IMAP_UNSUPPORTED_QUOTA, "Unsupported quota resource" +# Following used only for SASL operations + +ec IMAP_SASL_FAIL, + "Authentication failed" + +ec IMAP_SASL_CANCEL, + "Client cancelled authentication" + +ec IMAP_SASL_PROTERR, + "Protocol error during authentication" + # Following used for internationalization of untagged OK/NO responses ec IMAP_NO_OVERQUOTA, - "Mailbox is over quota" + "Mailbox is over %s quota" ec IMAP_NO_CLOSEQUOTA, - "Mailbox is at %d%% of quota" + "Mailbox is at %d%% of %s quota" ec IMAP_NO_MSGGONE, "Message %d no longer exists" @@ -114,6 +216,15 @@ ec IMAP_NO_CHECKSEEN, ec IMAP_NO_CHECKPRESERVE, "Unable to preserve \\Seen state" +ec IMAP_NO_NOSUCHMSG, + "No matching messages" + +ec IMAP_NO_NOSUCHANNOTATION, + "No matching annotations" + +ec IMAP_NO_UNKNOWN_CTE, + "[UNKNOWN-CTE] Can not process the binary data" + # Following used for internationalization of untagged BYE response ec IMAP_BYE_LOGOUT, diff --git a/lib/et/test_cases/imap_err.h b/lib/et/test_cases/imap_err.h index 17664c4..bfa8f65 100644 --- a/lib/et/test_cases/imap_err.h +++ b/lib/et/test_cases/imap_err.h @@ -5,36 +5,67 @@ #include -#define IMAP_IOERROR (-1904809472L) -#define IMAP_PERMISSION_DENIED (-1904809471L) -#define IMAP_QUOTA_EXCEEDED (-1904809470L) -#define IMAP_USERFLAG_EXHAUSTED (-1904809469L) -#define IMAP_MAILBOX_BADFORMAT (-1904809468L) -#define IMAP_MAILBOX_NOTSUPPORTED (-1904809467L) -#define IMAP_MAILBOX_NONEXISTENT (-1904809466L) -#define IMAP_MAILBOX_EXISTS (-1904809465L) -#define IMAP_MAILBOX_BADNAME (-1904809464L) -#define IMAP_MAILBOX_POPLOCKED (-1904809463L) -#define IMAP_PARTITION_UNKNOWN (-1904809462L) -#define IMAP_INVALID_IDENTIFIER (-1904809461L) -#define IMAP_MESSAGE_CONTAINSNULL (-1904809460L) -#define IMAP_MESSAGE_CONTAINSNL (-1904809459L) -#define IMAP_MESSAGE_CONTAINS8BIT (-1904809458L) -#define IMAP_MESSAGE_BADHEADER (-1904809457L) -#define IMAP_MESSAGE_NOBLANKLINE (-1904809456L) -#define IMAP_QUOTAROOT_NONEXISTENT (-1904809455L) -#define IMAP_UNRECOGNIZED_CHARSET (-1904809454L) -#define IMAP_INVALID_USER (-1904809453L) -#define IMAP_INVALID_LOGIN (-1904809452L) -#define IMAP_ANONYMOUS_NOT_PERMITTED (-1904809451L) -#define IMAP_UNSUPPORTED_QUOTA (-1904809450L) -#define IMAP_NO_OVERQUOTA (-1904809449L) -#define IMAP_NO_CLOSEQUOTA (-1904809448L) -#define IMAP_NO_MSGGONE (-1904809447L) -#define IMAP_NO_CHECKSEEN (-1904809446L) -#define IMAP_NO_CHECKPRESERVE (-1904809445L) -#define IMAP_BYE_LOGOUT (-1904809444L) -#define IMAP_OK_COMPLETED (-1904809443L) +#define IMAP_INTERNAL (-1904809472L) +#define IMAP_IOERROR (-1904809471L) +#define IMAP_NOTFOUND (-1904809470L) +#define IMAP_SYS_ERROR (-1904809469L) +#define IMAP_NOSPACE (-1904809468L) +#define IMAP_PERMISSION_DENIED (-1904809467L) +#define IMAP_QUOTA_EXCEEDED (-1904809466L) +#define IMAP_MESSAGE_TOO_LARGE (-1904809465L) +#define IMAP_USERFLAG_EXHAUSTED (-1904809464L) +#define IMAP_NAMESPACE_BADPREFIX (-1904809463L) +#define IMAP_MAILBOX_BADFORMAT (-1904809462L) +#define IMAP_SYNC_CHECKSUM (-1904809461L) +#define IMAP_MAILBOX_CHECKSUM (-1904809460L) +#define IMAP_MAILBOX_NOTSUPPORTED (-1904809459L) +#define IMAP_MAILBOX_NONEXISTENT (-1904809458L) +#define IMAP_MAILBOX_EXISTS (-1904809457L) +#define IMAP_MAILBOX_BADNAME (-1904809456L) +#define IMAP_MAILBOX_BADTYPE (-1904809455L) +#define IMAP_MAILBOX_MOVED (-1904809454L) +#define IMAP_MAILBOX_RESERVED (-1904809453L) +#define IMAP_MAILBOX_LOCKED (-1904809452L) +#define IMAP_MAILBOX_DISABLED (-1904809451L) +#define IMAP_PARTITION_UNKNOWN (-1904809450L) +#define IMAP_INVALID_IDENTIFIER (-1904809449L) +#define IMAP_MESSAGE_CONTAINSNULL (-1904809448L) +#define IMAP_MESSAGE_CONTAINSNL (-1904809447L) +#define IMAP_MESSAGE_CONTAINS8BIT (-1904809446L) +#define IMAP_MESSAGE_BADHEADER (-1904809445L) +#define IMAP_MESSAGE_NOBLANKLINE (-1904809444L) +#define IMAP_QUOTAROOT_NONEXISTENT (-1904809443L) +#define IMAP_PROTOCOL_ERROR (-1904809442L) +#define IMAP_PROTOCOL_BAD_PARAMETERS (-1904809441L) +#define IMAP_ANNOTATION_BADENTRY (-1904809440L) +#define IMAP_ANNOTATION_BADATTRIB (-1904809439L) +#define IMAP_ANNOTATION_BADVALUE (-1904809438L) +#define IMAP_BADURL (-1904809437L) +#define IMAP_ZERO_LENGTH_LITERAL (-1904809436L) +#define IMAP_BAD_SERVER (-1904809435L) +#define IMAP_SERVER_UNAVAILABLE (-1904809434L) +#define IMAP_REMOTE_DENIED (-1904809433L) +#define IMAP_AGAIN (-1904809432L) +#define IMAP_NOT_SINGULAR_ROOT (-1904809431L) +#define IMAP_REMOTE_NO_MULTIAPPEND (-1904809430L) +#define IMAP_UNRECOGNIZED_CHARSET (-1904809429L) +#define IMAP_INVALID_USER (-1904809428L) +#define IMAP_INVALID_LOGIN (-1904809427L) +#define IMAP_ANONYMOUS_NOT_PERMITTED (-1904809426L) +#define IMAP_UNSUPPORTED_QUOTA (-1904809425L) +#define IMAP_SASL_FAIL (-1904809424L) +#define IMAP_SASL_CANCEL (-1904809423L) +#define IMAP_SASL_PROTERR (-1904809422L) +#define IMAP_NO_OVERQUOTA (-1904809421L) +#define IMAP_NO_CLOSEQUOTA (-1904809420L) +#define IMAP_NO_MSGGONE (-1904809419L) +#define IMAP_NO_CHECKSEEN (-1904809418L) +#define IMAP_NO_CHECKPRESERVE (-1904809417L) +#define IMAP_NO_NOSUCHMSG (-1904809416L) +#define IMAP_NO_NOSUCHANNOTATION (-1904809415L) +#define IMAP_NO_UNKNOWN_CTE (-1904809414L) +#define IMAP_BYE_LOGOUT (-1904809413L) +#define IMAP_OK_COMPLETED (-1904809412L) extern const struct error_table et_imap_error_table; extern void initialize_imap_error_table(void); -- 1.8.3.1