diff --git a/postfix/HISTORY b/postfix/HISTORY
index 641de0ecb..a92edce61 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -28341,3 +28341,56 @@ Apologies for any names omitted.
 
 	Cleanup (no code change): regenerated HTML manpages that
 	weren't updated because of a simplistic make(1) dependency.
+
+20241010
+
+	Cleanup (no code change): reformatted source files that
+	diverged from Postfix style, complicating code maintenance.
+	The only object file change is in tls_dane.o, because
+	OPENSSL_free() has a line number argument. Other object
+	files are unchanged. Files: bounce/bounce_notify_util_tester.c,
+	bounce/bounce_one_service.c, cleanup/cleanup.c,
+	cleanup/cleanup_api.c, cleanup/cleanup_envelope.c,
+	cleanup/cleanup_out_recipient.c, cleanup/cleanup_rewrite.c,
+	dns/dns.h, dns/dns_lookup.c, dns/dns_rr_filter.c, dns/dns_sec.c,
+	global/bounce_log.h, global/cleanup_user.h, global/clnt_stream.h,
+	global/compat_level.c, global/compat_level.h, global/conv_time.c,
+	global/db_common.h, global/dot_lockfile_as.c,
+	global/header_body_checks.c, global/info_log_addr_form.c,
+	global/is_header.c, global/mail_addr_map.c,
+	global/mail_command_server.c, global/mail_conf.c,
+	global/mail_conf_raw.c, global/mail_conf_str.c, global/mail_copy.c,
+	global/mail_params.c, global/mail_proto.h, global/mail_queue.h,
+	global/mail_trigger.c, global/maillog_client.c,
+	global/mkmap_proxy.c, global/own_inet_addr.c,
+	global/quote_821_local.c, global/quote_821_local.h,
+	global/quote_822_local.c, global/quote_822_local.h,
+	global/rec_type.h, global/recdump.c, global/sent.h,
+	global/server_acl.c, global/smtputf8.c, global/smtputf8.h,
+	global/tok822_tree.c, global/user_acl.h,
+	global/valid_mailhost_addr.c, global/xtext.c, local/alias.c,
+	local/command.c, master/master.c, master/master.h,
+	master/master_listen.c, master/master_proto.h,
+	master/master_service.c, master/master_watch.c, milter/milter8.c,
+	milter/test-milter.c, oqmgr/qmgr_active.c, oqmgr/qmgr_entry.c,
+	pipe/pipe.c, postfix/postfix.c, postscreen/postscreen_dnsbl.c,
+	posttls-finger/posttls-finger.c, qmgr/qmgr_active.c,
+	qmgr/qmgr_entry.c, qmqpd/qmqpd_peer.c, smtp/smtp.h,
+	smtp/smtp_addr.c, smtp/smtp_tlsrpt.c, smtp/smtp_unalias.c,
+	smtpd/smtpd_milter.h, smtpd/smtpd_resolve.h, tls/tls_client.c,
+	tls/tls_dane.c, tls/tls_dh.c, tls/tls_misc.c,
+	tls/tls_proxy_client_print.c, tls/tls_server.c, util/alldig.c,
+	util/argv_split.c, util/balpar.c, util/byte_mask.c,
+	util/cidr_match.h, util/dict.h, util/dict_cdb.h,
+	util/dict_stream.c, util/dup2_pass_on_exec.c, util/duplex_pipe.c,
+	util/exec_command.c, util/find_inet.c, util/format_tv.c,
+	util/hash_fnv.c, util/host_port.c, util/inet_addr_sizes.c,
+	util/inet_connect.c, util/load_file.h, util/load_lib.h,
+	util/mac_expand.h, util/midna_domain.h, util/mkmap_cdb.c,
+	util/mvect.c, util/myaddrinfo.h, util/name_mask.c,
+	util/open_limit.c, util/parse_utf8_char.h, util/posix_signals.c,
+	util/sane_strtol.c, util/set_eugid.c, util/slmdb.c,
+	util/sock_addr.c, util/strcasecmp.c, util/stream_connect.c,
+	util/stream_recv_fd.c, util/stream_test.c,
+	util/unix_dgram_connect.c, util/unix_dgram_listen.c,
+	util/vbuf.c.
diff --git a/postfix/proto/stop b/postfix/proto/stop
index 1160a4bc5..17efcfae1 100644
--- a/postfix/proto/stop
+++ b/postfix/proto/stop
@@ -1652,3 +1652,4 @@ mailto
 ipaddr
 STS
 hs
+ccformat
diff --git a/postfix/proto/stop.double-history b/postfix/proto/stop.double-history
index ea90445ac..2a02341d3 100644
--- a/postfix/proto/stop.double-history
+++ b/postfix/proto/stop.double-history
@@ -133,3 +133,8 @@ proto  proto mysql_table proto pgsql_table proto ldap_table
  Files src tls tls h src tls tls_dh c src tls tls_misc c 
  proto TLSRPT_README html proto postconf proto smtp smtp c 
  proto aliases cleanup cleanup c local local c smtpd smtpd c 
+ bounce bounce_one_service c cleanup cleanup c 
+ dns dns h dns dns_lookup c dns dns_rr_filter c dns dns_sec c 
+ local command c master master c master master h 
+ pipe pipe c postfix postfix c postscreen postscreen_dnsbl c 
+ qmgr qmgr_entry c qmqpd qmqpd_peer c smtp smtp h 
diff --git a/postfix/src/bounce/bounce_notify_util_tester.c b/postfix/src/bounce/bounce_notify_util_tester.c
index da13f4705..3151ced48 100644
--- a/postfix/src/bounce/bounce_notify_util_tester.c
+++ b/postfix/src/bounce/bounce_notify_util_tester.c
@@ -60,7 +60,7 @@ static void test_driver(int argc, char **argv)
     if (chdir(var_queue_dir) < 0)
 	msg_fatal("chdir %s: %m", var_queue_dir);
 
