From: Wietse Venema Date: Sat, 18 Feb 2017 05:00:00 +0000 (-0500) Subject: postfix-3.3-20170218 X-Git-Tag: v3.3.0-RC1~27 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcbf2b8d6fa660fe017135904ea792fa4305e4a4;p=thirdparty%2Fpostfix.git postfix-3.3-20170218 --- diff --git a/postfix/AAAREADME b/postfix/AAAREADME index e20091c87..e6f5940d5 100644 --- a/postfix/AAAREADME +++ b/postfix/AAAREADME @@ -61,13 +61,16 @@ Safford, Douglas Schales, and Leendert van Doorn. I also appreciate the support by Charles Palmer under whose leadership I began this project, and who had the privilege to name the software, twice. +Postcards +========= + If you wish to express your appreciation for the Postfix software, you are welcome to send a postcard to: Wietse Venema - IBM T.J Watson Research Center - P.O. Box 704, - Yorktown Heights, NY 10598 + Google + 111 8th Avenue, 4th floor + New York, NY 10011 USA Roadmap of the Postfix source distribution diff --git a/postfix/HISTORY b/postfix/HISTORY index a05d6f154..3b7a72b5b 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -22931,10 +22931,14 @@ Apologies for any names omitted. 20170207 - Cleanup: rephrased the precondition paranoia. File: - global/mail_conf.c. + Cleanup: rephrased paranoia precondition. File: global/mail_conf.c. 20170211 - Cleanup: rephrased the precondition for paranoia. File: - util/unsafe.c. + Cleanup: rephrased paranoia precondition. File: util/unsafe.c. + +20170218 + + Cleanup: typofixes from klemens. The only change in compiled + code is in one identical mysql error message that also + appears in the pgsql client. Files: about 50. diff --git a/postfix/Makefile b/postfix/Makefile index bf0bad878..0e79e472c 100644 --- a/postfix/Makefile +++ b/postfix/Makefile @@ -1,7 +1,7 @@ # Usage: # make makefiles [name=value]... # -# See makedefs for a descripton of available options. +# See makedefs for a description of available options. # Examples: # # make makefiles diff --git a/postfix/Makefile.init b/postfix/Makefile.init index bf0bad878..0e79e472c 100644 --- a/postfix/Makefile.init +++ b/postfix/Makefile.init @@ -1,7 +1,7 @@ # Usage: # make makefiles [name=value]... # -# See makedefs for a descripton of available options. +# See makedefs for a description of available options. # Examples: # # make makefiles diff --git a/postfix/TLS_LICENSE b/postfix/TLS_LICENSE index c588674c3..3d54be271 100644 --- a/postfix/TLS_LICENSE +++ b/postfix/TLS_LICENSE @@ -30,7 +30,7 @@ Disclaimer: ILLEGAL IN SOME PARTS OF THE WORLD. SO, WHEN YOU IMPORT THIS PACKAGE TO YOUR COUNTRY, RE-DISTRIBUTE IT FROM THERE OR EVEN JUST EMAIL TECHNICAL SUGGESTIONS OR EVEN SOURCE PATCHES TO THE AUTHOR OR - OTHER PEOPLE YOU ARE STRONGLY ADVICED TO PAY CLOSE ATTENTION TO ANY + OTHER PEOPLE YOU ARE STRONGLY ADVISED TO PAY CLOSE ATTENTION TO ANY EXPORT/IMPORT AND/OR USE LAWS WHICH APPLY TO YOU. THE AUTHOR OF PFIXTLS IS NOT LIABLE FOR ANY VIOLATIONS YOU MAKE HERE. SO BE CAREFULLY YOURSELF, IT IS YOUR RESPONSIBILITY. diff --git a/postfix/WISHLIST b/postfix/WISHLIST index 4d457e647..23db493c9 100644 --- a/postfix/WISHLIST +++ b/postfix/WISHLIST @@ -773,7 +773,7 @@ Wish list: with a badness indicator and then filter down-stream. Make null local-part handling configurable: either expand - into mailer-daemon (current bahavior) or disallow (strict + into mailer-daemon (current behavior) or disallow (strict behavior, currently implemented only in the SMTP server). Add M flag (enable multi-recipient delivery) to pipe daemon. diff --git a/postfix/conf/main.cf b/postfix/conf/main.cf index 0c36e3ac7..7af8bdeea 100644 --- a/postfix/conf/main.cf +++ b/postfix/conf/main.cf @@ -623,7 +623,7 @@ debugger_command = # >$config_directory/$process_name.$process_id.log & sleep 5 # # Another possibility is to run gdb under a detached screen session. -# To attach to the screen sesssion, su root and run "screen -r +# To attach to the screen session, su root and run "screen -r # " where uniquely matches one of the detached # sessions (from "screen -list"). # diff --git a/postfix/conf/postfix-tls-script b/postfix/conf/postfix-tls-script index d66be1b2e..2c3430a1a 100644 --- a/postfix/conf/postfix-tls-script +++ b/postfix/conf/postfix-tls-script @@ -1099,7 +1099,7 @@ output-server-tlsa) done set_fqdn "${hostname}" - # Here positional arguments are keyfiles for which we ouput "3 1 1" + # Here positional arguments are keyfiles for which we output "3 1 1" # TLSA RRs, as many keyfiles as the user wants. By default the live # RSA and/or ECDSA keys. shift `expr $OPTIND - 1` diff --git a/postfix/mantools/ccformat b/postfix/mantools/ccformat index c9ec6aeb6..9ac6c57af 100755 --- a/postfix/mantools/ccformat +++ b/postfix/mantools/ccformat @@ -4,7 +4,7 @@ # @(#) ccformat.sh 1.3 11/5/89 14:39:29 -# how to supress newlines in echo +# how to suppress newlines in echo case `echo -n` in "") n=-n; c=;; @@ -139,7 +139,7 @@ exit # These are often carefully laid out by the programmer. # .sp # Comments that appear in-between statements are lined up with -# the surrounding program text, and are adjusted to accomodate +# the surrounding program text, and are adjusted to accommodate # as many words on a line as possible. # However, a blank line in the middle of a comment is respected. # .sp diff --git a/postfix/postfix-install b/postfix/postfix-install index 1d90379ab..e498cd34a 100644 --- a/postfix/postfix-install +++ b/postfix/postfix-install @@ -376,7 +376,7 @@ check_parent() { done } -# How to supress newlines in echo. +# How to suppress newlines in echo. case `echo -n` in "") n=-n; c=;; diff --git a/postfix/src/bounce/bounce_template.c b/postfix/src/bounce/bounce_template.c index 39fef8fda..e54082dff 100644 --- a/postfix/src/bounce/bounce_template.c +++ b/postfix/src/bounce/bounce_template.c @@ -306,7 +306,7 @@ static void bounce_template_parse_buffer(BOUNCE_TEMPLATE *tp) * Parse pseudo-header labels and values. * * XXX EAI: allow UTF8 in template headers when responding to SMTPUTF8 - * message. Sending SMTPUTF8 in reponse to non-SMTPUTF8 mail would make + * message. Sending SMTPUTF8 in response to non-SMTPUTF8 mail would make * no sense. */ #define GETLINE(line, buf) \ diff --git a/postfix/src/cleanup/cleanup_body_edit.c b/postfix/src/cleanup/cleanup_body_edit.c index 5219dcc98..7a1bb4f17 100644 --- a/postfix/src/cleanup/cleanup_body_edit.c +++ b/postfix/src/cleanup/cleanup_body_edit.c @@ -110,7 +110,7 @@ int cleanup_body_edit_start(CLEANUP_STATE *state) cleanup_region_return(state, state->body_regions); /* - * Select the first region. XXX This will usally be the original body + * Select the first region. XXX This will usually be the original body * segment, but we must not count on that. Region assignments may change * when header editing also uses queue file regions. XXX We don't really * know if the first region will be large enough to hold the first body diff --git a/postfix/src/cleanup/cleanup_milter.c b/postfix/src/cleanup/cleanup_milter.c index 55cfb539a..4383a943e 100644 --- a/postfix/src/cleanup/cleanup_milter.c +++ b/postfix/src/cleanup/cleanup_milter.c @@ -1896,7 +1896,7 @@ void cleanup_milter_receive(CLEANUP_STATE *state, int count) cleanup_repl_body, (void *) state); } -/* cleanup_milter_apply - apply Milter reponse, non-zero if rejecting */ +/* cleanup_milter_apply - apply Milter response, non-zero if rejecting */ static const char *cleanup_milter_apply(CLEANUP_STATE *state, const char *event, const char *resp) diff --git a/postfix/src/cleanup/cleanup_region.c b/postfix/src/cleanup/cleanup_region.c index bfa08a23b..b2acbee02 100644 --- a/postfix/src/cleanup/cleanup_region.c +++ b/postfix/src/cleanup/cleanup_region.c @@ -38,7 +38,7 @@ /* queue file is complete. /* /* cleanup_region_open() opens an existing region or creates -/* a new region that can accomodate at least the specified +/* a new region that can accommodate at least the specified /* amount of space. A new region is an open-ended region at /* the end of the file; it must be closed (see next) before /* unrelated data can be appended to the same file. diff --git a/postfix/src/global/clnt_stream.c b/postfix/src/global/clnt_stream.c index dacdba218..2eec1fc8b 100644 --- a/postfix/src/global/clnt_stream.c +++ b/postfix/src/global/clnt_stream.c @@ -127,7 +127,7 @@ static void clnt_stream_ttl_event(int event, void *context) * with the call-back routine, but there is too much code that would have * to be changed. * - * XXX Should we be concerned that an overly agressive optimizer will + * XXX Should we be concerned that an overly aggressive optimizer will * eliminate this function and replace calls to clnt_stream_ttl_event() * by direct calls to clnt_stream_event()? It should not, because there * exists code that takes the address of both functions. diff --git a/postfix/src/global/dict_mysql.c b/postfix/src/global/dict_mysql.c index 8af8fef6f..3a31a7e9a 100644 --- a/postfix/src/global/dict_mysql.c +++ b/postfix/src/global/dict_mysql.c @@ -57,7 +57,7 @@ /* List of domains the queries should be restricted to. If /* specified, only FQDN addresses whose domain parts matching this /* list will be queried against the SQL database. Lookups for -/* partial addresses are also supressed. This can significantly +/* partial addresses are also suppressed. This can significantly /* reduce the query load on the server. /* .IP query /* Query template, before the query is actually issued, variable @@ -814,13 +814,13 @@ DICT *dict_mysql_open(const char *name, int open_flags, int dict_flags) #endif dict_mysql->pldb = plmysql_init(dict_mysql->hosts); if (dict_mysql->pldb == NULL) - msg_fatal("couldn't intialize pldb!\n"); + msg_fatal("couldn't initialize pldb!\n"); dict_mysql->dict.owner = cfg_get_owner(dict_mysql->parser); return (DICT_DEBUG (&dict_mysql->dict)); } /* - * plmysql_init - initalize a MYSQL database. + * plmysql_init - initialize a MYSQL database. * Return NULL on failure, or a PLMYSQL * on success. */ static PLMYSQL *plmysql_init(ARGV *hosts) diff --git a/postfix/src/global/dict_pgsql.c b/postfix/src/global/dict_pgsql.c index 68de3f291..e3e6d3027 100644 --- a/postfix/src/global/dict_pgsql.c +++ b/postfix/src/global/dict_pgsql.c @@ -64,7 +64,7 @@ /* List of domains the queries should be restricted to. If /* specified, only FQDN addresses whose domain parts matching this /* list will be queried against the SQL database. Lookups for -/* partial addresses are also supressed. This can significantly +/* partial addresses are also suppressed. This can significantly /* reduce the query load on the server. /* .IP result_format /* The format used to expand results from queries. Substitutions @@ -778,12 +778,12 @@ DICT *dict_pgsql_open(const char *name, int open_flags, int dict_flags) dict_pgsql->active_host = 0; dict_pgsql->pldb = plpgsql_init(dict_pgsql->hosts); if (dict_pgsql->pldb == NULL) - msg_fatal("couldn't intialize pldb!\n"); + msg_fatal("couldn't initialize pldb!\n"); dict_pgsql->dict.owner = cfg_get_owner(dict_pgsql->parser); return (DICT_DEBUG (&dict_pgsql->dict)); } -/* plpgsql_init - initalize a PGSQL database */ +/* plpgsql_init - initialize a PGSQL database */ static PLPGSQL *plpgsql_init(ARGV *hosts) { diff --git a/postfix/src/global/mail_params.h b/postfix/src/global/mail_params.h index 0c9e7be5b..3cc94a02b 100644 --- a/postfix/src/global/mail_params.h +++ b/postfix/src/global/mail_params.h @@ -399,7 +399,7 @@ extern char *var_drop_hdrs; extern bool var_strict_rfc821_env; /* - * Standards violation: send "250 AUTH=list" in order to accomodate clients + * Standards violation: send "250 AUTH=list" in order to accommodate clients * that implement an old version of the protocol. */ #define VAR_BROKEN_AUTH_CLNTS "broken_sasl_auth_clients" @@ -3496,7 +3496,7 @@ extern bool var_strict_mbox_owner; extern int var_inet_windowsize; /* - * Plug-in multi-instance support. Only the first two paramaters are used by + * Plug-in multi-instance support. Only the first two parameters are used by * Postfix itself; the other ones are reserved for the instance manager. */ #define VAR_MULTI_CONF_DIRS "multi_instance_directories" diff --git a/postfix/src/global/mail_queue.h b/postfix/src/global/mail_queue.h index 7b98f9012..3d41177da 100644 --- a/postfix/src/global/mail_queue.h +++ b/postfix/src/global/mail_queue.h @@ -92,7 +92,7 @@ extern int mail_queue_id_ok(const char *); * - the inode number (base 51 encoded so that it contains no 'z'). */ #define MQID_LG_SEC_BASE 52 /* seconds safe alphabet base */ -#define MQID_LG_SEC_PAD 6 /* seconds minumum field width */ +#define MQID_LG_SEC_PAD 6 /* seconds minimum field width */ #define MQID_LG_USEC_BASE 52 /* microseconds safe alphabet base */ #define MQID_LG_USEC_PAD 4 /* microseconds exact field width */ #define MQID_LG_TIME_PAD (MQID_LG_SEC_PAD + MQID_LG_USEC_PAD) diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index 647f88ea6..c33aa351e 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change both the patchlevel and the release date. Snapshots have no * patchlevel; they change the release date only. */ -#define MAIL_RELEASE_DATE "20170212" +#define MAIL_RELEASE_DATE "20170218" #define MAIL_VERSION_NUMBER "3.3" #ifdef SNAPSHOT diff --git a/postfix/src/global/mime_state.c b/postfix/src/global/mime_state.c index 48eef5cf5..4e81043e3 100644 --- a/postfix/src/global/mime_state.c +++ b/postfix/src/global/mime_state.c @@ -940,7 +940,7 @@ int mime_state_update(MIME_STATE *state, int rec_type, /* * Find out if the next body starts with its own message headers. In - * agressive mode, examine headers of partial and external-body + * aggressive mode, examine headers of partial and external-body * messages. Otherwise, treat such headers as part of the "body". Set * the proper encoding information for the multipart prolog. * @@ -1043,7 +1043,7 @@ int mime_state_update(MIME_STATE *state, int rec_type, /* * Body text. Look for message boundaries, and recover from missing - * boundary strings. Missing boundaries can happen in agressive mode + * boundary strings. Missing boundaries can happen in aggressive mode * with text/rfc822-headers or with message/partial. Ignore non-space * cruft after --boundary or --boundary--, because some MUAs do, and * because only perverse software would take advantage of this to diff --git a/postfix/src/global/mkmap_db.c b/postfix/src/global/mkmap_db.c index 3f69eca52..d2c87efd5 100644 --- a/postfix/src/global/mkmap_db.c +++ b/postfix/src/global/mkmap_db.c @@ -113,7 +113,7 @@ static MKMAP *mkmap_db_before_open(const char *path, * files performance degrades rapidly unless the memory pool is O(file * size). * - * For "btree" files peformance is good with sorted input even for small + * For "btree" files performance is good with sorted input even for small * memory pools, but with random input degrades rapidly unless the memory * pool is O(file size). * diff --git a/postfix/src/global/post_mail.c b/postfix/src/global/post_mail.c index fbb631d9b..fcc95ac34 100644 --- a/postfix/src/global/post_mail.c +++ b/postfix/src/global/post_mail.c @@ -80,7 +80,7 @@ /* open stream and the caller-specified context when the /* service responds, or with a null stream and the caller-specified /* context when the request could not be completed. It is the -/* responsability of the application to close an open stream. +/* responsibility of the application to close an open stream. /* /* post_mail_fprintf() formats message content (header or body) /* and sends it to the cleanup service. diff --git a/postfix/src/global/rcpt_buf.c b/postfix/src/global/rcpt_buf.c index 73175fd03..d67905027 100644 --- a/postfix/src/global/rcpt_buf.c +++ b/postfix/src/global/rcpt_buf.c @@ -58,7 +58,7 @@ /* Yorktown Heights, NY 10598, USA /*--*/ -/* Syste, library. */ +/* System library. */ #include diff --git a/postfix/src/global/rec_type.h b/postfix/src/global/rec_type.h index a51e828d4..43865290d 100644 --- a/postfix/src/global/rec_type.h +++ b/postfix/src/global/rec_type.h @@ -135,7 +135,7 @@ /* * The warn record specifies when the next warning that the message was * deferred should be sent. It is updated in place by qmgr, so changing - * this value when there are deferred mesages in the queue is dangerous! + * this value when there are deferred messages in the queue is dangerous! */ #define REC_TYPE_WARN_FORMAT "%15ld" /* warning time format */ #define REC_TYPE_WARN_ARG(tv) ((long) (tv)) diff --git a/postfix/src/global/scache.h b/postfix/src/global/scache.h index 46720994d..5d6e7165c 100644 --- a/postfix/src/global/scache.h +++ b/postfix/src/global/scache.h @@ -92,7 +92,7 @@ typedef int (*SCACHE_FIND_DEST_FN) (SCACHE *, const char *, VSTRING *, VSTRING * */ struct SCACHE_SIZE { int dest_count; /* Nr of destination names */ - int endp_count; /* Nr of endpoint adresses */ + int endp_count; /* Nr of endpoint addresses */ int sess_count; /* Nr of cached sessions */ }; diff --git a/postfix/src/global/smtputf8.h b/postfix/src/global/smtputf8.h index 3b779986b..95d658356 100644 --- a/postfix/src/global/smtputf8.h +++ b/postfix/src/global/smtputf8.h @@ -16,7 +16,7 @@ * environments with pre-existing mail flows that contain UTF8. * * Prior to SMTPUTF8, mail flows that contain UTF8 worked because the vast - * majority of MTAs is perfectly capable of handling UTF8 in addres + * majority of MTAs is perfectly capable of handling UTF8 in address * localparts (and in headers), even if pre-SMTPUTF8 standards do not * support this practice. * @@ -25,7 +25,7 @@ * client does not request SMTPUTF8 support, and because 2) a down-stream * MTA does not announce SMTPUTF8 support. * - * While 1) is easy enough to avoid (keep accepting UTF8 in addres localparts + * While 1) is easy enough to avoid (keep accepting UTF8 in address localparts * just like Postfix has always done), 2) presents a thornier problem. The * root cause of that problem is the need for SMTPUTF8 autodetection. * diff --git a/postfix/src/global/verify_sender_addr.c b/postfix/src/global/verify_sender_addr.c index d23522d09..e818f90f7 100644 --- a/postfix/src/global/verify_sender_addr.c +++ b/postfix/src/global/verify_sender_addr.c @@ -295,7 +295,7 @@ int main(int argc, char **argv) verify_time = time((time_t *) 0); /* - * Compute the current probe sender addres. + * Compute the current probe sender address. */ verify_sender = make_verify_sender_addr(); diff --git a/postfix/src/local/alias.c b/postfix/src/local/alias.c index d84f1d106..99e3dd660 100644 --- a/postfix/src/local/alias.c +++ b/postfix/src/local/alias.c @@ -129,7 +129,7 @@ int deliver_alias(LOCAL_STATE state, USER_ATTR usr_attr, * * We cannot do duplicate elimination here. Sendmail compatibility requires * that we allow multiple deliveries to the same alias, even recursively! - * For example, we must deliver to mailbox any messags that are addressed + * For example, we must deliver to mailbox any messages that are addressed * to the alias of a user that lists that same alias in her own .forward * file. Yuck! This is just an example of some really perverse semantics * that people will expect Postfix to implement just like sendmail. diff --git a/postfix/src/oqmgr/qmgr_error.c b/postfix/src/oqmgr/qmgr_error.c index 6d07b3bd8..6541c3531 100644 --- a/postfix/src/oqmgr/qmgr_error.c +++ b/postfix/src/oqmgr/qmgr_error.c @@ -22,7 +22,7 @@ /* /* qmgr_error_queue() looks up an error queue for the specified /* service and problem. The result is null if the queue is not -/* availabe. +/* available. /* /* qmgr_error_nexthop() computes the next-hop information for /* the specified problem. The result must be passed to myfree(). diff --git a/postfix/src/postalias/postalias.c b/postfix/src/postalias/postalias.c index e5dea9b9e..80c2eb6e3 100644 --- a/postfix/src/postalias/postalias.c +++ b/postfix/src/postalias/postalias.c @@ -505,7 +505,7 @@ static int postalias_queries(VSTREAM *in, char **maps, const int map_count, dicts[n] = 0; /* - * Perform all queries. Open maps on the fly, to avoid opening unecessary + * Perform all queries. Open maps on the fly, to avoid opening unnecessary * maps. */ while (vstring_get_nonl(keybuf, in) != VSTREAM_EOF) { diff --git a/postfix/src/postmulti/postmulti.c b/postfix/src/postmulti/postmulti.c index b5da89846..f8fef2df8 100644 --- a/postfix/src/postmulti/postmulti.c +++ b/postfix/src/postmulti/postmulti.c @@ -763,7 +763,7 @@ static INSTANCE *create_primary_instance(void) INSTANCE *ip = alloc_instance(var_config_dir); /* - * There is no need to load primary instance paramater settings from + * There is no need to load primary instance parameter settings from * file. We already have the main.cf parameters of interest in memory. */ #define SAVE_INSTANCE_NAME(val) (*(val) ? mystrdup(val) : 0) @@ -1814,7 +1814,7 @@ int main(int argc, char **argv) } /* - * Proces main.cf parameters. + * Process main.cf parameters. */ mail_conf_read(); get_mail_conf_str_table(str_table); diff --git a/postfix/src/postscreen/postscreen_dnsbl.c b/postfix/src/postscreen/postscreen_dnsbl.c index 788b8d8b1..32eec4bea 100644 --- a/postfix/src/postscreen/postscreen_dnsbl.c +++ b/postfix/src/postscreen/postscreen_dnsbl.c @@ -214,7 +214,7 @@ typedef struct { */ static VSTRING *reply_client; /* client address in DNSBLOG reply */ static VSTRING *reply_dnsbl; /* domain in DNSBLOG reply */ -static VSTRING *reply_addr; /* adress list in DNSBLOG reply */ +static VSTRING *reply_addr; /* address list in DNSBLOG reply */ /* psc_dnsbl_add_site - add DNSBL site information */ diff --git a/postfix/src/qmgr/qmgr_error.c b/postfix/src/qmgr/qmgr_error.c index 6d07b3bd8..6541c3531 100644 --- a/postfix/src/qmgr/qmgr_error.c +++ b/postfix/src/qmgr/qmgr_error.c @@ -22,7 +22,7 @@ /* /* qmgr_error_queue() looks up an error queue for the specified /* service and problem. The result is null if the queue is not -/* availabe. +/* available. /* /* qmgr_error_nexthop() computes the next-hop information for /* the specified problem. The result must be passed to myfree(). diff --git a/postfix/src/smtp/smtp.h b/postfix/src/smtp/smtp.h index 1a0a6a6a7..da459aff8 100644 --- a/postfix/src/smtp/smtp.h +++ b/postfix/src/smtp/smtp.h @@ -395,7 +395,7 @@ extern HBC_CALL_BACKS smtp_hbc_callbacks[]; * at completely different times. * * We "freeze" the choice in the sender loop, just before we generate "." or - * "RSET". The reader loop leaves the connection cachable even if the timer + * "RSET". The reader loop leaves the connection cacheable even if the timer * expires by the time the response arrives. The connection cleanup code * will call smtp_quit() for connections with an expired cache expiration * timer. diff --git a/postfix/src/smtp/smtp_sasl_auth_cache.c b/postfix/src/smtp/smtp_sasl_auth_cache.c index b0ae35730..f3104ca81 100644 --- a/postfix/src/smtp/smtp_sasl_auth_cache.c +++ b/postfix/src/smtp/smtp_sasl_auth_cache.c @@ -128,7 +128,7 @@ SMTP_SASL_AUTH_CACHE *smtp_sasl_auth_cache_init(const char *map, int ttl) * XXX To avoid multiple writers the map needs to be maintained by the * proxywrite service. We would like to have a DICT_FLAG_REQ_PROXY flag * so that the library can enforce this, but that requires moving the - * dict_proxy module one level down in the build dependency hierachy. + * dict_proxy module one level down in the build dependency hierarchy. */ #define CACHE_DICT_OPEN_FLAGS \ (DICT_FLAG_DUP_REPLACE | DICT_FLAG_SYNC_UPDATE | DICT_FLAG_UTF8_REQUEST) diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index f1dca8684..986264b22 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -2589,7 +2589,7 @@ static int mail_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) /* * Historically, Postfix does not forbid 8-bit envelope localparts. * Changing this would be a compatibility break. That can't happen in the - * forseeable future. + * foreseeable future. */ if ((var_strict_smtputf8 || warn_compat_break_smtputf8_enable) && (state->flags & SMTPD_FLAG_SMTPUTF8) == 0 @@ -2851,7 +2851,7 @@ static int rcpt_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) /* * Historically, Postfix does not forbid 8-bit envelope localparts. * Changing this would be a compatibility break. That can't happen in the - * forseeable future. + * foreseeable future. */ if ((var_strict_smtputf8 || warn_compat_break_smtputf8_enable) && (state->flags & SMTPD_FLAG_SMTPUTF8) == 0 @@ -3621,7 +3621,7 @@ static int vrfy_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) /* * The SMTP standard (RFC 821) disallows unquoted special characters in * the VRFY argument. Common practice violates the standard, however. - * Postfix accomodates common practice where it violates the standard. + * Postfix accommodates common practice where it violates the standard. * * XXX Impedance mismatch! The SMTP command tokenizer preserves quoting, * whereas the recipient restrictions checks expect unquoted (internal) diff --git a/postfix/src/smtpd/smtpd_chat.c b/postfix/src/smtpd/smtpd_chat.c index 3e161f131..8ba46b01c 100644 --- a/postfix/src/smtpd/smtpd_chat.c +++ b/postfix/src/smtpd/smtpd_chat.c @@ -28,7 +28,7 @@ /* /* smtpd_chat_reply() formats a server reply, sends it to the /* client, and appends a copy to the SMTP transaction log. -/* When soft_bounce is enabled, all 5xx (reject) reponses are +/* When soft_bounce is enabled, all 5xx (reject) responses are /* replaced by 4xx (try again). In case of a 421 reply the /* SMTPD_FLAG_HANGUP flag is set for orderly disconnect. /* diff --git a/postfix/src/smtpd/smtpd_sasl_glue.c b/postfix/src/smtpd/smtpd_sasl_glue.c index 569f771d7..3a0782dc7 100644 --- a/postfix/src/smtpd/smtpd_sasl_glue.c +++ b/postfix/src/smtpd/smtpd_sasl_glue.c @@ -309,7 +309,7 @@ int smtpd_sasl_authenticate(SMTPD_STATE *state, /* * Receive the client response. "*" means that the client gives up. * XXX For now we ignore the fact that an excessively long response - * will be chopped into multiple reponses. To handle such responses, + * will be chopped into multiple responses. To handle such responses, * we need to change smtpd_chat_query() so that it returns an error * indication. */ diff --git a/postfix/src/tls/tls_dane.c b/postfix/src/tls/tls_dane.c index 53fac90be..df4e68542 100644 --- a/postfix/src/tls/tls_dane.c +++ b/postfix/src/tls/tls_dane.c @@ -1455,7 +1455,7 @@ static int set_issuer_name(X509 *cert, AUTHORITY_KEYID *akid) X509_NAME *name = akid_issuer_name(akid); /* - * If subject's akid specifies an authority key identifer issuer name, we + * If subject's akid specifies an authority key identifier issuer name, we * must use that. */ if (name) diff --git a/postfix/src/tls/tls_scache.c b/postfix/src/tls/tls_scache.c index ca86cc258..dcfd3d0a2 100644 --- a/postfix/src/tls/tls_scache.c +++ b/postfix/src/tls/tls_scache.c @@ -90,7 +90,7 @@ /* .IP verbose /* Do verbose logging of cache operations? (zero == no) /* .IP timeout -/* The time after wich a session cache entry is considered too old. +/* The time after which a session cache entry is considered too old. /* .IP first_next /* One of DICT_SEQ_FUN_FIRST (first cache element) or DICT_SEQ_FUN_NEXT /* (next cache element). diff --git a/postfix/src/tls/tls_verify.c b/postfix/src/tls/tls_verify.c index 87af0c6f7..85d5f649d 100644 --- a/postfix/src/tls/tls_verify.c +++ b/postfix/src/tls/tls_verify.c @@ -428,7 +428,7 @@ const char *tls_dns_name(const GENERAL_NAME * gn, msg_panic("%s: Non DNS input argument", myname); /* - * We expect the OpenSSL library to construct GEN_DNS extesion objects as + * We expect the OpenSSL library to construct GEN_DNS extension objects as * ASN1_IA5STRING values. Check we got the right union member. */ if (ASN1_STRING_type(gn->d.ia5) != V_ASN1_IA5STRING) { diff --git a/postfix/src/tlsproxy/tlsproxy.c b/postfix/src/tlsproxy/tlsproxy.c index ed3e6b4e9..383ba0d60 100644 --- a/postfix/src/tlsproxy/tlsproxy.c +++ b/postfix/src/tlsproxy/tlsproxy.c @@ -672,7 +672,7 @@ static void tlsp_start_tls(TLSP_STATE *state) */ /* - * Perform the before-handshake portion of the per-session initalization. + * Perform the before-handshake portion of the per-session initialization. * Pass a null VSTREAM to indicate that this program, will do the * ciphertext I/O, not libtls. * diff --git a/postfix/src/util/auto_clnt.c b/postfix/src/util/auto_clnt.c index 0ca70c84f..2703054e8 100644 --- a/postfix/src/util/auto_clnt.c +++ b/postfix/src/util/auto_clnt.c @@ -153,7 +153,7 @@ static void auto_clnt_ttl_event(int event, void *context) * with the call-back routine, but there is too much code that would have * to be changed. * - * XXX Should we be concerned that an overly agressive optimizer will + * XXX Should we be concerned that an overly aggressive optimizer will * eliminate this function and replace calls to auto_clnt_ttl_event() by * direct calls to auto_clnt_event()? It should not, because there exists * code that takes the address of both functions. diff --git a/postfix/src/util/casefold.c b/postfix/src/util/casefold.c index 1ece42305..bf47b6a5e 100644 --- a/postfix/src/util/casefold.c +++ b/postfix/src/util/casefold.c @@ -187,7 +187,7 @@ char *casefoldx(int flags, VSTRING *dest, const char *src, ssize_t len) * with space_needed below) does not include storage for the null * terminator. The terminator is written only when the output buffer is * large enough. This is why we overallocate space when the output does - * not fit. But if the output fits exactly, then the ouput will be + * not fit. But if the output fits exactly, then the output will be * unterminated, and we have to terminate the output ourselves. */ for (n = 0; n < 3; n++) { diff --git a/postfix/src/util/edit_file.c b/postfix/src/util/edit_file.c index 39564b054..a7c1059cc 100644 --- a/postfix/src/util/edit_file.c +++ b/postfix/src/util/edit_file.c @@ -55,7 +55,7 @@ /* pathname into the place of the original file. When any of /* these operations fails, edit_file_close() behaves as if /* edit_file_cleanup() was called. Regardless of whether these -/* operations suceed, edit_file_close() releases the exclusive +/* operations succeed, edit_file_close() releases the exclusive /* lock, closes the output file, and frees up memory that was /* allocated by edit_file_open(). /* diff --git a/postfix/src/util/extpar.c b/postfix/src/util/extpar.c index 24708f74b..773649f3e 100644 --- a/postfix/src/util/extpar.c +++ b/postfix/src/util/extpar.c @@ -39,7 +39,7 @@ /* In case of error the result value is a dynamically-allocated /* string with a description of the problem that includes a /* copy of the offending input. A non-null result value should -/* be destroyed with myfree(). The following decribes the errors +/* be destroyed with myfree(). The following describes the errors /* and the state of the buffer and buffer pointer. /* .IP "missing closing parenthesis" /* The buffer pointer points to text as if a closing parenthesis diff --git a/postfix/src/util/inet_proto.c b/postfix/src/util/inet_proto.c index d0ad6d0d4..d3bf15d70 100644 --- a/postfix/src/util/inet_proto.c +++ b/postfix/src/util/inet_proto.c @@ -214,7 +214,7 @@ INET_PROTO_INFO *inet_proto_init(const char *context, const char *protocols) } /* - * Store addess family etc. info as null-terminated vectors. If that + * Store address family etc. info as null-terminated vectors. If that * breaks because we must be able to store nulls, we'll deal with the * additional complexity. * diff --git a/postfix/src/util/myflock.c b/postfix/src/util/myflock.c index 6f8c0418c..bd903ee70 100644 --- a/postfix/src/util/myflock.c +++ b/postfix/src/util/myflock.c @@ -14,7 +14,7 @@ /* myflock() locks or unlocks an entire open file. /* /* In the case of a blocking request, a call that fails due to -/* forseeable transient problems is retried once per second. +/* foreseeable transient problems is retried once per second. /* /* Arguments: /* .IP fd diff --git a/postfix/src/util/slmdb.c b/postfix/src/util/slmdb.c index bcf757788..cee054619 100644 --- a/postfix/src/util/slmdb.c +++ b/postfix/src/util/slmdb.c @@ -156,7 +156,7 @@ /* result value. /* .IP "CA_SLMDB_CTL_NOTIFY_FN(void (*)(void *, int, ...))" /* Call-back function pointer. The function is called to report -/* succesful error recovery. The arguments are the application +/* successful error recovery. The arguments are the application /* context, the MDB error code, and additional arguments that /* depend on the error code. Details are given in the section /* "ERROR RECOVERY". diff --git a/postfix/src/util/vstream.c b/postfix/src/util/vstream.c index aaf499b35..00c066c43 100644 --- a/postfix/src/util/vstream.c +++ b/postfix/src/util/vstream.c @@ -365,7 +365,7 @@ /* vstream_feof() returns non-zero when a previous operation on the /* specified stream caused an end-of-file condition. /* Although further read requests after EOF may complete -/* succesfully, vstream_feof() will keep returning non-zero +/* successfully, vstream_feof() will keep returning non-zero /* until vstream_clearerr() is called for that stream. /* /* vstream_ferror() returns non-zero when a previous operation on the diff --git a/postfix/src/util/vstream.h b/postfix/src/util/vstream.h index cb2f517bc..b04e8beca 100644 --- a/postfix/src/util/vstream.h +++ b/postfix/src/util/vstream.h @@ -55,7 +55,7 @@ typedef struct VSTREAM { VBUF write_buf; /* write buffer (double-buffered) */ pid_t pid; /* vstream_popen/close() */ VSTREAM_WAITPID_FN waitpid_fn; /* vstream_popen/close() */ - int timeout; /* read/write timout */ + int timeout; /* read/write timeout */ VSTREAM_JMP_BUF *jbuf; /* exception handling */ struct timeval iotime; /* time of last fill/flush */ struct timeval time_limit; /* read/write time limit */ diff --git a/postfix/src/xsasl/xsasl_server.c b/postfix/src/xsasl/xsasl_server.c index 669a867a6..03819b74a 100644 --- a/postfix/src/xsasl/xsasl_server.c +++ b/postfix/src/xsasl/xsasl_server.c @@ -92,7 +92,7 @@ /* It destroys a SASL server instance, and disables further /* read/write operations if encryption was turned on. /* -/* xsasl_server_first() produces the server reponse for the +/* xsasl_server_first() produces the server response for the /* client AUTH command. The client input are an authentication /* method, and an optional initial response or null pointer. /* The initial response and server non-error replies are BASE64