-    bounce_hfrom_format = 
+    bounce_hfrom_format =
 	hfrom_format_parse(VAR_HFROM_FORMAT, var_hfrom_format);
 
     /*
diff --git a/postfix/src/bounce/bounce_one_service.c b/postfix/src/bounce/bounce_one_service.c
index 29c4fc3cc..18092e6e5 100644
--- a/postfix/src/bounce/bounce_one_service.c
+++ b/postfix/src/bounce/bounce_one_service.c
@@ -218,7 +218,7 @@ int     bounce_one_service(int flags, char *queue_name, char *queue_id,
 #define SEND_POSTMASTER_SINGLE_BOUNCE_NOTICE (notify_mask & MAIL_ERROR_BOUNCE)
 
 	if (bounce_status == 0 && SEND_POSTMASTER_SINGLE_BOUNCE_NOTICE
-	    && strcasecmp_utf8(orig_sender, mail_addr_double_bounce()) != 0) {
+	  && strcasecmp_utf8(orig_sender, mail_addr_double_bounce()) != 0) {
 
 	    /*
 	     * Send the text with reason for the bounce, and the headers of
diff --git a/postfix/src/cleanup/cleanup.c b/postfix/src/cleanup/cleanup.c
index 9f972a71f..3073ac51d 100644
--- a/postfix/src/cleanup/cleanup.c
+++ b/postfix/src/cleanup/cleanup.c
@@ -28,7 +28,7 @@
 /* .IP \(bu
 /*	Eliminate duplicate envelope recipient addresses.
 /* .br
-/*	This is enabled with the \fBduplicate_filter_limit\fR 
+/*	This is enabled with the \fBduplicate_filter_limit\fR
 /*	parameter setting.
 /* .IP \(bu
 /*	Remove message headers: \fBBcc\fR, \fBContent-Length\fR,
diff --git a/postfix/src/cleanup/cleanup_api.c b/postfix/src/cleanup/cleanup_api.c
index 738bd733f..9c8e70f7a 100644
--- a/postfix/src/cleanup/cleanup_api.c
+++ b/postfix/src/cleanup/cleanup_api.c
@@ -261,8 +261,8 @@ int     cleanup_flush(CLEANUP_STATE *state)
      * (mail submitted with the Postfix sendmail command, mail forwarded by
      * the local(8) delivery agent, or mail re-queued with "postsuper -r"),
      * send a bounce notification, reset the error flags in case of success,
-     * and request deletion of the incoming queue file and of the
-     * optional DSN SUCCESS records from virtual alias expansion.
+     * and request deletion of the incoming queue file and of the optional
+     * DSN SUCCESS records from virtual alias expansion.
      * 
      * XXX It would make no sense to knowingly report success after we already
      * have bounced all recipients, especially because the information in the
diff --git a/postfix/src/cleanup/cleanup_envelope.c b/postfix/src/cleanup/cleanup_envelope.c
index a4b991de2..6c1a32b4f 100644
--- a/postfix/src/cleanup/cleanup_envelope.c
+++ b/postfix/src/cleanup/cleanup_envelope.c
@@ -385,7 +385,7 @@ static void cleanup_envelope_process(CLEANUP_STATE *state, int type,
 	return;
     }
     if (type == REC_TYPE_FROM) {
-	off_t after_sender_offs;
+	off_t   after_sender_offs;
 
 	/* Allow only one instance. */
 	if (state->sender != 0) {
diff --git a/postfix/src/cleanup/cleanup_out_recipient.c b/postfix/src/cleanup/cleanup_out_recipient.c
index 5e965fa67..003983b71 100644
--- a/postfix/src/cleanup/cleanup_out_recipient.c
+++ b/postfix/src/cleanup/cleanup_out_recipient.c
@@ -218,9 +218,9 @@ void    cleanup_out_recipient(CLEANUP_STATE *state,
      * in the expansion because that results in multiple verify(8) updates
      * for one verify(8) request.
      * 
-     * Multiple verify(8) updates for one verify(8) request would overwrite
-     * each other's status, and if the last status update is "undeliverable",
-     * then the whole alias is flagged as undeliverable.
+     * Multiple verify(8) updates for one verify(8) request would overwrite each
+     * other's status, and if the last status update is "undeliverable", then
+     * the whole alias is flagged as undeliverable.
      */
     else {
 	RECIPIENT rcpt;
diff --git a/postfix/src/cleanup/cleanup_rewrite.c b/postfix/src/cleanup/cleanup_rewrite.c
index 3c81e7bed..efe5d9ecf 100644
--- a/postfix/src/cleanup/cleanup_rewrite.c
+++ b/postfix/src/cleanup/cleanup_rewrite.c
@@ -90,7 +90,7 @@ int     cleanup_rewrite_external(const char *context_name, VSTRING *result,
 
 /* cleanup_rewrite_tree - rewrite address node */
 
-int    cleanup_rewrite_tree(const char *context_name, TOK822 *tree)
+int     cleanup_rewrite_tree(const char *context_name, TOK822 *tree)
 {
     VSTRING *dst = vstring_alloc(100);
     VSTRING *src = vstring_alloc(100);
diff --git a/postfix/src/dns/dns.h b/postfix/src/dns/dns.h
index 0f8b0b92d..a26108941 100644
--- a/postfix/src/dns/dns.h
+++ b/postfix/src/dns/dns.h
@@ -165,8 +165,8 @@ typedef struct DNS_RR {
     unsigned short flags;		/* DNS_RR_FLAG_XX, see below */
     struct DNS_RR *next;		/* linkage */
     size_t  data_len;			/* actual data size */
-    char    *data;			/* a bunch of data */
-     /* Add new fields at the end, for ABI forward compatibility. */
+    char   *data;			/* a bunch of data */
+    /* Add new fields at the end, for ABI forward compatibility. */
 } DNS_RR;
 
 #define DNS_RR_FLAG_TRUNCATED	(1<<0)
diff --git a/postfix/src/dns/dns_lookup.c b/postfix/src/dns/dns_lookup.c
index 0c212d258..03c42e763 100644
--- a/postfix/src/dns/dns_lookup.c
+++ b/postfix/src/dns/dns_lookup.c
@@ -838,7 +838,7 @@ static int dns_get_rr(DNS_RR **list, const char *orig_name, DNS_REPLY *reply,
 		msg_info("frag_len=%d text=\"%.*s\"",
 			 (int) frag_len, (int) frag_len, (char *) src);
 	    if (frag_len > reply->end - src
-	     || frag_len >= ((unsigned char *) ltemp + sizeof(ltemp)) - dst) {
+	    || frag_len >= ((unsigned char *) ltemp + sizeof(ltemp)) - dst) {
 		msg_warn("extract_answer: bad TXT string length: %d", frag_len);
 		return (DNS_RETRY);
 	    }
diff --git a/postfix/src/dns/dns_rr_filter.c b/postfix/src/dns/dns_rr_filter.c
index a02d3de6a..48d4a1eb5 100644
--- a/postfix/src/dns/dns_rr_filter.c
+++ b/postfix/src/dns/dns_rr_filter.c
@@ -106,7 +106,7 @@ static DNS_RR *dns_rr_action(const char *cmd, DNS_RR *rr, const char *rr_text)
 	msg_info("ignoring DNS RR: %s", rr_text);
 	return (0);
     } else {
-	msg_warn("%s: unknown DNS filter action: \"%s\"", 
+	msg_warn("%s: unknown DNS filter action: \"%s\"",
 		 dns_rr_filter_maps->title, cmd);
 	return (dns_rr_filter_error);
     }
diff --git a/postfix/src/dns/dns_sec.c b/postfix/src/dns/dns_sec.c
index 849627e4b..0d2b09e49 100644
--- a/postfix/src/dns/dns_sec.c
+++ b/postfix/src/dns/dns_sec.c
@@ -128,7 +128,7 @@ void    dns_sec_probe(int rflags)
     default:
 	if (!DNS_SEC_STATS_TEST(DNS_SEC_FLAG_AVAILABLE))
 	    msg_warn("reason: " VAR_DNSSEC_PROBE
-		     " '%s' received a response that is not DNSSEC validated",
+		   " '%s' received a response that is not DNSSEC validated",
 		     var_dnssec_probe);
 	if (rrlist)
 	    dns_rr_free(rrlist);
diff --git a/postfix/src/global/bounce_log.h b/postfix/src/global/bounce_log.h
index 03b78b2c4..58498289f 100644
--- a/postfix/src/global/bounce_log.h
+++ b/postfix/src/global/bounce_log.h
@@ -30,8 +30,8 @@
 typedef struct {
     VSTREAM *fp;			/* open file */
     VSTRING *buf;			/* I/O buffer */
-    char    *compat_status;		/* old logfile compatibility */
-    char    *compat_action;		/* old logfile compatibility */
+    char   *compat_status;		/* old logfile compatibility */
+    char   *compat_action;		/* old logfile compatibility */
 } BOUNCE_LOG;
 
 extern BOUNCE_LOG *bounce_log_open(const char *, const char *, int, mode_t);
diff --git a/postfix/src/global/cleanup_user.h b/postfix/src/global/cleanup_user.h
index 74815bed3..0b1985b70 100644
--- a/postfix/src/global/cleanup_user.h
+++ b/postfix/src/global/cleanup_user.h
@@ -27,6 +27,7 @@
 #define CLEANUP_FLAG_AUTOUTF8	(1<<9)	/* Autodetect SMTPUTF8 */
 
 #define CLEANUP_FLAG_FILTER_ALL	(CLEANUP_FLAG_FILTER | CLEANUP_FLAG_MILTER)
+
  /*
   * These are normally set when receiving mail from outside.
   */
diff --git a/postfix/src/global/clnt_stream.h b/postfix/src/global/clnt_stream.h
index bb92e2fcc..033fb8cb5 100644
--- a/postfix/src/global/clnt_stream.h
+++ b/postfix/src/global/clnt_stream.h
@@ -20,7 +20,7 @@
   * External interface.
   */
 typedef struct CLNT_STREAM CLNT_STREAM;
-typedef int (*CLNT_STREAM_HANDSHAKE_FN)(VSTREAM *);
+typedef int (*CLNT_STREAM_HANDSHAKE_FN) (VSTREAM *);
 
 extern CLNT_STREAM *clnt_stream_create(const char *, const char *, int, int,
 				               CLNT_STREAM_HANDSHAKE_FN);
diff --git a/postfix/src/global/compat_level.c b/postfix/src/global/compat_level.c
index af1cbbfcf..c8917aedc 100644
--- a/postfix/src/global/compat_level.c
+++ b/postfix/src/global/compat_level.c
@@ -227,35 +227,35 @@ const char *compat_level_to_string(long compat_level,
      * Sanity check.
      */
     if (compat_level < 0) {
-        msg_fn("%s: bad compatibility level: %ld", myname, compat_level);
-        return (0);
+	msg_fn("%s: bad compatibility level: %ld", myname, compat_level);
+	return (0);
     }
 
     /*
      * Compatibility levels 0..2 have no minor or patch level.
      */
     if (buf == 0)
-        buf = vstring_alloc(10);
+	buf = vstring_alloc(10);
     major = DECODE_MAJOR(compat_level);
     if (!GOOD_MAJOR(major)) {
-        msg_fn("%s: bad compatibility major level: %ld", myname, compat_level);
-        return (0);
+	msg_fn("%s: bad compatibility major level: %ld", myname, compat_level);
+	return (0);
     }
     vstring_sprintf(buf, "%ld", major);
     if (major > 2) {
 
-        /*
-         * Expect that major.minor will be common.
-         */
-        minor = DECODE_MINOR(compat_level);
-        vstring_sprintf_append(buf, ".%ld", minor);
+	/*
+	 * Expect that major.minor will be common.
+	 */
+	minor = DECODE_MINOR(compat_level);
+	vstring_sprintf_append(buf, ".%ld", minor);
 
-        /*
-         * Expect that major.minor.patch will be rare.
-         */
-        patch = DECODE_PATCH(compat_level);
-        if (patch)
-            vstring_sprintf_append(buf, ".%ld", patch);
+	/*
+	 * Expect that major.minor.patch will be rare.
+	 */
+	patch = DECODE_PATCH(compat_level);
+	if (patch)
+	    vstring_sprintf_append(buf, ".%ld", patch);
     }
     return (vstring_str(buf));
 }
diff --git a/postfix/src/global/compat_level.h b/postfix/src/global/compat_level.h
index 80f2a0765..5e73d1e61 100644
--- a/postfix/src/global/compat_level.h
+++ b/postfix/src/global/compat_level.h
@@ -20,7 +20,7 @@ extern long compat_level_from_string(const char *,
 extern long compat_level_from_numbers(long, long, long,
 		              void PRINTFLIKE(1, 2) (*) (const char *,...));
 extern const char *compat_level_to_string(long,
-			      void PRINTFLIKE(1, 2) (*) (const char *,...));
+		              void PRINTFLIKE(1, 2) (*) (const char *,...));
 
 #define compat_level_from_major(major, msg_fn) \
 	compat_level_from_major_minor((major), 0, (msg_fn))
diff --git a/postfix/src/global/conv_time.c b/postfix/src/global/conv_time.c
index 78a40b565..5825d5b93 100644
--- a/postfix/src/global/conv_time.c
+++ b/postfix/src/global/conv_time.c
@@ -73,7 +73,7 @@ int     conv_time(const char *strval, int *timval, int def_unit)
     errno = 0;
     intval = longval = strtol(strval, &end, 10);
     if (*strval == 0 || errno == ERANGE || longval != intval || intval < 0
-	/* || (*end != 0 && end[1] != 0) */)
+	 /* || (*end != 0 && end[1] != 0) */ )
 	return (0);
 
     switch (*end ? *end : def_unit) {
diff --git a/postfix/src/global/db_common.h b/postfix/src/global/db_common.h
index 26ebf9731..2cb7807f3 100644
--- a/postfix/src/global/db_common.h
+++ b/postfix/src/global/db_common.h
@@ -11,21 +11,21 @@
 /* DESCRIPTION
 /* .nf
  */
-  
+
  /*
   * External interface.
   */
 #include "dict.h"
 #include "string_list.h"
 
-typedef void (*db_quote_callback_t)(DICT *, const char *, VSTRING *);
+typedef void (*db_quote_callback_t) (DICT *, const char *, VSTRING *);
 
 extern int db_common_parse(DICT *, void **, const char *, int);
 extern void *db_common_alloc(DICT *);
 extern void db_common_parse_domain(CFG_PARSER *, void *);
 extern int db_common_dict_partial(void *);
 extern int db_common_expand(void *, const char *, const char *,
-			    const char *, VSTRING *, db_quote_callback_t);
+		              const char *, VSTRING *, db_quote_callback_t);
 extern int db_common_check_domain(void *, const char *);
 extern void db_common_free_ctx(void *);
 extern void db_common_sql_build_query(VSTRING *query, CFG_PARSER *parser);
@@ -55,4 +55,3 @@ extern void db_common_sql_build_query(VSTRING *query, CFG_PARSER *parser);
 /*--*/
 
 #endif
-
diff --git a/postfix/src/global/dot_lockfile_as.c b/postfix/src/global/dot_lockfile_as.c
index 7ee84d9e5..919ebd951 100644
--- a/postfix/src/global/dot_lockfile_as.c
+++ b/postfix/src/global/dot_lockfile_as.c
@@ -77,7 +77,7 @@ int     dot_lockfile_as(const char *path, VSTRING *why, uid_t euid, gid_t egid)
 
 /* dot_unlockfile_as - dotlock file as user */
 
-void     dot_unlockfile_as(const char *path, uid_t euid, gid_t egid)
+void    dot_unlockfile_as(const char *path, uid_t euid, gid_t egid)
 {
     uid_t   saved_euid = geteuid();
     gid_t   saved_egid = getegid();
diff --git a/postfix/src/global/header_body_checks.c b/postfix/src/global/header_body_checks.c
index 0252dd192..96209681b 100644
--- a/postfix/src/global/header_body_checks.c
+++ b/postfix/src/global/header_body_checks.c
@@ -295,7 +295,7 @@ static char *hbc_action(void *context, HBC_CALL_BACKS *cb,
     if (STREQUAL(cmd, "IGNORE", cmd_len))
 	/* XXX Not logged for compatibility with cleanup(8). */
 	return (HBC_CHECKS_STAT_IGNORE);
- 
+
     if (STREQUAL(cmd, "DUNNO", cmd_len)		/* preferred */
 	||STREQUAL(cmd, "OK", cmd_len))		/* compatibility */
 	return ((char *) line);
diff --git a/postfix/src/global/info_log_addr_form.c b/postfix/src/global/info_log_addr_form.c
index cbe3920e6..863da37c7 100644
--- a/postfix/src/global/info_log_addr_form.c
+++ b/postfix/src/global/info_log_addr_form.c
@@ -72,6 +72,7 @@ static void info_log_addr_form_init(void)
 	INFO_LOG_ADDR_FORM_NAME_INTERNAL, INFO_LOG_ADDR_FORM_VAL_INTERNAL,
 	0, INFO_LOG_ADDR_FORM_VAL_NOT_SET,
     };
+
     info_log_addr_form_form = name_code(info_log_addr_form_table,
 					NAME_CODE_FLAG_NONE,
 					var_info_log_addr_form);
diff --git a/postfix/src/global/is_header.c b/postfix/src/global/is_header.c
index 891e1372e..6371819f8 100644
--- a/postfix/src/global/is_header.c
+++ b/postfix/src/global/is_header.c
@@ -62,7 +62,7 @@ ssize_t is_header_buf(const char *str, ssize_t str_len)
      * XXX Don't run off the end in case some non-standard iscntrl()
      * implementation considers null a non-control character...
      */
-    for (len = 0, state = INIT, cp = CU_CHAR_PTR(str); /* see below */; cp++) {
+    for (len = 0, state = INIT, cp = CU_CHAR_PTR(str); /* see below */ ; cp++) {
 	if (str_len != IS_HEADER_NULL_TERMINATED && str_len-- <= 0)
 	    return (0);
 	switch (c = *cp) {
diff --git a/postfix/src/global/mail_addr_map.c b/postfix/src/global/mail_addr_map.c
index f22662802..d9f2c01d7 100644
--- a/postfix/src/global/mail_addr_map.c
+++ b/postfix/src/global/mail_addr_map.c
@@ -359,12 +359,12 @@ static MAIL_ADDR_MAP_TEST pass_tests[] = {
 	{"\"a@a\"@example.net"}, 1,
     },
     {
-        "12 external -external-> external, extension, propagation",
-        "inline:{ aa@example.com=bb@example.com }",
-        DO_PROPAGATE_UNMATCHED_EXTENSION, DOT_RECIPIENT_DELIMITER,
-        MA_FORM_EXTERNAL, MA_FORM_EXTERNAL, MA_FORM_EXTERNAL,
-        "aa.ext@example.com",
-        {"bb.ext@example.com"}, 1,
+	"12 external -external-> external, extension, propagation",
+	"inline:{ aa@example.com=bb@example.com }",
+	DO_PROPAGATE_UNMATCHED_EXTENSION, DOT_RECIPIENT_DELIMITER,
+	MA_FORM_EXTERNAL, MA_FORM_EXTERNAL, MA_FORM_EXTERNAL,
+	"aa.ext@example.com",
+	{"bb.ext@example.com"}, 1,
     },
     0,
 };
diff --git a/postfix/src/global/mail_command_server.c b/postfix/src/global/mail_command_server.c
index 9565b55fb..c16972f27 100644
--- a/postfix/src/global/mail_command_server.c
+++ b/postfix/src/global/mail_command_server.c
@@ -41,7 +41,7 @@
 /* System library. */
 
 #include <sys_defs.h>
-#include <stdlib.h>		/* 44BSD stdarg.h uses abort() */
+#include <stdlib.h>			/* 44BSD stdarg.h uses abort() */
 #include <stdarg.h>
 #include <string.h>
 
diff --git a/postfix/src/global/mail_conf.c b/postfix/src/global/mail_conf.c
index cd79d35dd..d604c152b 100644
--- a/postfix/src/global/mail_conf.c
+++ b/postfix/src/global/mail_conf.c
@@ -131,7 +131,7 @@
 
 /* mail_conf_checkdir - authorize non-default directory */
 
-void mail_conf_checkdir(const char *config_dir)
+void    mail_conf_checkdir(const char *config_dir)
 {
     VSTRING *buf;
     VSTREAM *fp;
diff --git a/postfix/src/global/mail_conf_raw.c b/postfix/src/global/mail_conf_raw.c
index 4c9c5bde7..613b73d84 100644
--- a/postfix/src/global/mail_conf_raw.c
+++ b/postfix/src/global/mail_conf_raw.c
@@ -74,7 +74,7 @@
 /* check_mail_conf_raw - validate string length */
 
 static void check_mail_conf_raw(const char *name, const char *strval,
-			             int min, int max)
+				        int min, int max)
 {
     ssize_t len = strlen(strval);
 
@@ -89,7 +89,7 @@ static void check_mail_conf_raw(const char *name, const char *strval,
 /* get_mail_conf_raw - evaluate string-valued configuration variable */
 
 char   *get_mail_conf_raw(const char *name, const char *defval,
-		               int min, int max)
+			          int min, int max)
 {
     const char *strval;
 
@@ -106,7 +106,7 @@ char   *get_mail_conf_raw(const char *name, const char *defval,
 typedef const char *(*stupid_indent_str) (void);
 
 char   *get_mail_conf_raw_fn(const char *name, stupid_indent_str defval,
-			          int min, int max)
+			             int min, int max)
 {
     const char *strval;
 
@@ -126,7 +126,7 @@ void    get_mail_conf_raw_table(const CONFIG_RAW_TABLE *table)
 	if (table->target[0])
 	    myfree(table->target[0]);
 	table->target[0] = get_mail_conf_raw(table->name, table->defval,
-					  table->min, table->max);
+					     table->min, table->max);
 	table++;
     }
 }
@@ -139,7 +139,7 @@ void    get_mail_conf_raw_fn_table(const CONFIG_RAW_FN_TABLE *table)
 	if (table->target[0])
 	    myfree(table->target[0]);
 	table->target[0] = get_mail_conf_raw_fn(table->name, table->defval,
-					     table->min, table->max);
+						table->min, table->max);
 	table++;
     }
 }
diff --git a/postfix/src/global/mail_conf_str.c b/postfix/src/global/mail_conf_str.c
index d8e0bd100..50ef2ffc0 100644
--- a/postfix/src/global/mail_conf_str.c
+++ b/postfix/src/global/mail_conf_str.c
@@ -38,7 +38,7 @@
 /*	void	check_mail_conf_str(name, strval, min, max)
 /*	const char *name;
 /*	const char *strval;
-/*	int	min; 
+/*	int	min;
 /*	int	max;
 /* DESCRIPTION
 /*	This module implements support for string-valued global
diff --git a/postfix/src/global/mail_copy.c b/postfix/src/global/mail_copy.c
index 7c60370ef..de35e9429 100644
--- a/postfix/src/global/mail_copy.c
+++ b/postfix/src/global/mail_copy.c
@@ -265,8 +265,8 @@ int     mail_copy(const char *sender,
      * while fflush and fsync() succeed. Think of remote file systems such as
      * AFS that copy the file back to the server upon close. Oh well, no
      * point optimizing the error case. XXX On systems that use flock()
-     * locking, we must truncate the file before closing it (and losing
-     * the exclusive lock).
+     * locking, we must truncate the file before closing it (and losing the
+     * exclusive lock).
      */
     read_error = vstream_ferror(src);
     write_error = vstream_fflush(dst);
diff --git a/postfix/src/global/mail_params.c b/postfix/src/global/mail_params.c
index 2a7f84c2c..17fe040f6 100644
--- a/postfix/src/global/mail_params.c
+++ b/postfix/src/global/mail_params.c
@@ -521,7 +521,7 @@ static void check_mail_owner(void)
 	msg_fatal("file %s/%s: parameter %s: user %s has the same"
 		  " user ID %ld as user %s",
 		  var_config_dir, MAIN_CONF_FILE,
-		  VAR_MAIL_OWNER, var_mail_owner, 
+		  VAR_MAIL_OWNER, var_mail_owner,
 		  (long) var_owner_uid, pwd->pw_name);
 }
 
@@ -550,7 +550,7 @@ static void check_sgid_group(void)
 	msg_fatal("file %s/%s: parameter %s: group %s has the same"
 		  " group ID %ld as group %s",
 		  var_config_dir, MAIN_CONF_FILE,
-		  VAR_SGID_GROUP, var_sgid_group, 
+		  VAR_SGID_GROUP, var_sgid_group,
 		  (long) var_sgid_gid, grp->gr_name);
 }
 
diff --git a/postfix/src/global/mail_proto.h b/postfix/src/global/mail_proto.h
index 7cc6452a3..e3c0c4750 100644
--- a/postfix/src/global/mail_proto.h
+++ b/postfix/src/global/mail_proto.h
@@ -32,8 +32,8 @@
 #define MAIL_PROTO_QMQP		"QMQP"
 
  /*
-  * Names of services: these are the names of the UNIX-domain socket or
-  * FIFO that a service listens on.
+  * Names of services: these are the names of the UNIX-domain socket or FIFO
+  * that a service listens on.
   */
 #define MAIL_SERVICE_BOUNCE	"bounce"
 #define MAIL_SERVICE_CLEANUP	"cleanup"
diff --git a/postfix/src/global/mail_queue.h b/postfix/src/global/mail_queue.h
index 4928d60cc..1a6c66c20 100644
--- a/postfix/src/global/mail_queue.h
+++ b/postfix/src/global/mail_queue.h
@@ -93,7 +93,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 minimum 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_trigger.c b/postfix/src/global/mail_trigger.c
index d9f74a56b..fbba706ea 100644
--- a/postfix/src/global/mail_trigger.c
+++ b/postfix/src/global/mail_trigger.c
@@ -82,7 +82,7 @@ int     mail_trigger(const char *class, const char *service,
      */
     path = mail_pathname(class, service);
     if ((status = stat(path, &st)) < 0) {
-	 msg_warn("unable to look up %s: %m", path);
+	msg_warn("unable to look up %s: %m", path);
     } else if (S_ISFIFO(st.st_mode)) {
 	status = fifo_trigger(path, req_buf, req_len, var_trigger_timeout);
 	if (status < 0 && S_ISSOCK(st.st_mode))
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index fcd31a85a..8cbe85dff 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	"20240930"
+#define MAIL_RELEASE_DATE	"20241010"
 #define MAIL_VERSION_NUMBER	"3.10"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/global/maillog_client.c b/postfix/src/global/maillog_client.c
index 34952ef65..4082ed895 100644
--- a/postfix/src/global/maillog_client.c
+++ b/postfix/src/global/maillog_client.c
@@ -238,8 +238,8 @@ void    maillog_client_init(const char *progname, int flags)
 
 	    /*
 	     * var_postlog_service == 0, therefore var_maillog_file == 0.
-	     * logger_mode == MAILLOG_CLIENT_MODE_POSTLOG && var_maillog_file ==
-	     * 0, therefore import_service_path != 0.
+	     * logger_mode == MAILLOG_CLIENT_MODE_POSTLOG && var_maillog_file
+	     * == 0, therefore import_service_path != 0.
 	     */
 	    service_path = import_service_path;
 	}
diff --git a/postfix/src/global/mkmap_proxy.c b/postfix/src/global/mkmap_proxy.c
index ddfc708c2..ba79b42b1 100644
--- a/postfix/src/global/mkmap_proxy.c
+++ b/postfix/src/global/mkmap_proxy.c
@@ -46,7 +46,7 @@
 
 MKMAP  *mkmap_proxy_open(const char *unused_path)
 {
-    MKMAP *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
+    MKMAP  *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
 
     /*
      * Fill in the generic members.
diff --git a/postfix/src/global/own_inet_addr.c b/postfix/src/global/own_inet_addr.c
index d164a20b2..ee5959f34 100644
--- a/postfix/src/global/own_inet_addr.c
+++ b/postfix/src/global/own_inet_addr.c
@@ -191,7 +191,7 @@ static void own_inet_addr_init(INET_ADDR_LIST *addr_list,
 
 /* own_inet_addr - is this my own internet address */
 
-int     own_inet_addr(struct sockaddr * addr)
+int     own_inet_addr(struct sockaddr *addr)
 {
     int     i;
 
@@ -253,7 +253,7 @@ static void proxy_inet_addr_init(INET_ADDR_LIST *addr_list)
 
 /* proxy_inet_addr - is this my proxy internet address */
 
-int     proxy_inet_addr(struct sockaddr * addr)
+int     proxy_inet_addr(struct sockaddr *addr)
 {
     int     i;
 
diff --git a/postfix/src/global/quote_821_local.c b/postfix/src/global/quote_821_local.c
index 8cd9b2e04..10df97811 100644
--- a/postfix/src/global/quote_821_local.c
+++ b/postfix/src/global/quote_821_local.c
@@ -134,7 +134,7 @@ static VSTRING *make_821_quoted_string(VSTRING *dst, const char *local_part,
 
 VSTRING *quote_821_local_flags(VSTRING *dst, const char *addr, int flags)
 {
-    const char   *at;
+    const char *at;
 
     /*
      * According to RFC 821, a local-part is a dot-string or a quoted-string.
diff --git a/postfix/src/global/quote_821_local.h b/postfix/src/global/quote_821_local.h
index f2b4812d3..aed0d8c01 100644
--- a/postfix/src/global/quote_821_local.h
+++ b/postfix/src/global/quote_821_local.h
@@ -22,6 +22,7 @@
   * External interface.
   */
 extern VSTRING *quote_821_local_flags(VSTRING *, const char *, int);
+
 #define quote_821_local(dst, src) \
 	quote_821_local_flags((dst), (src), QUOTE_FLAG_8BITCLEAN)
 
diff --git a/postfix/src/global/quote_822_local.c b/postfix/src/global/quote_822_local.c
index c19ee57d4..915145c8e 100644
--- a/postfix/src/global/quote_822_local.c
+++ b/postfix/src/global/quote_822_local.c
@@ -276,7 +276,7 @@ int     main(int unused_argc, char **argv)
 		flags = quote_flags_from_string(cmd);
 		quote_822_local_flags(out, bp, flags);
 		vstream_printf("'%s' quoted flags=%s '%s'\n",
-			       bp, quote_flags_to_string((VSTRING *) 0, flags), STR(out));
+		 bp, quote_flags_to_string((VSTRING *) 0, flags), STR(out));
 	    } else if (strcmp(cmd, "unquote") == 0) {
 		unquote_822_local(out, bp);
 		vstream_printf("'%s' unquoted '%s'\n", bp, STR(out));
diff --git a/postfix/src/global/quote_822_local.h b/postfix/src/global/quote_822_local.h
index f38e23edb..7eaedd4f1 100644
--- a/postfix/src/global/quote_822_local.h
+++ b/postfix/src/global/quote_822_local.h
@@ -26,6 +26,7 @@
   */
 extern VSTRING *quote_822_local_flags(VSTRING *, const char *, int);
 extern VSTRING *unquote_822_local(VSTRING *, const char *);
+
 #define quote_822_local(dst, src) \
 	quote_822_local_flags((dst), (src), QUOTE_FLAG_DEFAULT)
 
diff --git a/postfix/src/global/rec_type.h b/postfix/src/global/rec_type.h
index 43865290d..32d939b9b 100644
--- a/postfix/src/global/rec_type.h
+++ b/postfix/src/global/rec_type.h
@@ -177,7 +177,8 @@
   * See also: REC_TYPE_SIZE_FORMAT above.
   */
 #define REC_TYPE_PTR_FORMAT	"%15ld"
-#define REC_TYPE_PTR_PAYL_SIZE	15	/* Payload only, excludes record header. */
+#define REC_TYPE_PTR_PAYL_SIZE	15	/* Payload only, excludes record
+					 * header. */
 
  /*
   * Programmatic interface.
diff --git a/postfix/src/global/recdump.c b/postfix/src/global/recdump.c
index aa13eb644..b8f6b82f2 100644
--- a/postfix/src/global/recdump.c
+++ b/postfix/src/global/recdump.c
@@ -46,7 +46,7 @@ int     main(int unused_argc, char **argv)
 
     while (offset = vstream_ftell(VSTREAM_IN),
 	   ((type = rec_get(VSTREAM_IN, buf, 0)) != REC_TYPE_EOF
-	   && type != REC_TYPE_ERROR)) {
+	    && type != REC_TYPE_ERROR)) {
 	vstream_fprintf(VSTREAM_OUT, "%15s|%4ld|%3ld|%s\n",
 			rec_type_name(type), offset,
 			(long) VSTRING_LEN(buf), vstring_str(buf));
diff --git a/postfix/src/global/sent.h b/postfix/src/global/sent.h
index eb9a23f2f..2ed3856a5 100644
--- a/postfix/src/global/sent.h
+++ b/postfix/src/global/sent.h
@@ -28,8 +28,8 @@
   */
 #define SENT_FLAG_NONE	(0)
 
-extern int sent(int, const char *, MSG_STATS *, RECIPIENT *, const char *, 
-			DSN *);
+extern int sent(int, const char *, MSG_STATS *, RECIPIENT *, const char *,
+		        DSN *);
 
 /* LICENSE
 /* .ad
diff --git a/postfix/src/global/server_acl.c b/postfix/src/global/server_acl.c
index 5385a5a1f..e8eb25bb2 100644
--- a/postfix/src/global/server_acl.c
+++ b/postfix/src/global/server_acl.c
@@ -112,7 +112,7 @@ void    server_acl_pre_jail_init(const char *mynetworks, const char *origin)
     if (warn_compat_break_mynetworks_style)
 	server_acl_mynetworks_host =
 	    addr_match_list_init(origin, MATCH_FLAG_RETURN
-				 | match_parent_style(origin), mynetworks_host());
+			   | match_parent_style(origin), mynetworks_host());
 }
 
 /* server_acl_parse - parse access list */
@@ -240,7 +240,7 @@ int     server_acl_eval(const char *client_addr, SERVER_ACL * intern_acl,
 #include <vstring_vstream.h>
 #include <name_code.h>
 #include <split_at.h>
-    
+
 char   *var_server_acl = "";
 
 #define UPDATE_VAR(s,v) do { if (*(s)) myfree(s); (s) = mystrdup(v); } while (0)
diff --git a/postfix/src/global/smtputf8.c b/postfix/src/global/smtputf8.c
index d361a3b41..2e7e9f528 100644
--- a/postfix/src/global/smtputf8.c
+++ b/postfix/src/global/smtputf8.c
@@ -24,7 +24,7 @@
 /* .IP MAIL_SRC_MASK_FORWARD
 /*	Local forwarding or aliasing.
 /* .IP MAIL_SRC_MASK_BOUNCE
-/*	Submission by the bounce(8) daemon. 
+/*	Submission by the bounce(8) daemon.
 /* .IP MAIL_SRC_MASK_NOTIFY
 /*	Postmaster notification from the smtp(8) or smtpd(8) daemon.
 /* .IP MAIL_SRC_MASK_VERIFY
diff --git a/postfix/src/global/smtputf8.h b/postfix/src/global/smtputf8.h
index 95d658356..5d72fb49d 100644
--- a/postfix/src/global/smtputf8.h
+++ b/postfix/src/global/smtputf8.h
@@ -14,21 +14,21 @@
  /*
   * Avoiding chicken-and-egg problems during the initial SMTPUTF8 roll-out in
   * 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 address
   * localparts (and in headers), even if pre-SMTPUTF8 standards do not
   * support this practice.
-  * 
+  *
   * When turning on Postfix SMTPUTF8 support for the first time, we don't want
   * to suddenly break pre-existing mail flows that contain UTF8 because 1) a
   * 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 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.
-  * 
+  *
   * What is SMTPUTF8 autodetection? Postfix cannot rely solely on the sender's
   * declaration that a message requires SMTPUTF8 support, because UTF8 may be
   * introduced during local processing (for example, the client hostname in
@@ -36,21 +36,21 @@
   * incomplete address, address rewriting, alias expansion, automatic BCC
   * recipients, local forwarding, and changes made by header checks or Milter
   * applications).
-  * 
+  *
   * In summary, after local processing has happened, Postfix may decide that a
   * message requires SMTPUTF8 support, even when that message initially did
   * not require SMTPUTF8 support. This could make the message undeliverable
   * to destinations that do not support SMTPUTF8. In an environment with
   * pre-existing mail flows that contain UTF8, we want to avoid disrupting
   * those mail flows when rolling out SMTPUTF8 support.
-  * 
+  *
   * For the vast majority of sites, the simplest solution is to autodetect
   * SMTPUTF8 support only for Postfix sendmail command-line submissions, at
   * least as long as SMTPUTF8 support has not yet achieved wold domination.
-  * 
+  *
   * However, sites that add UTF8 content via local processing (see above) should
   * autodetect SMTPUTF8 support for all email.
-  * 
+  *
   * smtputf8_autodetect() uses the setting of the smtputf8_autodetect_classes
   * parameter, and the mail source classes defined in mail_params.h.
   */
diff --git a/postfix/src/global/tok822_tree.c b/postfix/src/global/tok822_tree.c
index a66cf1156..b5cf14270 100644
--- a/postfix/src/global/tok822_tree.c
+++ b/postfix/src/global/tok822_tree.c
@@ -263,7 +263,7 @@ TOK822 *tok822_free_tree(TOK822 *tp)
 {
     TOK822 *next;
 
-    for (/* void */; tp != 0; tp = next) {
+    for ( /* void */ ; tp != 0; tp = next) {
 	if (tp->head)
 	    tok822_free_tree(tp->head);
 	next = tp->next;
diff --git a/postfix/src/global/user_acl.h b/postfix/src/global/user_acl.h
index 4e36fbfcb..18ad45564 100644
--- a/postfix/src/global/user_acl.h
+++ b/postfix/src/global/user_acl.h
@@ -14,8 +14,8 @@
  /*
   * System library
   */
-#include <unistd.h>		/* getuid()/geteuid() */
-#include <sys/types.h>		/* uid_t */
+#include <unistd.h>			/* getuid()/geteuid() */
+#include <sys/types.h>			/* uid_t */
 
  /*
   * Utility library.
diff --git a/postfix/src/global/valid_mailhost_addr.c b/postfix/src/global/valid_mailhost_addr.c
index 79a790018..b9e22e78d 100644
--- a/postfix/src/global/valid_mailhost_addr.c
+++ b/postfix/src/global/valid_mailhost_addr.c
@@ -92,7 +92,7 @@ int     valid_mailhost_literal(const char *addr, int gripe)
     const char *myname = "valid_mailhost_literal";
     MAI_HOSTADDR_STR hostaddr;
     const char *last;
-    size_t address_bytes;
+    size_t  address_bytes;
 
     if (*addr != '[') {
 	if (gripe)
diff --git a/postfix/src/global/xtext.c b/postfix/src/global/xtext.c
index e0d3ed598..fee4eb30a 100644
--- a/postfix/src/global/xtext.c
+++ b/postfix/src/global/xtext.c
@@ -134,6 +134,7 @@ VSTRING *xtext_unquote_append(VSTRING *unquoted, const char *quoted)
     VSTRING_TERMINATE(unquoted);
     return (unquoted);
 }
+
 /* xtext_unquote - quoted data to unquoted */
 
 VSTRING *xtext_unquote(VSTRING *unquoted, const char *quoted)
diff --git a/postfix/src/local/alias.c b/postfix/src/local/alias.c
index 99e3dd660..ae47a5792 100644
--- a/postfix/src/local/alias.c
+++ b/postfix/src/local/alias.c
@@ -129,10 +129,11 @@ 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 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.
+     * 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.
      * 
      * We can recognize one special case: when an alias includes its own name,
      * deliver to the user instead, just like sendmail. Otherwise, we just
diff --git a/postfix/src/local/command.c b/postfix/src/local/command.c
index 368307d84..303c5c9cc 100644
--- a/postfix/src/local/command.c
+++ b/postfix/src/local/command.c
@@ -171,7 +171,7 @@ int     deliver_command(LOCAL_STATE state, USER_ATTR usr_attr, const char *comma
 	argv_add(env, "ORIGINAL_RECIPIENT", state.msg_attr.rcpt.orig_addr,
 		 ARGV_END);
     if (state.request->dsn_envid[0])
-        argv_add(env, "ENVID", state.request->dsn_envid, ARGV_END);
+	argv_add(env, "ENVID", state.request->dsn_envid, ARGV_END);
 
 #define EXPORT_REQUEST(name, value) \
 	if ((value)[0]) argv_add(env, (name), (value), ARGV_END);
diff --git a/postfix/src/master/master.c b/postfix/src/master/master.c
index b6afe3fd9..b5f763c49 100644
--- a/postfix/src/master/master.c
+++ b/postfix/src/master/master.c
@@ -420,8 +420,8 @@ int     main(int argc, char **argv)
 
     /*
      * If started from a terminal, get rid of any tty association. This also
-     * means that all errors and warnings must go to the syslog daemon.
-     * Some new world has no terminals and prefers logging to stdout.
+     * means that all errors and warnings must go to the syslog daemon. Some
+     * new world has no terminals and prefers logging to stdout.
      */
     if (master_detach)
 	for (fd = 0; fd < 3; fd++) {
diff --git a/postfix/src/master/master.h b/postfix/src/master/master.h
index ce07ab779..88ae8911c 100644
--- a/postfix/src/master/master.h
+++ b/postfix/src/master/master.h
@@ -15,10 +15,10 @@
   * when idle for a configurable amount of time, or after servicing a
   * configurable number of requests; the master process spawns new processes
   * on demand up to a configurable concurrency limit and/or periodically.
-  * 
+  *
   * The canonical service name is what we use internally, so that we correctly
   * handle a request to "reload" after someone changes "smtp" into "25".
-  * 
+  *
   * We use the external service name from master.cf when reporting problems, so
   * that the user can figure out what we are talking about. Of course we also
   * include the canonical service name so that the UNIX-domain smtp service
@@ -141,8 +141,8 @@ extern void master_start_service(MASTER_SERV *);
 extern void master_stop_service(MASTER_SERV *);
 extern void master_restart_service(MASTER_SERV *, int);
 
-#define DO_CONF_RELOAD	1	/* config files were reloaded */
-#define NO_CONF_RELOAD	0	/* no config file was reloaded */
+#define DO_CONF_RELOAD	1		/* config files were reloaded */
+#define NO_CONF_RELOAD	0		/* no config file was reloaded */
 
  /*
   * master_events.c
diff --git a/postfix/src/master/master_listen.c b/postfix/src/master/master_listen.c
index 1e7f6fabe..663a536e9 100644
--- a/postfix/src/master/master_listen.c
+++ b/postfix/src/master/master_listen.c
@@ -153,7 +153,7 @@ void    master_listen_init(MASTER_SERV *serv)
 	set_eugid(var_owner_uid, var_owner_gid);
 	serv->listen_fd[0] =
 	    LOCAL_LISTEN(serv->name, serv->max_proc > var_proc_limit ?
-			serv->max_proc : var_proc_limit, NON_BLOCKING);
+			 serv->max_proc : var_proc_limit, NON_BLOCKING);
 	close_on_exec(serv->listen_fd[0], CLOSE_ON_EXEC);
 	set_ugid(getuid(), getgid());
 	break;
diff --git a/postfix/src/master/master_proto.h b/postfix/src/master/master_proto.h
index 608451474..26d40ba4b 100644
--- a/postfix/src/master/master_proto.h
+++ b/postfix/src/master/master_proto.h
@@ -72,4 +72,3 @@ extern int master_notify(int, unsigned, int);	/* encapsulate status msg */
 /*	111 8th Avenue
 /*	New York, NY 10011, USA
 /*--*/
-
diff --git a/postfix/src/master/master_service.c b/postfix/src/master/master_service.c
index d5663b9ca..cecf8e5db 100644
--- a/postfix/src/master/master_service.c
+++ b/postfix/src/master/master_service.c
@@ -23,7 +23,7 @@
 /*	master_restart_service() requests all running child processes to
 /*	commit suicide.  The conf_reload argument is either DO_CONF_RELOAD
 /*	(configuration files were reloaded, re-evaluate the child process
-/*	creation policy) or NO_CONF_RELOAD. 
+/*	creation policy) or NO_CONF_RELOAD.
 /* DIAGNOSTICS
 /* BUGS
 /* SEE ALSO
diff --git a/postfix/src/master/master_watch.c b/postfix/src/master/master_watch.c
index 1af26fe71..d84d95176 100644
--- a/postfix/src/master/master_watch.c
+++ b/postfix/src/master/master_watch.c
@@ -100,8 +100,8 @@ void    master_str_watch(const MASTER_STR_WATCH *str_watch_table)
 
 	/*
 	 * Initialize the backed up parameter value, or update it if this
-	 * parameter supports updates after initialization. Optionally 
-	 * notify the application that this parameter has changed.
+	 * parameter supports updates after initialization. Optionally notify
+	 * the application that this parameter has changed.
 	 */
 	if (wp->backup[0] == 0) {
 	    if (wp->notify != 0)
@@ -138,8 +138,8 @@ void    master_int_watch(MASTER_INT_WATCH *int_watch_table)
 
 	/*
 	 * Initialize the backed up parameter value, or update if it this
-	 * parameter supports updates after initialization. Optionally 
-	 * notify the application that this parameter has changed.
+	 * parameter supports updates after initialization. Optionally notify
+	 * the application that this parameter has changed.
 	 */
 	if ((wp->flags & MASTER_WATCH_FLAG_ISSET) == 0) {
 	    if (wp->notify != 0)
diff --git a/postfix/src/milter/milter8.c b/postfix/src/milter/milter8.c
index 6c9a1eec4..c6f9bdf88 100644
--- a/postfix/src/milter/milter8.c
+++ b/postfix/src/milter/milter8.c
@@ -1157,7 +1157,7 @@ static const char *milter8_event(MILTER8 *milter, int event,
 	    if (edit_resp == 0)
 		edit_resp = parent->repl_body(parent->chg_context,
 					      MILTER_BODY_END,
-					      /* unused*/ 0,
+					       /* unused */ 0,
 					      (VSTRING *) 0);
 	    body_edit_lockout = 1;
 	    vstring_free(body_line_buf);
@@ -1553,7 +1553,7 @@ static const char *milter8_event(MILTER8 *milter, int event,
 			body_line_buf = vstring_alloc(var_line_limit);
 			edit_resp = parent->repl_body(parent->chg_context,
 						      MILTER_BODY_START,
-						      /* unused */ 0,
+						       /* unused */ 0,
 						      (VSTRING *) 0);
 		    }
 		    /* Extract lines from the on-the-wire CRLF format. */
diff --git a/postfix/src/milter/test-milter.c b/postfix/src/milter/test-milter.c
index c34589085..e0fb94503 100644
--- a/postfix/src/milter/test-milter.c
+++ b/postfix/src/milter/test-milter.c
@@ -227,7 +227,7 @@ static int test_reply(SMFICTX *ctx, int code)
     }
 }
 
-static sfsistat test_connect(SMFICTX *ctx, char *name, struct sockaddr * sa)
+static sfsistat test_connect(SMFICTX *ctx, char *name, struct sockaddr *sa)
 {
     const char *print_addr;
     char    buf[BUFSIZ];
diff --git a/postfix/src/oqmgr/qmgr_active.c b/postfix/src/oqmgr/qmgr_active.c
index b1c1a4adc..fb5954276 100644
--- a/postfix/src/oqmgr/qmgr_active.c
+++ b/postfix/src/oqmgr/qmgr_active.c
@@ -235,7 +235,7 @@ int     qmgr_active_feed(QMGR_SCAN *scan_info, const char *queue_id)
      */
 #define QMGR_FLUSH_AFTER	(QMGR_FLUSH_EACH | QMGR_FLUSH_DFXP)
 #define MAYBE_FLUSH_AFTER(mode) \
-	(((mode) & MAIL_QUEUE_STAT_UNTHROTTLE) ? QMGR_FLUSH_AFTER : 0) 
+	(((mode) & MAIL_QUEUE_STAT_UNTHROTTLE) ? QMGR_FLUSH_AFTER : 0)
 #define MAYBE_FORCE_EXPIRE(mode) \
 	(((mode) & MAIL_QUEUE_STAT_EXPIRE) ? QMGR_FORCE_EXPIRE : 0)
 #define MAYBE_UPDATE_MODE(mode) \
diff --git a/postfix/src/oqmgr/qmgr_entry.c b/postfix/src/oqmgr/qmgr_entry.c
index d5f326438..df526d7f7 100644
--- a/postfix/src/oqmgr/qmgr_entry.c
+++ b/postfix/src/oqmgr/qmgr_entry.c
@@ -331,8 +331,7 @@ QMGR_ENTRY *qmgr_entry_create(QMGR_QUEUE *queue, QMGR_MESSAGE *message)
      * 
      * XXX At this point in the code, the busy reference count is still less
      * than the concurrency limit (otherwise this code would not be invoked
-     * in the first place) so we have to make some awkward adjustments
-     * below.
+     * in the first place) so we have to make some awkward adjustments below.
      * 
      * XXX The queue length test below looks at the active queue share of an
      * individual destination. This catches the case where mail for one
diff --git a/postfix/src/pipe/pipe.c b/postfix/src/pipe/pipe.c
index eceae2b3d..ffc30301b 100644
--- a/postfix/src/pipe/pipe.c
+++ b/postfix/src/pipe/pipe.c
@@ -551,7 +551,7 @@
 #define PIPE_DICT_SASL_USERNAME	"sasl_username"	/* key */
 #define PIPE_DICT_SASL_SENDER	"sasl_sender"	/* key */
 #define PIPE_DICT_QUEUE_ID	"queue_id"	/* key */
-#define PIPE_DICT_ENVID		"envid"		/* key */
+#define PIPE_DICT_ENVID		"envid"	/* key */
 
  /*
   * Flags used to pass back the type of special parameter found by
diff --git a/postfix/src/postfix/postfix.c b/postfix/src/postfix/postfix.c
index 93bcecca5..057bed3c7 100644
--- a/postfix/src/postfix/postfix.c
+++ b/postfix/src/postfix/postfix.c
@@ -37,7 +37,7 @@
 /*	when running as PID 1.
 /*	This command requires that multi-instance support is
 /*	disabled (i.e. the multi_instance_directories parameter
-/*	value must be empty). 
+/*	value must be empty).
 /*
 /*	When running Postfix inside a container, see MAILLOG_README
 /*	for logging to stdout. Postfix logs to syslog by default,
diff --git a/postfix/src/postscreen/postscreen_dnsbl.c b/postfix/src/postscreen/postscreen_dnsbl.c
index 7d9a5e94b..4be962221 100644
--- a/postfix/src/postscreen/postscreen_dnsbl.c
+++ b/postfix/src/postscreen/postscreen_dnsbl.c
@@ -231,7 +231,7 @@ static void psc_dnsbl_add_site(const char *site)
     int     weight;
     HTABLE_INFO *ht;
     char   *parse_err;
-    const char  *safe_dnsbl;
+    const char *safe_dnsbl;
 
     /*
      * Parse the required DNSBL domain name, the optional reply filter and
diff --git a/postfix/src/posttls-finger/posttls-finger.c b/postfix/src/posttls-finger/posttls-finger.c
index 75571f7f2..dc25a3e09 100644
--- a/postfix/src/posttls-finger/posttls-finger.c
+++ b/postfix/src/posttls-finger/posttls-finger.c
@@ -901,7 +901,7 @@ static int starttls(STATE *state)
 	    state->tls_context = tls_proxy_context_receive(state->stream);
 	    if (state->tls_context) {
 		if (state->log_mask &
-		    (TLS_LOG_CERTMATCH | TLS_LOG_VERBOSE | TLS_LOG_PEERCERT)) {
+		 (TLS_LOG_CERTMATCH | TLS_LOG_VERBOSE | TLS_LOG_PEERCERT)) {
 		    if (state->tls_context->stoc_rpk)
 			msg_info("%s: pkey_fingerprint=%s", state->namaddrport,
 				 state->tls_context->peer_pkey_fprint);
@@ -2147,8 +2147,8 @@ static void parse_match(STATE *state, int argc, char *argv[])
     int     smtp_mode = 1;
 
     /*
-     * DANE match names are configured late, once the TLSA records are in hand.
-     * For now, prepare to fall back to "secure".
+     * DANE match names are configured late, once the TLSA records are in
+     * hand. For now, prepare to fall back to "secure".
      */
     switch (state->level) {
     default:
diff --git a/postfix/src/qmgr/qmgr_active.c b/postfix/src/qmgr/qmgr_active.c
index b1c1a4adc..fb5954276 100644
--- a/postfix/src/qmgr/qmgr_active.c
+++ b/postfix/src/qmgr/qmgr_active.c
@@ -235,7 +235,7 @@ int     qmgr_active_feed(QMGR_SCAN *scan_info, const char *queue_id)
      */
 #define QMGR_FLUSH_AFTER	(QMGR_FLUSH_EACH | QMGR_FLUSH_DFXP)
 #define MAYBE_FLUSH_AFTER(mode) \
-	(((mode) & MAIL_QUEUE_STAT_UNTHROTTLE) ? QMGR_FLUSH_AFTER : 0) 
+	(((mode) & MAIL_QUEUE_STAT_UNTHROTTLE) ? QMGR_FLUSH_AFTER : 0)
 #define MAYBE_FORCE_EXPIRE(mode) \
 	(((mode) & MAIL_QUEUE_STAT_EXPIRE) ? QMGR_FORCE_EXPIRE : 0)
 #define MAYBE_UPDATE_MODE(mode) \
diff --git a/postfix/src/qmgr/qmgr_entry.c b/postfix/src/qmgr/qmgr_entry.c
index e0673a93d..de232c5e3 100644
--- a/postfix/src/qmgr/qmgr_entry.c
+++ b/postfix/src/qmgr/qmgr_entry.c
@@ -392,8 +392,7 @@ QMGR_ENTRY *qmgr_entry_create(QMGR_PEER *peer, QMGR_MESSAGE *message)
      * 
      * XXX At this point in the code, the busy reference count is still less
      * than the concurrency limit (otherwise this code would not be invoked
-     * in the first place) so we have to make some awkward adjustments
-     * below.
+     * in the first place) so we have to make some awkward adjustments below.
      * 
      * XXX The queue length test below looks at the active queue share of an
      * individual destination. This catches the case where mail for one
diff --git a/postfix/src/qmqpd/qmqpd_peer.c b/postfix/src/qmqpd/qmqpd_peer.c
index 41cd00953..d086d06e1 100644
--- a/postfix/src/qmqpd/qmqpd_peer.c
+++ b/postfix/src/qmqpd/qmqpd_peer.c
@@ -199,10 +199,10 @@ void    qmqpd_peer_init(QMQPD_STATE *state)
 	    /*
 	     * Following RFC 2821 section 4.1.3, an IPv6 address literal gets
 	     * a prefix of 'IPv6:'. We do this consistently for all IPv6
-	     * addresses that appear in headers or envelopes. The fact
-	     * that valid_mailhost_addr() enforces the form helps of course.
-	     * We use the form without IPV6: prefix when doing access
-	     * control, or when accessing the connection cache.
+	     * addresses that appear in headers or envelopes. The fact that
+	     * valid_mailhost_addr() enforces the form helps of course. We
+	     * use the form without IPV6: prefix when doing access control,
+	     * or when accessing the connection cache.
 	     */
 	    else {
 		state->addr = mystrdup(client_addr.buf);
diff --git a/postfix/src/smtp/smtp.h b/postfix/src/smtp/smtp.h
index 49e111542..8c5ee0a0f 100644
--- a/postfix/src/smtp/smtp.h
+++ b/postfix/src/smtp/smtp.h
@@ -519,8 +519,8 @@ extern HBC_CALL_BACKS smtp_hbc_callbacks[];
 	(session->expire_time = (when))
 
  /*
-  * Encapsulate the following so that we don't expose details of
-  * connection management and error handling to the SMTP protocol engine.
+  * Encapsulate the following so that we don't expose details of connection
+  * management and error handling to the SMTP protocol engine.
   */
 #ifdef USE_SASL_AUTH
 #define HAVE_SASL_CREDENTIALS \
diff --git a/postfix/src/smtp/smtp_addr.c b/postfix/src/smtp/smtp_addr.c
index 8c384fc37..b7a63a4ff 100644
--- a/postfix/src/smtp/smtp_addr.c
+++ b/postfix/src/smtp/smtp_addr.c
@@ -262,7 +262,7 @@ static DNS_RR *smtp_addr_one(DNS_RR *addr_list, const char *host, int res_opt,
 		    msg_fatal("host %s: conversion error for address family "
 			      "%d: %m", host, res0->ai_addr->sa_family);
 		addr_list = dns_rr_append(addr_list, addr);
-		if (DNS_RR_IS_TRUNCATED(addr_list)) 
+		if (DNS_RR_IS_TRUNCATED(addr_list))
 		    break;
 		if (msg_verbose) {
 		    MAI_HOSTADDR_STR hostaddr_str;
@@ -867,7 +867,7 @@ DNS_RR *smtp_service_addr(const char *name, const char *service, DNS_RR **mxrr,
 
     /*
      * Only if we're not falling back.
-     */ 
+     */
     else {
 	*found_myself |= (self != 0);
     }
diff --git a/postfix/src/smtp/smtp_tlsrpt.c b/postfix/src/smtp/smtp_tlsrpt.c
index 23dc5f766..a371f4c19 100644
--- a/postfix/src/smtp/smtp_tlsrpt.c
+++ b/postfix/src/smtp/smtp_tlsrpt.c
@@ -254,7 +254,7 @@ void    smtp_tlsrpt_create_wrapper(SMTP_STATE *state, const char *domain)
 			    /* rpt_socket_name= */ var_smtp_tlsrpt_sockname,
 				    /* rpt_policy_domain= */ adomain,
 				    /* rpt_policy_string= */ rr->data,
-		    /* skip_reused_hs = */ var_smtp_tlsrpt_skip_reused_hs);
+		     /* skip_reused_hs = */ var_smtp_tlsrpt_skip_reused_hs);
 	dns_rr_free(rr);
     } else {
 	if (msg_verbose)
diff --git a/postfix/src/smtp/smtp_unalias.c b/postfix/src/smtp/smtp_unalias.c
index 1c4d34d94..5b5be43c6 100644
--- a/postfix/src/smtp/smtp_unalias.c
+++ b/postfix/src/smtp/smtp_unalias.c
@@ -86,11 +86,11 @@ const char *smtp_unalias_name(const char *name)
     if ((result = htable_find(cache, name)) == 0) {
 	fqdn = vstring_alloc(10);
 	if (dns_lookup_l(name, smtp_unalias_flags, (DNS_RR **) 0, fqdn,
-			     (VSTRING *) 0, DNS_REQ_FLAG_NONE, T_MX, T_A,
+			 (VSTRING *) 0, DNS_REQ_FLAG_NONE, T_MX, T_A,
 #ifdef HAS_IPV6
-			     T_AAAA,
+			 T_AAAA,
 #endif
-			     0) != DNS_OK)
+			 0) != DNS_OK)
 	    vstring_strcpy(fqdn, name);
 	htable_enter(cache, name, result = vstring_export(fqdn));
     }
diff --git a/postfix/src/smtpd/smtpd_milter.h b/postfix/src/smtpd/smtpd_milter.h
index 4006bde7c..b9a862f07 100644
--- a/postfix/src/smtpd/smtpd_milter.h
+++ b/postfix/src/smtpd/smtpd_milter.h
@@ -24,4 +24,3 @@ extern const char *smtpd_milter_eval(const char *, void *);
 /*	P.O. Box 704
 /*	Yorktown Heights, NY 10598, USA
 /*--*/
-
diff --git a/postfix/src/smtpd/smtpd_resolve.h b/postfix/src/smtpd/smtpd_resolve.h
index cd0257a53..ccbb0beb0 100644
--- a/postfix/src/smtpd/smtpd_resolve.h
+++ b/postfix/src/smtpd/smtpd_resolve.h
@@ -17,7 +17,7 @@
   * External interface.
   */
 extern void smtpd_resolve_init(int);
-extern const RESOLVE_REPLY *smtpd_resolve_addr(const char*, const char *);
+extern const RESOLVE_REPLY *smtpd_resolve_addr(const char *, const char *);
 
 /* LICENSE
 /* .ad
diff --git a/postfix/src/tls/tls_client.c b/postfix/src/tls/tls_client.c
index 9c5528db6..55d336602 100644
--- a/postfix/src/tls/tls_client.c
+++ b/postfix/src/tls/tls_client.c
@@ -844,34 +844,34 @@ TLS_APPL_STATE *tls_client_init(const TLS_CLIENT_INIT_PROPS *props)
     }
 
     /*
-     * Enable support for client->server raw public keys, provided we actually
-     * have keys to send.  They'll only be used if the server also enables
-     * client RPKs.
-     *
+     * Enable support for client->server raw public keys, provided we
+     * actually have keys to send.  They'll only be used if the server also
+     * enables client RPKs.
+     * 
      * XXX: When the server requests client auth, the TLS 1.2 protocol does not
      * provide an unambiguous mechanism for the client to not send an RPK (as
      * it can with client X.509 certs or TLS 1.3).  This is why we don't just
      * enable client RPK also with no keys in hand.
-     *
+     * 
      * A very unlikely scenario is that the server allows clients to not send
-     * keys, but only accepts keys for a set of algorithms we don't have.  Then
-     * we still can't send a key, but have agreed to RPK.  OpenSSL will attempt
-     * to send an empty RPK even with TLS 1.2 (and will accept such a message),
-     * but other implementations may be more strict.
-     *
+     * keys, but only accepts keys for a set of algorithms we don't have.
+     * Then we still can't send a key, but have agreed to RPK.  OpenSSL will
+     * attempt to send an empty RPK even with TLS 1.2 (and will accept such a
+     * message), but other implementations may be more strict.
+     * 
      * We could limit client RPK support to connections that support only TLS
      * 1.3 and up, but that's practical only decades in the future, and the
      * risk scenario is contrived and very unlikely.
      */
     if (SSL_CTX_get0_certificate(client_ctx) != NULL &&
-        SSL_CTX_get0_privatekey(client_ctx) != NULL)
-        tls_enable_client_rpk(client_ctx, NULL);
+	SSL_CTX_get0_privatekey(client_ctx) != NULL)
+	tls_enable_client_rpk(client_ctx, NULL);
 
     /*
      * With OpenSSL 1.0.2 and later the client EECDH curve list becomes
      * configurable with the preferred curve negotiated via the supported
-     * curves extension.  With OpenSSL 3.0 and TLS 1.3, the same applies
-     * to the FFDHE groups which become part of a unified "groups" list.
+     * curves extension.  With OpenSSL 3.0 and TLS 1.3, the same applies to
+     * the FFDHE groups which become part of a unified "groups" list.
      */
     tls_auto_groups(client_ctx, var_tls_eecdh_auto, var_tls_ffdhe_auto);
 
diff --git a/postfix/src/tls/tls_dane.c b/postfix/src/tls/tls_dane.c
index ac7f05f94..0b62b520b 100644
--- a/postfix/src/tls/tls_dane.c
+++ b/postfix/src/tls/tls_dane.c
@@ -459,7 +459,6 @@ void    tls_dane_add_fpt_digests(TLS_DANE *dane, int pkey_only,
 	    msg_warn("malformed fingerprint value: %.384s", values->argv[i]);
 	    continue;
 	}
-
 #define USTR_LEN(raw) (unsigned char *) STR(raw), VSTRING_LEN(raw)
 
 	/*
@@ -474,7 +473,7 @@ void    tls_dane_add_fpt_digests(TLS_DANE *dane, int pkey_only,
 	 * some other cert digest).  No such attacks are known at this time,
 	 * and it is expected that if any are found they would work within as
 	 * well as across the cert/pkey data types.
-	 *
+	 * 
 	 * That said, when `pkey_only` is true, we match only public keys.
 	 * 
 	 * The private-use matching type "255" is mapped to the configured
@@ -488,7 +487,6 @@ void    tls_dane_add_fpt_digests(TLS_DANE *dane, int pkey_only,
 		tlsa_info("fingerprint", "digest as private-use TLSA record",
 			  3, 0, 255, USTR_LEN(raw));
 	}
-
 	/* The public key match is unconditional */
 	dane->tlsa = tlsa_prepend(dane->tlsa, 3, 1, 255, USTR_LEN(raw));
 	if (log_mask & (TLS_LOG_VERBOSE | TLS_LOG_DANE))
@@ -820,10 +818,11 @@ int     tls_dane_enable(TLS_SESS_STATE *TLScontext)
 				tp->mtype, tp->data, tp->length);
 	if (ret > 0) {
 	    ++usable;
+
 	    /*
 	     * Disable use of RFC7250 raw public keys if any TLSA record
-	     * depends on X.509 certificates.  Only DANE-EE(3) SPKI(1) records
-	     * can get by with just a public key.
+	     * depends on X.509 certificates.  Only DANE-EE(3) SPKI(1)
+	     * records can get by with just a public key.
 	     */
 	    if (tp->usage != DNS_TLSA_USAGE_DOMAIN_ISSUED_CERTIFICATE
 		|| tp->selector != DNS_TLSA_SELECTOR_SUBJECTPUBLICKEYINFO)
diff --git a/postfix/src/tls/tls_dh.c b/postfix/src/tls/tls_dh.c
index 873c3f6e5..e42b174a7 100644
--- a/postfix/src/tls/tls_dh.c
+++ b/postfix/src/tls/tls_dh.c
@@ -305,11 +305,11 @@ void    tls_tmp_dh(SSL_CTX *ctx, int useauto)
 /* ------------------------------------- Common API */
 
 #define AG_STAT_OK	(0)
-#define AG_STAT_NO_GROUP (-1)	/* no usable group, may retry */
-#define AG_STAT_NO_RETRY (-2)	/* other error, don't retry */
+#define AG_STAT_NO_GROUP (-1)		/* no usable group, may retry */
+#define AG_STAT_NO_RETRY (-2)		/* other error, don't retry */
 
 static int setup_auto_groups(SSL_CTX *ctx, const char *origin,
-				const char *eecdh,
+			             const char *eecdh,
 			             const char *ffdhe)
 {
 #ifndef OPENSSL_NO_ECDH
@@ -325,17 +325,17 @@ static int setup_auto_groups(SSL_CTX *ctx, const char *origin,
 	tls_print_errors();
 	return (AG_STAT_NO_RETRY);
     }
-
     if (!names)
 	names = vstring_alloc(sizeof DEF_TLS_EECDH_AUTO +
 			      sizeof DEF_TLS_FFDHE_AUTO);
     VSTRING_RESET(names);
+
     /*
      * OpenSSL does not tolerate duplicate groups in the requested list.
      * Deduplicate case-insensitively, just in case OpenSSL some day supports
-     * case-insensitive group lookup.  Deduplicate only verified extant groups
-     * we're going to ask OpenSSL to use.
-     *
+     * case-insensitive group lookup.  Deduplicate only verified extant
+     * groups we're going to ask OpenSSL to use.
+     * 
      * OpenSSL 3.3 supports "?<name>" as a syntax for optionally ignoring
      * unsupported groups, so we could skip checking against the throw-away
      * CTX when linked against 3.3 or higher, but the cost savings don't
@@ -358,11 +358,12 @@ static int setup_auto_groups(SSL_CTX *ctx, const char *origin,
 	SETUP_AG_RETURN(AG_STAT_NO_GROUP);
     }
     for (; group != 0; group = mystrtok(&groups, GROUPS_SEP)) {
+
 	/*
 	 * Validate the group name by trying it as the group for a throw-away
-	 * SSL context. This way, we can ask for new groups that may not yet be
-	 * supported by the underlying OpenSSL runtime.  Unsupported groups are
-	 * silently ignored.
+	 * SSL context. This way, we can ask for new groups that may not yet
+	 * be supported by the underlying OpenSSL runtime.  Unsupported
+	 * groups are silently ignored.
 	 */
 	ERR_set_mark();
 	if (SSL_CTX_set1_curves_list(tmpctx, group) > 0 &&
@@ -412,7 +413,7 @@ void    tls_auto_groups(SSL_CTX *ctx, const char *eecdh, const char *ffdhe)
      * group selection is mere performance tuning and not security critical.
      * All the groups supported for negotiation should be strong enough.
      */
-    for (origin = "configured"; /* void */ ; /* void */) {
+    for (origin = "configured"; /* void */ ; /* void */ ) {
 	switch (setup_auto_groups(ctx, origin, eecdh, ffdhe)) {
 	case AG_STAT_OK:
 	    return;
diff --git a/postfix/src/tls/tls_misc.c b/postfix/src/tls/tls_misc.c
index 3b699ed5d..6e578d286 100644
--- a/postfix/src/tls/tls_misc.c
+++ b/postfix/src/tls/tls_misc.c
@@ -1080,11 +1080,11 @@ void    tls_get_signature_params(TLS_SESS_STATE *TLScontext)
     }
 
     /*
-     * On the client side, a TLS 1.3 KEM has no server key, just ciphertext to
-     * decapsulate, but, as of OpenSSL 3.0, the client can still obtain the
-     * negotiated group name directly.  We nevertheless still try to get the
-     * group details from the peer key first, which works with OpenSSL 1.1.1
-     * and retains the original output format for the (EC)DH groups.
+     * On the client side, a TLS 1.3 KEM has no server key, just ciphertext
+     * to decapsulate, but, as of OpenSSL 3.0, the client can still obtain
+     * the negotiated group name directly.  We nevertheless still try to get
+     * the group details from the peer key first, which works with OpenSSL
+     * 1.1.1 and retains the original output format for the (EC)DH groups.
      */
     if (!kex_name)
 	kex_name = TLS_GROUP_NAME(ssl);
@@ -1252,10 +1252,10 @@ void    tls_log_summary(TLS_ROLE role, TLS_USAGE usage, TLS_SESS_STATE *ctx)
 			       ctx->srvr_sig_name);
 	if (ctx->srvr_sig_curve && *ctx->srvr_sig_curve)
 	    vstring_sprintf_append(msg, " (%s%s)", ctx->srvr_sig_curve,
-	                           ctx->stoc_rpk ? " raw public key" : "");
+				   ctx->stoc_rpk ? " raw public key" : "");
 	else if (ctx->srvr_sig_bits > 0)
 	    vstring_sprintf_append(msg, " (%d bit%s)", ctx->srvr_sig_bits,
-	                           ctx->stoc_rpk ? " raw public key" : "s");
+				   ctx->stoc_rpk ? " raw public key" : "s");
 	else if (ctx->stoc_rpk)
 	    vstring_sprintf_append(msg, " (raw public key)");
 	if (ctx->srvr_sig_dgst && *ctx->srvr_sig_dgst)
@@ -1267,10 +1267,10 @@ void    tls_log_summary(TLS_ROLE role, TLS_USAGE usage, TLS_SESS_STATE *ctx)
 			       ctx->clnt_sig_name);
 	if (ctx->clnt_sig_curve && *ctx->clnt_sig_curve)
 	    vstring_sprintf_append(msg, " (%s%s)", ctx->clnt_sig_curve,
-	                           ctx->ctos_rpk ? " raw public key" : "");
+				   ctx->ctos_rpk ? " raw public key" : "");
 	else if (ctx->clnt_sig_bits > 0)
 	    vstring_sprintf_append(msg, " (%d bit%s)", ctx->clnt_sig_bits,
-	                           ctx->ctos_rpk ? " raw public key" : "s");
+				   ctx->ctos_rpk ? " raw public key" : "s");
 	else if (ctx->ctos_rpk)
 	    vstring_sprintf_append(msg, " (raw public key)");
 	if (ctx->clnt_sig_dgst && *ctx->clnt_sig_dgst)
@@ -1465,16 +1465,16 @@ void    tls_check_version(void)
      * later minor numbers starting with 3.0.0.
      */
     if (hdr_info.major >= 3) {
-        warn_compat = lib_info.major != hdr_info.major 
-            || lib_info.minor < hdr_info.minor;
+	warn_compat = lib_info.major != hdr_info.major
+	    || lib_info.minor < hdr_info.minor;
     } else if (hdr_info.major == 1 && hdr_info.minor != 0) {
-        warn_compat = lib_info.major != hdr_info.major 
-            || lib_info.minor != hdr_info.minor
-            || lib_info.micro < hdr_info.micro;
+	warn_compat = lib_info.major != hdr_info.major
+	    || lib_info.minor != hdr_info.minor
+	    || lib_info.micro < hdr_info.micro;
     } else {
-        warn_compat = lib_info.major != hdr_info.major
-            || lib_info.minor != hdr_info.minor
-            || lib_info.micro != hdr_info.micro;
+	warn_compat = lib_info.major != hdr_info.major
+	    || lib_info.minor != hdr_info.minor
+	    || lib_info.micro != hdr_info.micro;
     }
     if (warn_compat)
 	msg_warn("run-time library vs. compile-time header version mismatch: "
diff --git a/postfix/src/tls/tls_proxy_client_print.c b/postfix/src/tls/tls_proxy_client_print.c
index 68d8394ce..4b397ae79 100644
--- a/postfix/src/tls/tls_proxy_client_print.c
+++ b/postfix/src/tls/tls_proxy_client_print.c
@@ -347,7 +347,7 @@ int     tls_proxy_client_start_print(ATTR_PRINT_COMMON_FN print_fn,
 				  (const void *) props->tlsrpt),
 #endif
 		   SEND_ATTR_STR(TLS_ATTR_FFAIL_TYPE,
-				  STRING_OR_EMPTY(props->ffail_type)),
+				 STRING_OR_EMPTY(props->ffail_type)),
 		   ATTR_TYPE_END);
     /* Do not flush the stream. */
     if (msg_verbose)
diff --git a/postfix/src/tls/tls_server.c b/postfix/src/tls/tls_server.c
index 87433e935..3f2520dee 100644
--- a/postfix/src/tls/tls_server.c
+++ b/postfix/src/tls/tls_server.c
@@ -168,10 +168,12 @@
 static const char server_session_id_context[] = "Postfix/TLS";
 
 #ifndef OPENSSL_NO_TLSEXT
+
  /*
   * We retain the cipher handle for the lifetime of the process.
   */
 static const EVP_CIPHER *tkt_cipher;
+
 #endif
 
 #define GET_SID(s, v, lptr)	((v) = SSL_SESSION_get_id((s), (lptr)))
@@ -691,10 +693,10 @@ TLS_APPL_STATE *tls_server_init(const TLS_SERVER_INIT_PROPS *props)
     tls_tmp_dh(sni_ctx, 1);
 
     /*
-     * Enable EECDH if available, errors are not fatal, we just keep going with
-     * any remaining key-exchange algorithms.  With OpenSSL 3.0 and TLS 1.3,
-     * the same applies to the FFDHE groups which become part of a unified
-     * "groups" list.
+     * Enable EECDH if available, errors are not fatal, we just keep going
+     * with any remaining key-exchange algorithms.  With OpenSSL 3.0 and TLS
+     * 1.3, the same applies to the FFDHE groups which become part of a
+     * unified "groups" list.
      */
     tls_auto_groups(server_ctx, var_tls_eecdh_auto, var_tls_ffdhe_auto);
     tls_auto_groups(sni_ctx, var_tls_eecdh_auto, var_tls_ffdhe_auto);
@@ -874,7 +876,8 @@ TLS_SESS_STATE *tls_server_start(const TLS_SERVER_START_PROPS *props)
     }
 
     /*
-     * When encryption is mandatory use the 80-bit plus OpenSSL security level.
+     * When encryption is mandatory use the 80-bit plus OpenSSL security
+     * level.
      */
     if (props->requirecert)
 	SSL_set_security_level(TLScontext->con, 1);
@@ -1054,7 +1057,7 @@ TLS_SESS_STATE *tls_server_post_accept(TLS_SESS_STATE *TLScontext)
 	     * way to associate DANE TLSA RRs with clients just yet, we just
 	     * make the fingerprint available to the access(5) layer.
 	     */
-            TLScontext->peer_status |= TLS_CRED_FLAG_RPK;
+	    TLScontext->peer_status |= TLS_CRED_FLAG_RPK;
 	    TLScontext->peer_pkey_fprint =
 		tls_pkey_fprint(pkey, TLScontext->mdalg);
 	    if (TLScontext->log_mask & (TLS_LOG_VERBOSE | TLS_LOG_PEERCERT))
diff --git a/postfix/src/util/alldig.c b/postfix/src/util/alldig.c
index cabe5c37b..dea766ab5 100644
--- a/postfix/src/util/alldig.c
+++ b/postfix/src/util/alldig.c
@@ -60,14 +60,14 @@ int     alldig(const char *string)
 
 /* allalnum - return true if string is all alphanum */
 
-int allalnum(const char *string)
+int     allalnum(const char *string)
 {
     const char *cp;
 
     if (*string == 0)
-        return (0);
+	return (0);
     for (cp = string; *cp != 0; cp++)
-        if (!ISALNUM(*cp))
-            return (0);
+	if (!ISALNUM(*cp))
+	    return (0);
     return (1);
 }
diff --git a/postfix/src/util/argv_split.c b/postfix/src/util/argv_split.c
index a9f3afbdb..1fcdd89bc 100644
--- a/postfix/src/util/argv_split.c
+++ b/postfix/src/util/argv_split.c
@@ -28,7 +28,7 @@
 /*	input after at most \fIcount\fR -1 times and leaves the
 /*	remainder, if any, in the last array element. It is an error
 /*	to specify a count < 1.
-/* 
+/*
 /*	argv_split_append() performs the same operation as argv_split(),
 /*	but appends the result to an existing string array.
 /* SEE ALSO
diff --git a/postfix/src/util/balpar.c b/postfix/src/util/balpar.c
index 6ff97eb72..78757e3c8 100644
--- a/postfix/src/util/balpar.c
+++ b/postfix/src/util/balpar.c
@@ -10,7 +10,7 @@
 /*	const char *string;
 /*	const char *parens;
 /* DESCRIPTION
-/*	balpar() determines the length of a string enclosed in 
+/*	balpar() determines the length of a string enclosed in
 /*	the specified parentheses, zero in case of error.
 /* SEE ALSO
 /*	A balpar() routine appears in Brian W. Kernighan, P.J. Plauger:
diff --git a/postfix/src/util/byte_mask.c b/postfix/src/util/byte_mask.c
index e81847655..2d08877c9 100644
--- a/postfix/src/util/byte_mask.c
+++ b/postfix/src/util/byte_mask.c
@@ -291,7 +291,7 @@ int     main(int argc, char **argv)
 	vstream_printf("%s -> 0x%x -> %s\n",
 		       STR(in_buf), demo_mask,
 		       demo_str ? demo_str : "(null)");
-	demo_mask <<=1;
+	demo_mask <<= 1;
 	demo_str = str_byte_mask_opt(out_buf, "mask", demo_table,
 				     demo_mask, out_feature_mask);
 	vstream_printf("0x%x -> %s\n",
diff --git a/postfix/src/util/cidr_match.h b/postfix/src/util/cidr_match.h
index 22f16a08a..ee153a438 100644
--- a/postfix/src/util/cidr_match.h
+++ b/postfix/src/util/cidr_match.h
@@ -29,9 +29,9 @@
   * strings should be.
   */
 #ifdef HAS_IPV6
-# define CIDR_MATCH_ABYTES	MAI_V6ADDR_BYTES
+#define CIDR_MATCH_ABYTES	MAI_V6ADDR_BYTES
 #else
-# define CIDR_MATCH_ABYTES	MAI_V4ADDR_BYTES
+#define CIDR_MATCH_ABYTES	MAI_V4ADDR_BYTES
 #endif
 
  /*
diff --git a/postfix/src/util/dict.h b/postfix/src/util/dict.h
index 217deb7a6..ef0e83343 100644
--- a/postfix/src/util/dict.h
+++ b/postfix/src/util/dict.h
@@ -325,7 +325,7 @@ extern const char *dict_file_lookup(DICT *dict, const char *);
   * dict_stream(3)
   */
 extern VSTREAM *dict_stream_open(const char *dict_type, const char *mapname,
-            int open_flags, int dict_flags, struct stat * st, VSTRING **why);
+           int open_flags, int dict_flags, struct stat * st, VSTRING **why);
 
 /* LICENSE
 /* .ad
diff --git a/postfix/src/util/dict_cdb.h b/postfix/src/util/dict_cdb.h
index 696ffbf46..ee7e49a9a 100644
--- a/postfix/src/util/dict_cdb.h
+++ b/postfix/src/util/dict_cdb.h
@@ -41,4 +41,4 @@ extern MKMAP *mkmap_cdb_open(const char *);
 /*	New York, NY 10011, USA
 /*--*/
 
-#endif /* _DICT_CDB_H_INCLUDED_ */
+#endif					/* _DICT_CDB_H_INCLUDED_ */
diff --git a/postfix/src/util/dict_stream.c b/postfix/src/util/dict_stream.c
index e28ad71fd..446d8f859 100644
--- a/postfix/src/util/dict_stream.c
+++ b/postfix/src/util/dict_stream.c
@@ -51,7 +51,7 @@
 /*	content as specified above.
 /* .IP st
 /*	File metadata with the file owner, or fake metadata with the
-/*	real UID and GID of the dict_stream_open() caller. This is 
+/*	real UID and GID of the dict_stream_open() caller. This is
 /*	used for "taint" tracking (zero=trusted, non-zero=untrusted).
 /* IP why
 /*	Pointer to pointer to error message storage. dict_stream_open()
diff --git a/postfix/src/util/dup2_pass_on_exec.c b/postfix/src/util/dup2_pass_on_exec.c
index 5286e5bca..25b5b53bb 100644
--- a/postfix/src/util/dup2_pass_on_exec.c
+++ b/postfix/src/util/dup2_pass_on_exec.c
@@ -49,14 +49,14 @@ int     main(int unused_argc, char **unused_argv)
     DO((res = fcntl(3, F_GETFD, 0)));
     if (res & 1)
 	printf(
-"Yes, a newly dup2()ed file-descriptor has the close-on-exec \
+	       "Yes, a newly dup2()ed file-descriptor has the close-on-exec \
 flag cloned.\n\
 THIS VIOLATES Posix1003.1 section 6.2.1.2 or 6.5.2.2!\n\
 You should #define DUP2_DUPS_CLOSE_ON_EXEC in sys_defs.h \
 for your OS.\n");
     else
 	printf(
-"No, a newly dup2()ed file-descriptor has the close-on-exec \
+	       "No, a newly dup2()ed file-descriptor has the close-on-exec \
 flag cleared.\n\
 This complies with Posix1003.1 section 6.2.1.2 and 6.5.2.2!\n");
 
diff --git a/postfix/src/util/duplex_pipe.c b/postfix/src/util/duplex_pipe.c
index 04f23f6e5..4ceea3fcc 100644
--- a/postfix/src/util/duplex_pipe.c
+++ b/postfix/src/util/duplex_pipe.c
@@ -46,4 +46,3 @@ int     duplex_pipe(int *fds)
     return (sane_socketpair(AF_UNIX, SOCK_STREAM, 0, fds));
 #endif
 }
-
diff --git a/postfix/src/util/exec_command.c b/postfix/src/util/exec_command.c
index 8629b0c24..2e0e0d16c 100644
--- a/postfix/src/util/exec_command.c
+++ b/postfix/src/util/exec_command.c
@@ -67,9 +67,9 @@ ABCDEFGHIJKLMNOPQRSTUVWXYZ" SPACE_TAB;
 	&& command[strspn(command, SPACE_TAB)] != 0) {
 
 	/*
-	 * No shell meta characters found, so we can try to avoid the overhead
-	 * of running a shell. Just split the command on whitespace and exec
-	 * the result directly.
+	 * No shell meta characters found, so we can try to avoid the
+	 * overhead of running a shell. Just split the command on whitespace
+	 * and exec the result directly.
 	 */
 	argv = argv_split(command, SPACE_TAB);
 	(void) execvp(argv->argv[0], argv->argv);
diff --git a/postfix/src/util/find_inet.c b/postfix/src/util/find_inet.c
index 294634c50..a233bc76d 100644
--- a/postfix/src/util/find_inet.c
+++ b/postfix/src/util/find_inet.c
@@ -192,7 +192,8 @@ struct test_case test_cases[] = {
     },
 };
 
-int main(int argc, char **argv) {
+int     main(int argc, char **argv)
+{
     struct test_case *tp;
     struct association *ap;
     int     pass = 0;
diff --git a/postfix/src/util/format_tv.c b/postfix/src/util/format_tv.c
index a932bdb41..a7c078f64 100644
--- a/postfix/src/util/format_tv.c
+++ b/postfix/src/util/format_tv.c
@@ -38,7 +38,7 @@
 /*	The maximal number of all digits after the decimal point.
 /*	Specify a number in the range 0..6.
 /* LICENSE
-/* .ad 
+/* .ad
 /* .fi
 /*	The Secure Mailer license must be distributed with this
 /*	software.
diff --git a/postfix/src/util/hash_fnv.c b/postfix/src/util/hash_fnv.c
index b4d7b304b..3daf93fe7 100644
--- a/postfix/src/util/hash_fnv.c
+++ b/postfix/src/util/hash_fnv.c
@@ -192,8 +192,8 @@ int     main(void)
 	    test_failed = 0;
 	    if ((hval = hash_fnvz(tp->str)) != tp->hval) {
 		msg_warn("hash_fnv(\"%s\") want %lu, got: %lu",
-			 tp->str, (unsigned long) tp->hval, 
-			(unsigned long) hval);
+			 tp->str, (unsigned long) tp->hval,
+			 (unsigned long) hval);
 		test_failed = 1;
 	    }
 	    if (test_failed) {
diff --git a/postfix/src/util/host_port.c b/postfix/src/util/host_port.c
index c4e86166d..fe06c2a66 100644
--- a/postfix/src/util/host_port.c
+++ b/postfix/src/util/host_port.c
@@ -157,7 +157,7 @@ const char *host_port(char *buf, char **host, char *def_host,
      * Final sanity checks. We're still sloppy, allowing bare numerical
      * network addresses instead of requiring proper [ipaddress] forms.
      */
-    if (*host != def_host 
+    if (*host != def_host
 	&& !valid_utf8_hostname(util_utf8_enable, *host, DONT_GRIPE)
 	&& !valid_hostaddr(*host, DONT_GRIPE))
 	return ("valid hostname or network address required");
diff --git a/postfix/src/util/inet_addr_sizes.c b/postfix/src/util/inet_addr_sizes.c
index e788c2222..0c9843c22 100644
--- a/postfix/src/util/inet_addr_sizes.c
+++ b/postfix/src/util/inet_addr_sizes.c
@@ -64,9 +64,9 @@ static const INET_ADDR_SIZES table[] = {
 
 /* inet_addr_sizes - get address size metrics for address family */
 
-const   INET_ADDR_SIZES *inet_addr_sizes(int af)
+const INET_ADDR_SIZES *inet_addr_sizes(int af)
 {
-    const   INET_ADDR_SIZES *sp;
+    const INET_ADDR_SIZES *sp;
 
     for (sp = table; /* see below */ ; sp++) {
 	if (sp >= table + sizeof(table) / sizeof(*table))
diff --git a/postfix/src/util/inet_connect.c b/postfix/src/util/inet_connect.c
index dded7e425..0f5542e94 100644
--- a/postfix/src/util/inet_connect.c
+++ b/postfix/src/util/inet_connect.c
@@ -108,7 +108,6 @@ int     inet_connect(const char *addr, int block_mode, int timeout)
 	errno = EADDRNOTAVAIL;			/* for up-stream "%m" */
 	return (-1);
     }
-
     proto_info = inet_proto_info();
     for (sock = -1, found = 0, res = res0; res != 0; res = res->ai_next) {
 
diff --git a/postfix/src/util/load_file.h b/postfix/src/util/load_file.h
index 3e635f37f..3e180bd47 100644
--- a/postfix/src/util/load_file.h
+++ b/postfix/src/util/load_file.h
@@ -14,7 +14,7 @@
  /*
   * External interface.
   */
-typedef void (*LOAD_FILE_FN)(VSTREAM *, void *);
+typedef void (*LOAD_FILE_FN) (VSTREAM *, void *);
 
 extern void load_file(const char *, LOAD_FILE_FN, void *);
 
diff --git a/postfix/src/util/load_lib.h b/postfix/src/util/load_lib.h
index 1c999c502..2312e9d69 100644
--- a/postfix/src/util/load_lib.h
+++ b/postfix/src/util/load_lib.h
@@ -17,12 +17,12 @@
 /* NULL name terminates list */
 typedef struct LIB_FN {
     const char *name;
-    void  (*fptr)(void);
+    void    (*fptr) (void);
 } LIB_FN;
 
 typedef struct LIB_DP {
     const char *name;
-    void  *dptr;
+    void   *dptr;
 } LIB_DP;
 
 extern void load_library_symbols(const char *, LIB_FN *, LIB_DP *);
diff --git a/postfix/src/util/mac_expand.h b/postfix/src/util/mac_expand.h
index fbe634793..714b39dc0 100644
--- a/postfix/src/util/mac_expand.h
+++ b/postfix/src/util/mac_expand.h
@@ -45,7 +45,7 @@ typedef enum MAC_EXP_OP_RES {
     MAC_EXP_OP_RES_TRUE,
     MAC_EXP_OP_RES_FALSE,
     MAC_EXP_OP_RES_ERROR,
-} MAC_EXP_OP_RES;
+}       MAC_EXP_OP_RES;
 
 
 extern MAC_EXP_OP_RES mac_exp_op_res_bool[2];
@@ -57,7 +57,7 @@ extern MAC_EXP_OP_RES mac_exp_op_res_bool[2];
 #define MAC_EXP_MODE_USE	(1)
 
 typedef const char *(*MAC_EXP_LOOKUP_FN) (const char *, int, void *);
-typedef MAC_EXP_OP_RES (*MAC_EXPAND_RELOP_FN) (const char *, int, const char *);
+typedef MAC_EXP_OP_RES(*MAC_EXPAND_RELOP_FN) (const char *, int, const char *);
 
 extern int mac_expand(VSTRING *, const char *, int, const char *, MAC_EXP_LOOKUP_FN, void *);
 void    mac_expand_add_relop(int *, const char *, MAC_EXPAND_RELOP_FN);
diff --git a/postfix/src/util/midna_domain.h b/postfix/src/util/midna_domain.h
index 1abe2a173..d191ff4bc 100644
--- a/postfix/src/util/midna_domain.h
+++ b/postfix/src/util/midna_domain.h
@@ -22,6 +22,7 @@ extern void midna_domain_pre_chroot(void);
 
 extern int midna_domain_cache_size;
 extern int midna_domain_transitional;
+
 /* LICENSE
 /* .ad
 /* .fi
diff --git a/postfix/src/util/mkmap_cdb.c b/postfix/src/util/mkmap_cdb.c
index abb2c7d41..48c20f091 100644
--- a/postfix/src/util/mkmap_cdb.c
+++ b/postfix/src/util/mkmap_cdb.c
@@ -53,13 +53,14 @@
 /* This is a dummy module, since CDB has all the functionality
  * built-in, as cdb creation requires one global lock anyway. */
 
-MKMAP *mkmap_cdb_open(const char *unused_path)
+MKMAP  *mkmap_cdb_open(const char *unused_path)
 {
     MKMAP  *mkmap = (MKMAP *) mymalloc(sizeof(*mkmap));
+
     mkmap->open = dict_cdb_open;
     mkmap->after_open = 0;
     mkmap->after_close = 0;
     return (mkmap);
 }
 
-#endif /* HAS_CDB */
+#endif					/* HAS_CDB */
diff --git a/postfix/src/util/mvect.c b/postfix/src/util/mvect.c
index cf4b0d5bb..d3f8a7b4b 100644
--- a/postfix/src/util/mvect.c
+++ b/postfix/src/util/mvect.c
@@ -73,7 +73,7 @@
 /* mvect_alloc - allocate memory vector */
 
 char   *mvect_alloc(MVECT *vect, ssize_t elsize, ssize_t nelm,
-               void (*init_fn) (char *, ssize_t), void (*wipe_fn) (char *, ssize_t))
+        void (*init_fn) (char *, ssize_t), void (*wipe_fn) (char *, ssize_t))
 {
     vect->init_fn = init_fn;
     vect->wipe_fn = wipe_fn;
diff --git a/postfix/src/util/myaddrinfo.h b/postfix/src/util/myaddrinfo.h
index cd58a8d4b..0d6e0e005 100644
--- a/postfix/src/util/myaddrinfo.h
+++ b/postfix/src/util/myaddrinfo.h
@@ -109,12 +109,12 @@ extern char *gai_strerror(int);
   * they suggest that space for the null terminator is not included.
   */
 #ifdef HAS_IPV6
-# define MAI_HOSTADDR_STRSIZE	INET6_ADDRSTRLEN
+#define MAI_HOSTADDR_STRSIZE	INET6_ADDRSTRLEN
 #else
-# ifndef INET_ADDRSTRLEN
-#  define INET_ADDRSTRLEN	16
-# endif
-# define MAI_HOSTADDR_STRSIZE	INET_ADDRSTRLEN
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN	16
+#endif
+#define MAI_HOSTADDR_STRSIZE	INET_ADDRSTRLEN
 #endif
 
 #define MAI_HOSTNAME_STRSIZE	1025
diff --git a/postfix/src/util/name_mask.c b/postfix/src/util/name_mask.c
index 284d4fa9d..ddd4af300 100644
--- a/postfix/src/util/name_mask.c
+++ b/postfix/src/util/name_mask.c
@@ -316,7 +316,7 @@ const char *str_name_mask_opt(VSTRING *buf, const char *context,
 /* long_name_mask_delim_opt - compute mask corresponding to list of names */
 
 long    long_name_mask_delim_opt(const char *context,
-				         const LONG_NAME_MASK * table,
+				         const LONG_NAME_MASK *table,
 			               const char *names, const char *delim,
 				         int flags)
 {
@@ -378,7 +378,7 @@ long    long_name_mask_delim_opt(const char *context,
 /* str_long_name_mask_opt - mask to string */
 
 const char *str_long_name_mask_opt(VSTRING *buf, const char *context,
-				           const LONG_NAME_MASK * table,
+				           const LONG_NAME_MASK *table,
 				           long mask, int flags)
 {
     const char *myname = "name_mask";
diff --git a/postfix/src/util/open_limit.c b/postfix/src/util/open_limit.c
index 8d4943375..c34f0403f 100644
--- a/postfix/src/util/open_limit.c
+++ b/postfix/src/util/open_limit.c
@@ -58,6 +58,7 @@ int     open_limit(int limit)
 {
 #ifdef RLIMIT_NOFILE
     struct rlimit rl;
+
 #endif
 
     if (limit < 0) {
@@ -97,4 +98,3 @@ int     open_limit(int limit)
     return (getdtablesize());
 #endif
 }
-
diff --git a/postfix/src/util/parse_utf8_char.h b/postfix/src/util/parse_utf8_char.h
index b00a1c215..41ba2d0ca 100644
--- a/postfix/src/util/parse_utf8_char.h
+++ b/postfix/src/util/parse_utf8_char.h
@@ -49,7 +49,7 @@
 #include <sys_defs.h>
 
 #ifdef NO_INLINE
-#define inline /* */
+#define inline				/* */
 #endif
 
 /* parse_utf8_char - parse and validate one UTF8 multibyte sequence */
@@ -119,4 +119,4 @@ static inline char *parse_utf8_char(const char *str, const char *end)
     }
 }
 
-#undef inline 
+#undef inline
diff --git a/postfix/src/util/posix_signals.c b/postfix/src/util/posix_signals.c
index 8ccddf0f7..51b0be4d3 100644
--- a/postfix/src/util/posix_signals.c
+++ b/postfix/src/util/posix_signals.c
@@ -57,7 +57,7 @@ int     sigaddset(sigset_t *set, int signum)
 
 int     sigprocmask(int how, sigset_t *set, sigset_t *old)
 {
-    int previous;
+    int     previous;
 
     if (how == SIG_BLOCK)
 	previous = sigblock(*set);
@@ -91,7 +91,7 @@ static int sighandle(int signum)
     actions[signum].sa_handler(signum);
 }
 
-int     sigaction(int sig, struct sigaction *act, struct sigaction *oact)
+int     sigaction(int sig, struct sigaction * act, struct sigaction * oact)
 {
     static int initialized = 0;
 
diff --git a/postfix/src/util/sane_strtol.c b/postfix/src/util/sane_strtol.c
index b7435ddc3..46ca426bc 100644
--- a/postfix/src/util/sane_strtol.c
+++ b/postfix/src/util/sane_strtol.c
@@ -7,8 +7,8 @@
 /*	#include <sane_strtol.h>
 /*
 /*	long	sane_strtol(
-/*	const char *start, 
-/*	char **restrict end, 
+/*	const char *start,
+/*	char **restrict end,
 /*	int	base)
 /*
 /*	unsigned long sane_strtoul(
diff --git a/postfix/src/util/set_eugid.c b/postfix/src/util/set_eugid.c
index ef35380b5..476bcf245 100644
--- a/postfix/src/util/set_eugid.c
+++ b/postfix/src/util/set_eugid.c
@@ -21,7 +21,7 @@
 /*	effective group id.
 /*
 /*	SAVE_AND_SET_EUGID() opens a block that executes with the
-/*	specified privilege. RESTORE_SAVED_EUGID() closes the block. 
+/*	specified privilege. RESTORE_SAVED_EUGID() closes the block.
 /* DIAGNOSTICS
 /*	All system call errors are fatal.
 /* SEE ALSO
diff --git a/postfix/src/util/slmdb.c b/postfix/src/util/slmdb.c
index 499589d04..e1b8fd64c 100644
--- a/postfix/src/util/slmdb.c
+++ b/postfix/src/util/slmdb.c
@@ -281,8 +281,8 @@
   * closest thing that C has to exception handling). The application is then
   * expected to repeat the bulk transaction from scratch.
   * 
-  * When any code aborts a bulk transaction, it must reset slmdb->txn to null
-  * to avoid a use-after-free problem in slmdb_close().
+  * When any code aborts a bulk transaction, it must reset slmdb->txn to null to
+  * avoid a use-after-free problem in slmdb_close().
   */
 
  /*
diff --git a/postfix/src/util/sock_addr.c b/postfix/src/util/sock_addr.c
index 38ccc9142..52a7e3e82 100644
--- a/postfix/src/util/sock_addr.c
+++ b/postfix/src/util/sock_addr.c
@@ -69,7 +69,7 @@
 /*	address family and length of the real structure that hides
 /*	inside a generic sockaddr structure. On systems where struct
 /*	sockaddr has no sa_len member, SOCK_ADDR_LEN() cannot be
-/*	used as lvalue. SOCKADDR_ADDRP() returns a pointer to the 
+/*	used as lvalue. SOCKADDR_ADDRP() returns a pointer to the
 /*	IPv4 or IPv6 address. SOCK_ADDR_PORT() returns the IPv4 or IPv6
 /*	port number, in network byte order; it must not be used as
 /*	lvalue. SOCK_ADDR_PORTP() returns a pointer to the same.
diff --git a/postfix/src/util/strcasecmp.c b/postfix/src/util/strcasecmp.c
index 07e938191..9ce837a95 100644
--- a/postfix/src/util/strcasecmp.c
+++ b/postfix/src/util/strcasecmp.c
@@ -33,6 +33,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strcasecmp.c	8.1 (Berkeley) 6/4/93";
+
 #endif					/* LIBC_SCCS and not lint */
 
 #include <sys_defs.h>
diff --git a/postfix/src/util/stream_connect.c b/postfix/src/util/stream_connect.c
index b8cc62422..422034ef7 100644
--- a/postfix/src/util/stream_connect.c
+++ b/postfix/src/util/stream_connect.c
@@ -104,6 +104,6 @@ int     stream_connect(const char *path, int block_mode, int unused_timeout)
      */
     return (pair[0]);
 #else
-    msg_fatal("stream connections are not implemented");
+            msg_fatal("stream connections are not implemented");
 #endif
 }
diff --git a/postfix/src/util/stream_recv_fd.c b/postfix/src/util/stream_recv_fd.c
index 5be02e449..819caf312 100644
--- a/postfix/src/util/stream_recv_fd.c
+++ b/postfix/src/util/stream_recv_fd.c
@@ -62,7 +62,7 @@ int     stream_recv_fd(int fd)
 	return (-1);
     return (fdinfo.fd);
 #else
-    msg_fatal("stream connections are not implemented");
+            msg_fatal("stream connections are not implemented");
 #endif
 }
 
diff --git a/postfix/src/util/stream_test.c b/postfix/src/util/stream_test.c
index 5c8f82fa4..3a6540742 100644
--- a/postfix/src/util/stream_test.c
+++ b/postfix/src/util/stream_test.c
@@ -103,9 +103,11 @@ int     main(int argc, char **argv)
 	msg_fatal("close server fd");
     return (0);
 }
+
 #else
 int     main(int argc, char **argv)
 {
     return (0);
 }
+
 #endif
diff --git a/postfix/src/util/unix_dgram_connect.c b/postfix/src/util/unix_dgram_connect.c
index 3df8963a9..9a106d663 100644
--- a/postfix/src/util/unix_dgram_connect.c
+++ b/postfix/src/util/unix_dgram_connect.c
@@ -60,6 +60,7 @@
 int     unix_dgram_connect(const char *path, int block_mode)
 {
     const char myname[] = "unix_dgram_connect";
+
 #undef sun
     struct sockaddr_un sun;
     ssize_t path_len;
diff --git a/postfix/src/util/unix_dgram_listen.c b/postfix/src/util/unix_dgram_listen.c
index e73ad4e4e..53787bfbd 100644
--- a/postfix/src/util/unix_dgram_listen.c
+++ b/postfix/src/util/unix_dgram_listen.c
@@ -55,6 +55,7 @@
 int     unix_dgram_listen(const char *path, int block_mode)
 {
     const char myname[] = "unix_dgram_listen";
+
 #undef sun
     struct sockaddr_un sun;
     ssize_t path_len;
@@ -77,16 +78,16 @@ int     unix_dgram_listen(const char *path, int block_mode)
      */
     if ((sock = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0)
 	msg_fatal("%s: socket: %m", myname);
-    if (unlink(path) < 0 && errno != ENOENT) 
-        msg_fatal( "remove %s: %m", path);
-    if (bind(sock, (struct sockaddr *) & sun, sizeof(sun)) < 0) 
-        msg_fatal( "bind: %s: %m", path);
+    if (unlink(path) < 0 && errno != ENOENT)
+	msg_fatal("remove %s: %m", path);
+    if (bind(sock, (struct sockaddr *) &sun, sizeof(sun)) < 0)
+	msg_fatal("bind: %s: %m", path);
 #ifdef FCHMOD_UNIX_SOCKETS
     if (fchmod(sock, 0666) < 0)
-        msg_fatal("fchmod socket %s: %m", path);
+	msg_fatal("fchmod socket %s: %m", path);
 #else
     if (chmod(path, 0666) < 0)
-        msg_fatal("chmod socket %s: %m", path);
+	msg_fatal("chmod socket %s: %m", path);
 #endif
     non_blocking(sock, block_mode);
     return (sock);
diff --git a/postfix/src/util/vbuf.c b/postfix/src/util/vbuf.c
index 924e230ad..d8bcc0178 100644
--- a/postfix/src/util/vbuf.c
+++ b/postfix/src/util/vbuf.c
@@ -175,7 +175,7 @@ int     vbuf_unget(VBUF *bp, int ch)
 int     vbuf_get(VBUF *bp)
 {
     return (bp->get_ready(bp) ?
-	((bp->flags |= VBUF_FLAG_EOF), VBUF_EOF) : VBUF_GET(bp));
+	    ((bp->flags |= VBUF_FLAG_EOF), VBUF_EOF) : VBUF_GET(bp));
 }
 
 /* vbuf_put - handle write buffer full condition */