5 files changed, 251 insertions, 42 deletions
diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim
index 58e867d42a..fd4ec39c91 100644
--- a/runtime/syntax/asterisk.vim
+++ b/runtime/syntax/asterisk.vim
@@ -1,8 +1,9 @@
 " Vim syntax file
 " Language:	Asterisk config file
-" Maintainer:	brc007 
+" Maintainer: 	Jean Aunis <jean.aunis@yahoo.fr>
+" Previous Maintainer:	brc007
 " Updated for 1.2 by Tilghman Lesher (Corydon76)
-" Last Change:	2006 Mar 20 
+" Last Change:	2015 Feb 27
 " version 0.4
 "
 if version < 600
@@ -17,18 +18,19 @@ syn sync fromstart
 syn keyword     asteriskTodo    TODO contained
 syn match       asteriskComment         ";.*" contains=asteriskTodo
 syn match       asteriskContext         "\[.\{-}\]"
-syn match       asteriskExten           "^\s*exten\s*=>\?\s*[^,]\+" contains=asteriskPattern
+syn match       asteriskExten           "^\s*\zsexten\s*=>\?\s*[^,]\+\ze," contains=asteriskPattern nextgroup=asteriskPriority
+syn match       asteriskExten           "^\s*\zssame\s*=>\?\s*\ze" nextgroup=asteriskPriority
 syn match       asteriskExten           "^\s*\(register\|channel\|ignorepat\|include\|\(no\)\?load\)\s*=>\?"
 syn match       asteriskPattern         "_\(\[[[:alnum:]#*\-]\+\]\|[[:alnum:]#*]\)*\.\?" contained
 syn match       asteriskPattern         "[^A-Za-z0-9,]\zs[[:alnum:]#*]\+\ze" contained
 syn match       asteriskApp             ",\zs[a-zA-Z]\+\ze$"
 syn match       asteriskApp             ",\zs[a-zA-Z]\+\ze("
 " Digits plus oldlabel (newlabel)
-syn match       asteriskPriority        ",\zs[[:digit:]]\+\(+[[:alpha:]][[:alnum:]_]*\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
+syn match       asteriskPriority        "\zs[[:digit:]]\+\(+[[:alpha:]][[:alnum:]_]*\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
 " oldlabel plus digits (newlabel)
-syn match       asteriskPriority        ",\zs[[:alpha:]][[:alnum:]_]*+[[:digit:]]\+\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
+syn match       asteriskPriority        "\zs[[:alpha:]][[:alnum:]_]*+[[:digit:]]\+\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
 " s or n plus digits (newlabel)
-syn match       asteriskPriority        ",\zs[sn]\(+[[:digit:]]\+\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
+syn match       asteriskPriority        "\zs[sn]\(+[[:digit:]]\+\)\?\(([[:alpha:]][[:alnum:]_]*)\)\?\ze," contains=asteriskLabel
 syn match       asteriskLabel           "(\zs[[:alpha:]][[:alnum:]]*\ze)" contained
 syn match       asteriskError           "^\s*#\s*[[:alnum:]]*"
 syn match       asteriskInclude         "^\s*#\s*\(include\|exec\)\s.*"
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 128e1a2a4a..a520e6317f 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 Nov 13
+" Last Change:	2015 Feb 27
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -330,6 +330,8 @@ if !exists("c_no_ansi") || exists("c_ansi_constants") || exists("c_gnu")
   " POSIX 2001
   syn keyword cConstant SIGBUS SIGPOLL SIGPROF SIGSYS SIGURG
   syn keyword cConstant SIGVTALRM SIGXCPU SIGXFSZ
+  " non-POSIX signals
+  syn keyword cConstant SIGWINCH SIGINFO
   " Add POSIX errors as well
   syn keyword cConstant E2BIG EACCES EAGAIN EBADF EBADMSG EBUSY
   syn keyword cConstant ECANCELED ECHILD EDEADLK EDOM EEXIST EFAULT
diff --git a/runtime/syntax/cobol.vim b/runtime/syntax/cobol.vim
index 5315e75211..51ca3d8773 100644
--- a/runtime/syntax/cobol.vim
+++ b/runtime/syntax/cobol.vim
@@ -1,10 +1,10 @@
 " Vim syntax file
-" Language:   COBOL
-" Maintainer: Tim Pope <vimNOSPAM@tpope.info>
+" Language:     COBOL
+" Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
 "     (formerly Davyd Ondrejko <vondraco@columbus.rr.com>)
 "     (formerly Sitaram Chamarty <sitaram@diac.com> and
-"		    James Mitchell <james_mitchell@acm.org>)
-" $Id: cobol.vim,v 1.2 2007/05/05 18:23:43 vimboss Exp $
+"               James Mitchell <james_mitchell@acm.org>)
+" Last Change:  2015 Feb 13
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -145,7 +145,7 @@ syn match   cobolString       /'[^']*\('\|$\)/
 syn match   cobolIndicator   "\%7c[D-]" contained
 
 if exists("cobol_legacy_code")
-  syn region  cobolCondFlow     contains=ALLBUT,cobolLine start="\<\(IF\|INVALID\|END\|EOP\)\>" skip=/\('\|"\)[^"]\{-}\("\|'\|$\)/ end="\." keepend
+  syn region  cobolCondFlow     contains=ALLBUT,cobolLine,cobolBadLine start="\<\(IF\|INVALID\|END\|EOP\)\>" skip=/\('\|"\)[^"]\{-}\("\|'\|$\)/ end="\." keepend
 endif
 
 " many legacy sources have junk in columns 1-6: must be before others
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index 6fd46aaa54..35b09341a6 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -2,7 +2,7 @@
 " Language:	Makefile
 " Maintainer:	Claudio Fleiner <claudio@fleiner.com>
 " URL:		http://www.fleiner.com/vim/syntax/make.vim
-" Last Change:	2012 Oct 05
+" Last Change:	2015 Feb 28
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -43,8 +43,8 @@ syn region makeIdent	start="\$(" skip="\\)\|\\\\" end=")" contains=makeStatement
 syn region makeIdent	start="\${" skip="\\}\|\\\\" end="}" contains=makeStatement,makeIdent,makeSString,makeDString
 syn match makeIdent	"\$\$\w*"
 syn match makeIdent	"\$[^({]"
-syn match makeIdent	"^ *\a\w*\s*[:+?!*]="me=e-2
-syn match makeIdent	"^ *\a\w*\s*="me=e-1
+syn match makeIdent	"^ *[^:#= \t]*\s*[:+?!*]="me=e-2
+syn match makeIdent	"^ *[^:#= \t]*\s*="me=e-1
 syn match makeIdent	"%"
 
 " Makefile.in variables
@@ -55,11 +55,11 @@ syn match makeConfig "@[A-Za-z0-9_]\+@"
 syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:$"me=e-1 nextgroup=makeSource
 syn match makeImplicit		"^\.[A-Za-z0-9_./\t -]\+\s*:[^=]"me=e-2 nextgroup=makeSource
 
-syn region makeTarget	transparent matchgroup=makeTarget start="^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands
-syn match makeTarget		"^[A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget skipnl nextgroup=makeCommands,makeCommandError
+syn region makeTarget   transparent matchgroup=makeTarget start="^[~A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}[^:=]"rs=e-1 end=";"re=e-1,me=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
+syn match makeTarget		"^[~A-Za-z0-9_./$()%*@-][A-Za-z0-9_./\t $()%*@-]*::\=\s*$" contains=makeIdent,makeSpecTarget,makeComment skipnl nextgroup=makeCommands,makeCommandError
 
-syn region makeSpecTarget	transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine skipnl nextGroup=makeCommands
-syn match makeSpecTarget		"^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent skipnl nextgroup=makeCommands,makeCommandError
+syn region makeSpecTarget	transparent matchgroup=makeSpecTarget start="^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*:\{1,2}[^:=]"rs=e-1 end="[^\\]$" keepend contains=makeIdent,makeSpecTarget,makeNextLine,makeComment skipnl nextGroup=makeCommands
+syn match makeSpecTarget		"^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILENT\|EXPORT_ALL_VARIABLES\|KEEP_STATE\|LIBPATTERNS\|NOTPARALLEL\|DELETE_ON_ERROR\|INTERMEDIATE\|POSIX\|SECONDARY\)\>\s*::\=\s*$" contains=makeIdent,makeComment skipnl nextgroup=makeCommands,makeCommandError
 
 syn match makeCommandError "^\s\+\S.*" contained
 syn region makeCommands start=";"hs=s+1 start="^\t" end="^[^\t#]"me=e-1,re=e-1 end="^$" contained contains=makeCmdNextLine,makeSpecial,makeComment,makeIdent,makePreCondit,makeDefine,makeDString,makeSString nextgroup=makeCommandError
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
index a0904457a2..32ed6975c0 100644
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -1,11 +1,11 @@
 " Vim syntax file
 " Language:	Postfix main.cf configuration
 " Maintainer:	KELEMEN Peter <Peter dot Kelemen at cern dot ch>
-" Last Update:  Hong Xu
-" Last Change:	2011 May 14
+" Last Updates:	Anton Shestakov, Hong Xu
+" Last Change:	2015 Feb 10
 " Version:	0.40
 " URL:		http://cern.ch/fuji/vim/syntax/pfmain.vim
-" Comment:	Based on Postfix 2.9 defaults.
+" Comment:	Based on Postfix 2.12/3.0 postconf.5.html.
 
 if version < 600
 	syntax clear
@@ -41,6 +41,7 @@ syntax keyword pfmainConf address_verify_relayhost
 syntax keyword pfmainConf address_verify_sender
 syntax keyword pfmainConf address_verify_sender_dependent_default_transport_maps
 syntax keyword pfmainConf address_verify_sender_dependent_relayhost_maps
+syntax keyword pfmainConf address_verify_sender_ttl
 syntax keyword pfmainConf address_verify_service_name
 syntax keyword pfmainConf address_verify_transport_maps
 syntax keyword pfmainConf address_verify_virtual_transport
@@ -52,6 +53,7 @@ syntax keyword pfmainConf allow_min_user
 syntax keyword pfmainConf allow_percent_hack
 syntax keyword pfmainConf allow_untrusted_routing
 syntax keyword pfmainConf alternate_config_directories
+syntax keyword pfmainConf always_add_missing_headers
 syntax keyword pfmainConf always_bcc
 syntax keyword pfmainConf anvil_rate_time_unit
 syntax keyword pfmainConf anvil_status_update_time
@@ -61,6 +63,7 @@ syntax keyword pfmainConf application_event_drain_time
 syntax keyword pfmainConf authorized_flush_users
 syntax keyword pfmainConf authorized_mailq_users
 syntax keyword pfmainConf authorized_submit_users
+syntax keyword pfmainConf authorized_verp_clients
 syntax keyword pfmainConf backwards_bounce_logfile_compatibility
 syntax keyword pfmainConf berkeley_db_create_buffer_size
 syntax keyword pfmainConf berkeley_db_read_buffer_size
@@ -81,7 +84,9 @@ syntax keyword pfmainConf command_directory
 syntax keyword pfmainConf command_execution_directory
 syntax keyword pfmainConf command_expansion_filter
 syntax keyword pfmainConf command_time_limit
+syntax keyword pfmainConf compatibility_level
 syntax keyword pfmainConf config_directory
+syntax keyword pfmainConf confirm_delay_cleared
 syntax keyword pfmainConf connection_cache_protocol_timeout
 syntax keyword pfmainConf connection_cache_service_name
 syntax keyword pfmainConf connection_cache_status_update_time
@@ -89,14 +94,17 @@ syntax keyword pfmainConf connection_cache_ttl_limit
 syntax keyword pfmainConf content_filter
 syntax keyword pfmainConf cyrus_sasl_config_path
 syntax keyword pfmainConf daemon_directory
+syntax keyword pfmainConf daemon_table_open_error_is_fatal
 syntax keyword pfmainConf daemon_timeout
 syntax keyword pfmainConf data_directory
 syntax keyword pfmainConf debug_peer_level
 syntax keyword pfmainConf debug_peer_list
+syntax keyword pfmainConf debugger_command
 syntax keyword pfmainConf default_database_type
 syntax keyword pfmainConf default_delivery_slot_cost
 syntax keyword pfmainConf default_delivery_slot_discount
 syntax keyword pfmainConf default_delivery_slot_loan
+syntax keyword pfmainConf default_delivery_status_filter
 syntax keyword pfmainConf default_destination_concurrency_failed_cohort_limit
 syntax keyword pfmainConf default_destination_concurrency_limit
 syntax keyword pfmainConf default_destination_concurrency_negative_feedback
@@ -137,6 +145,7 @@ syntax keyword pfmainConf duplicate_filter_limit
 syntax keyword pfmainConf empty_address_default_transport_maps_lookup_key
 syntax keyword pfmainConf empty_address_recipient
 syntax keyword pfmainConf empty_address_relayhost_maps_lookup_key
+syntax keyword pfmainConf enable_errors_to
 syntax keyword pfmainConf enable_long_queue_ids
 syntax keyword pfmainConf enable_original_recipient
 syntax keyword pfmainConf error_notice_recipient
@@ -144,6 +153,8 @@ syntax keyword pfmainConf error_service_name
 syntax keyword pfmainConf execution_directory_expansion_filter
 syntax keyword pfmainConf expand_owner_alias
 syntax keyword pfmainConf export_environment
+syntax keyword pfmainConf extract_recipient_limit
+syntax keyword pfmainConf fallback_relay
 syntax keyword pfmainConf fallback_transport
 syntax keyword pfmainConf fallback_transport_maps
 syntax keyword pfmainConf fast_flush_domains
@@ -177,25 +188,33 @@ syntax keyword pfmainConf ipc_idle
 syntax keyword pfmainConf ipc_timeout
 syntax keyword pfmainConf ipc_ttl
 syntax keyword pfmainConf line_length_limit
+syntax keyword pfmainConf lmdb_map_size
 syntax keyword pfmainConf lmtp_address_preference
+syntax keyword pfmainConf lmtp_address_verify_target
+syntax keyword pfmainConf lmtp_assume_final
 syntax keyword pfmainConf lmtp_bind_address
 syntax keyword pfmainConf lmtp_bind_address6
 syntax keyword pfmainConf lmtp_body_checks
+syntax keyword pfmainConf lmtp_cache_connection
 syntax keyword pfmainConf lmtp_cname_overrides_servername
 syntax keyword pfmainConf lmtp_connect_timeout
 syntax keyword pfmainConf lmtp_connection_cache_destinations
 syntax keyword pfmainConf lmtp_connection_cache_on_demand
 syntax keyword pfmainConf lmtp_connection_cache_time_limit
+syntax keyword pfmainConf lmtp_connection_reuse_count_limit
 syntax keyword pfmainConf lmtp_connection_reuse_time_limit
 syntax keyword pfmainConf lmtp_data_done_timeout
 syntax keyword pfmainConf lmtp_data_init_timeout
 syntax keyword pfmainConf lmtp_data_xfer_timeout
 syntax keyword pfmainConf lmtp_defer_if_no_mx_address_found
+syntax keyword pfmainConf lmtp_delivery_status_filter
 syntax keyword pfmainConf lmtp_destination_concurrency_limit
 syntax keyword pfmainConf lmtp_destination_recipient_limit
 syntax keyword pfmainConf lmtp_discard_lhlo_keyword_address_maps
 syntax keyword pfmainConf lmtp_discard_lhlo_keywords
+syntax keyword pfmainConf lmtp_dns_reply_filter
 syntax keyword pfmainConf lmtp_dns_resolver_options
+syntax keyword pfmainConf lmtp_dns_support_level
 syntax keyword pfmainConf lmtp_enforce_tls
 syntax keyword pfmainConf lmtp_generic_maps
 syntax keyword pfmainConf lmtp_header_checks
@@ -230,9 +249,11 @@ syntax keyword pfmainConf lmtp_sasl_security_options
 syntax keyword pfmainConf lmtp_sasl_tls_security_options
 syntax keyword pfmainConf lmtp_sasl_tls_verified_security_options
 syntax keyword pfmainConf lmtp_sasl_type
+syntax keyword pfmainConf lmtp_send_dummy_mail_auth
 syntax keyword pfmainConf lmtp_send_xforward_command
 syntax keyword pfmainConf lmtp_sender_dependent_authentication
 syntax keyword pfmainConf lmtp_skip_5xx_greeting
+syntax keyword pfmainConf lmtp_skip_quit_response
 syntax keyword pfmainConf lmtp_starttls_timeout
 syntax keyword pfmainConf lmtp_tcp_port
 syntax keyword pfmainConf lmtp_tls_CAfile
@@ -248,6 +269,7 @@ syntax keyword pfmainConf lmtp_tls_enforce_peername
 syntax keyword pfmainConf lmtp_tls_exclude_ciphers
 syntax keyword pfmainConf lmtp_tls_fingerprint_cert_match
 syntax keyword pfmainConf lmtp_tls_fingerprint_digest
+syntax keyword pfmainConf lmtp_tls_force_insecure_host_tlsa_lookup
 syntax keyword pfmainConf lmtp_tls_key_file
 syntax keyword pfmainConf lmtp_tls_loglevel
 syntax keyword pfmainConf lmtp_tls_mandatory_ciphers
@@ -262,10 +284,12 @@ syntax keyword pfmainConf lmtp_tls_secure_cert_match
 syntax keyword pfmainConf lmtp_tls_security_level
 syntax keyword pfmainConf lmtp_tls_session_cache_database
 syntax keyword pfmainConf lmtp_tls_session_cache_timeout
+syntax keyword pfmainConf lmtp_tls_trust_anchor_file
 syntax keyword pfmainConf lmtp_tls_verify_cert_match
 syntax keyword pfmainConf lmtp_use_tls
 syntax keyword pfmainConf lmtp_xforward_timeout
 syntax keyword pfmainConf local_command_shell
+syntax keyword pfmainConf local_delivery_status_filter
 syntax keyword pfmainConf local_destination_concurrency_limit
 syntax keyword pfmainConf local_destination_recipient_limit
 syntax keyword pfmainConf local_header_rewrite_clients
@@ -287,17 +311,19 @@ syntax keyword pfmainConf mailq_path
 syntax keyword pfmainConf manpage_directory
 syntax keyword pfmainConf maps_rbl_domains
 syntax keyword pfmainConf maps_rbl_reject_code
-syntax keyword pfmainConf master_service_disable
 syntax keyword pfmainConf masquerade_classes
 syntax keyword pfmainConf masquerade_domains
 syntax keyword pfmainConf masquerade_exceptions
+syntax keyword pfmainConf master_service_disable
 syntax keyword pfmainConf max_idle
 syntax keyword pfmainConf max_use
 syntax keyword pfmainConf maximal_backoff_time
 syntax keyword pfmainConf maximal_queue_lifetime
+syntax keyword pfmainConf message_drop_headers
 syntax keyword pfmainConf message_reject_characters
 syntax keyword pfmainConf message_size_limit
 syntax keyword pfmainConf message_strip_characters
+syntax keyword pfmainConf meta_directory
 syntax keyword pfmainConf milter_command_timeout
 syntax keyword pfmainConf milter_connect_macros
 syntax keyword pfmainConf milter_connect_timeout
@@ -335,10 +361,12 @@ syntax keyword pfmainConf newaliases_path
 syntax keyword pfmainConf non_fqdn_reject_code
 syntax keyword pfmainConf non_smtpd_milters
 syntax keyword pfmainConf notify_classes
+syntax keyword pfmainConf nullmx_reject_code
 syntax keyword pfmainConf owner_request_special
 syntax keyword pfmainConf parent_domain_matches_subdomains
 syntax keyword pfmainConf permit_mx_backup_networks
 syntax keyword pfmainConf pickup_service_name
+syntax keyword pfmainConf pipe_delivery_status_filter
 syntax keyword pfmainConf plaintext_reject_code
 syntax keyword pfmainConf postmulti_control_commands
 syntax keyword pfmainConf postmulti_start_commands
@@ -362,7 +390,9 @@ syntax keyword pfmainConf postscreen_dnsbl_action
 syntax keyword pfmainConf postscreen_dnsbl_reply_map
 syntax keyword pfmainConf postscreen_dnsbl_sites
 syntax keyword pfmainConf postscreen_dnsbl_threshold
+syntax keyword pfmainConf postscreen_dnsbl_timeout
 syntax keyword pfmainConf postscreen_dnsbl_ttl
+syntax keyword pfmainConf postscreen_dnsbl_whitelist_threshold
 syntax keyword pfmainConf postscreen_enforce_tls
 syntax keyword pfmainConf postscreen_expansion_filter
 syntax keyword pfmainConf postscreen_forbidden_commands
@@ -381,6 +411,8 @@ syntax keyword pfmainConf postscreen_post_queue_limit
 syntax keyword pfmainConf postscreen_pre_queue_limit
 syntax keyword pfmainConf postscreen_reject_footer
 syntax keyword pfmainConf postscreen_tls_security_level
+syntax keyword pfmainConf postscreen_upstream_proxy_protocol
+syntax keyword pfmainConf postscreen_upstream_proxy_timeout
 syntax keyword pfmainConf postscreen_use_tls
 syntax keyword pfmainConf postscreen_watchdog_timeout
 syntax keyword pfmainConf postscreen_whitelist_interfaces
@@ -395,7 +427,9 @@ syntax keyword pfmainConf proxy_write_maps
 syntax keyword pfmainConf proxymap_service_name
 syntax keyword pfmainConf proxywrite_service_name
 syntax keyword pfmainConf qmgr_clog_warn_time
+syntax keyword pfmainConf qmgr_daemon_timeout
 syntax keyword pfmainConf qmgr_fudge_factor
+syntax keyword pfmainConf qmgr_ipc_timeout
 syntax keyword pfmainConf qmgr_message_active_limit
 syntax keyword pfmainConf qmgr_message_recipient_limit
 syntax keyword pfmainConf qmgr_message_recipient_minimum
@@ -435,17 +469,21 @@ syntax keyword pfmainConf resolve_numeric_domain
 syntax keyword pfmainConf rewrite_service_name
 syntax keyword pfmainConf sample_directory
 syntax keyword pfmainConf send_cyrus_sasl_authzid
+syntax keyword pfmainConf sender_based_routing
 syntax keyword pfmainConf sender_bcc_maps
 syntax keyword pfmainConf sender_canonical_classes
 syntax keyword pfmainConf sender_canonical_maps
 syntax keyword pfmainConf sender_dependent_default_transport_maps
 syntax keyword pfmainConf sender_dependent_relayhost_maps
+syntax keyword pfmainConf sendmail_fix_line_endings
 syntax keyword pfmainConf sendmail_path
 syntax keyword pfmainConf service_throttle_time
 syntax keyword pfmainConf setgid_group
+syntax keyword pfmainConf shlib_directory
 syntax keyword pfmainConf show_user_unknown_table_name
 syntax keyword pfmainConf showq_service_name
 syntax keyword pfmainConf smtp_address_preference
+syntax keyword pfmainConf smtp_address_verify_target
 syntax keyword pfmainConf smtp_always_send_ehlo
 syntax keyword pfmainConf smtp_bind_address
 syntax keyword pfmainConf smtp_bind_address6
@@ -455,16 +493,20 @@ syntax keyword pfmainConf smtp_connect_timeout
 syntax keyword pfmainConf smtp_connection_cache_destinations
 syntax keyword pfmainConf smtp_connection_cache_on_demand
 syntax keyword pfmainConf smtp_connection_cache_time_limit
+syntax keyword pfmainConf smtp_connection_reuse_count_limit
 syntax keyword pfmainConf smtp_connection_reuse_time_limit
 syntax keyword pfmainConf smtp_data_done_timeout
 syntax keyword pfmainConf smtp_data_init_timeout
 syntax keyword pfmainConf smtp_data_xfer_timeout
 syntax keyword pfmainConf smtp_defer_if_no_mx_address_found
+syntax keyword pfmainConf smtp_delivery_status_filter
 syntax keyword pfmainConf smtp_destination_concurrency_limit
 syntax keyword pfmainConf smtp_destination_recipient_limit
 syntax keyword pfmainConf smtp_discard_ehlo_keyword_address_maps
 syntax keyword pfmainConf smtp_discard_ehlo_keywords
+syntax keyword pfmainConf smtp_dns_reply_filter
 syntax keyword pfmainConf smtp_dns_resolver_options
+syntax keyword pfmainConf smtp_dns_support_level
 syntax keyword pfmainConf smtp_enforce_tls
 syntax keyword pfmainConf smtp_fallback_relay
 syntax keyword pfmainConf smtp_generic_maps
@@ -479,6 +521,7 @@ syntax keyword pfmainConf smtp_mx_address_limit
 syntax keyword pfmainConf smtp_mx_session_limit
 syntax keyword pfmainConf smtp_nested_header_checks
 syntax keyword pfmainConf smtp_never_send_ehlo
+syntax keyword pfmainConf smtp_per_record_deadline
 syntax keyword pfmainConf smtp_pix_workaround_delay_time
 syntax keyword pfmainConf smtp_pix_workaround_maps
 syntax keyword pfmainConf smtp_pix_workaround_threshold_time
@@ -500,8 +543,10 @@ syntax keyword pfmainConf smtp_sasl_security_options
 syntax keyword pfmainConf smtp_sasl_tls_security_options
 syntax keyword pfmainConf smtp_sasl_tls_verified_security_options
 syntax keyword pfmainConf smtp_sasl_type
+syntax keyword pfmainConf smtp_send_dummy_mail_auth
 syntax keyword pfmainConf smtp_send_xforward_command
 syntax keyword pfmainConf smtp_sender_dependent_authentication
+syntax keyword pfmainConf smtp_skip_4xx_greeting
 syntax keyword pfmainConf smtp_skip_5xx_greeting
 syntax keyword pfmainConf smtp_skip_quit_response
 syntax keyword pfmainConf smtp_starttls_timeout
@@ -519,6 +564,7 @@ syntax keyword pfmainConf smtp_tls_enforce_peername
 syntax keyword pfmainConf smtp_tls_exclude_ciphers
 syntax keyword pfmainConf smtp_tls_fingerprint_cert_match
 syntax keyword pfmainConf smtp_tls_fingerprint_digest
+syntax keyword pfmainConf smtp_tls_force_insecure_host_tlsa_lookup
 syntax keyword pfmainConf smtp_tls_key_file
 syntax keyword pfmainConf smtp_tls_loglevel
 syntax keyword pfmainConf smtp_tls_mandatory_ciphers
@@ -533,7 +579,9 @@ syntax keyword pfmainConf smtp_tls_secure_cert_match
 syntax keyword pfmainConf smtp_tls_security_level
 syntax keyword pfmainConf smtp_tls_session_cache_database
 syntax keyword pfmainConf smtp_tls_session_cache_timeout
+syntax keyword pfmainConf smtp_tls_trust_anchor_file
 syntax keyword pfmainConf smtp_tls_verify_cert_match
+syntax keyword pfmainConf smtp_tls_wrappermode
 syntax keyword pfmainConf smtp_use_tls
 syntax keyword pfmainConf smtp_xforward_timeout
 syntax keyword pfmainConf smtpd_authorized_verp_clients
@@ -554,6 +602,7 @@ syntax keyword pfmainConf smtpd_delay_open_until_valid_rcpt
 syntax keyword pfmainConf smtpd_delay_reject
 syntax keyword pfmainConf smtpd_discard_ehlo_keyword_address_maps
 syntax keyword pfmainConf smtpd_discard_ehlo_keywords
+syntax keyword pfmainConf smtpd_dns_reply_filter
 syntax keyword pfmainConf smtpd_end_of_data_restrictions
 syntax keyword pfmainConf smtpd_enforce_tls
 syntax keyword pfmainConf smtpd_error_sleep_time
@@ -565,14 +614,19 @@ syntax keyword pfmainConf smtpd_helo_required
 syntax keyword pfmainConf smtpd_helo_restrictions
 syntax keyword pfmainConf smtpd_history_flush_threshold
 syntax keyword pfmainConf smtpd_junk_command_limit
+syntax keyword pfmainConf smtpd_log_access_permit_actions
 syntax keyword pfmainConf smtpd_milters
 syntax keyword pfmainConf smtpd_noop_commands
 syntax keyword pfmainConf smtpd_null_access_lookup_key
 syntax keyword pfmainConf smtpd_peername_lookup
 syntax keyword pfmainConf smtpd_per_record_deadline
+syntax keyword pfmainConf smtpd_policy_service_default_action
 syntax keyword pfmainConf smtpd_policy_service_max_idle
 syntax keyword pfmainConf smtpd_policy_service_max_ttl
+syntax keyword pfmainConf smtpd_policy_service_request_limit
+syntax keyword pfmainConf smtpd_policy_service_retry_delay
 syntax keyword pfmainConf smtpd_policy_service_timeout
+syntax keyword pfmainConf smtpd_policy_service_try_limit
 syntax keyword pfmainConf smtpd_proxy_ehlo
 syntax keyword pfmainConf smtpd_proxy_filter
 syntax keyword pfmainConf smtpd_proxy_options
@@ -583,13 +637,16 @@ syntax keyword pfmainConf smtpd_recipient_restrictions
 syntax keyword pfmainConf smtpd_reject_footer
 syntax keyword pfmainConf smtpd_reject_unlisted_recipient
 syntax keyword pfmainConf smtpd_reject_unlisted_sender
+syntax keyword pfmainConf smtpd_relay_restrictions
 syntax keyword pfmainConf smtpd_restriction_classes
+syntax keyword pfmainConf smtpd_sasl_application_name
 syntax keyword pfmainConf smtpd_sasl_auth_enable
 syntax keyword pfmainConf smtpd_sasl_authenticated_header
 syntax keyword pfmainConf smtpd_sasl_exceptions_networks
 syntax keyword pfmainConf smtpd_sasl_local_domain
 syntax keyword pfmainConf smtpd_sasl_path
 syntax keyword pfmainConf smtpd_sasl_security_options
+syntax keyword pfmainConf smtpd_sasl_service
 syntax keyword pfmainConf smtpd_sasl_tls_security_options
 syntax keyword pfmainConf smtpd_sasl_type
 syntax keyword pfmainConf smtpd_sender_login_maps
@@ -628,21 +685,21 @@ syntax keyword pfmainConf smtpd_tls_security_level
 syntax keyword pfmainConf smtpd_tls_session_cache_database
 syntax keyword pfmainConf smtpd_tls_session_cache_timeout
 syntax keyword pfmainConf smtpd_tls_wrappermode
+syntax keyword pfmainConf smtpd_upstream_proxy_protocol
+syntax keyword pfmainConf smtpd_upstream_proxy_timeout
 syntax keyword pfmainConf smtpd_use_tls
+syntax keyword pfmainConf smtputf8_autodetect_classes
+syntax keyword pfmainConf smtputf8_enable
 syntax keyword pfmainConf soft_bounce
 syntax keyword pfmainConf stale_lock_time
 syntax keyword pfmainConf stress
 syntax keyword pfmainConf strict_7bit_headers
 syntax keyword pfmainConf strict_8bitmime
 syntax keyword pfmainConf strict_8bitmime_body
-syntax keyword pfmainConf strict_mime_encoding_domain
-syntax keyword pfmainConf strict_rfc821_envelopes
-syntax keyword pfmainConf strict_7bit_headers
-syntax keyword pfmainConf strict_8bitmime
-syntax keyword pfmainConf strict_8bitmime_body
 syntax keyword pfmainConf strict_mailbox_ownership
 syntax keyword pfmainConf strict_mime_encoding_domain
 syntax keyword pfmainConf strict_rfc821_envelopes
+syntax keyword pfmainConf strict_smtputf8
 syntax keyword pfmainConf sun_mailtool_compatibility
 syntax keyword pfmainConf swap_bangpath
 syntax keyword pfmainConf syslog_facility
@@ -650,11 +707,15 @@ syntax keyword pfmainConf syslog_name
 syntax keyword pfmainConf tcp_windowsize
 syntax keyword pfmainConf tls_append_default_CA
 syntax keyword pfmainConf tls_daemon_random_bytes
+syntax keyword pfmainConf tls_dane_digest_agility
+syntax keyword pfmainConf tls_dane_digests
+syntax keyword pfmainConf tls_dane_trust_anchor_digest_enable
 syntax keyword pfmainConf tls_disable_workarounds
 syntax keyword pfmainConf tls_eecdh_strong_curve
 syntax keyword pfmainConf tls_eecdh_ultra_curve
 syntax keyword pfmainConf tls_export_cipherlist
 syntax keyword pfmainConf tls_high_cipherlist
+syntax keyword pfmainConf tls_legacy_public_key_fingerprints
 syntax keyword pfmainConf tls_low_cipherlist
 syntax keyword pfmainConf tls_medium_cipherlist
 syntax keyword pfmainConf tls_null_cipherlist
@@ -664,6 +725,10 @@ syntax keyword pfmainConf tls_random_exchange_name
 syntax keyword pfmainConf tls_random_prng_update_period
 syntax keyword pfmainConf tls_random_reseed_period
 syntax keyword pfmainConf tls_random_source
+syntax keyword pfmainConf tls_session_ticket_cipher
+syntax keyword pfmainConf tls_ssl_options
+syntax keyword pfmainConf tls_wildcard_matches_multiple_labels
+syntax keyword pfmainConf tlsmgr_service_name
 syntax keyword pfmainConf tlsproxy_enforce_tls
 syntax keyword pfmainConf tlsproxy_service_name
 syntax keyword pfmainConf tlsproxy_tls_CAfile
@@ -711,6 +776,7 @@ syntax keyword pfmainConf transport_recipient_limit
 syntax keyword pfmainConf transport_recipient_refill_delay
 syntax keyword pfmainConf transport_recipient_refill_limit
 syntax keyword pfmainConf transport_retry_time
+syntax keyword pfmainConf transport_time_limit
 syntax keyword pfmainConf trigger_timeout
 syntax keyword pfmainConf undisclosed_recipients_header
 syntax keyword pfmainConf unknown_address_reject_code
@@ -731,10 +797,12 @@ syntax keyword pfmainConf unverified_sender_reject_code
 syntax keyword pfmainConf unverified_sender_reject_reason
 syntax keyword pfmainConf unverified_sender_tempfail_action
 syntax keyword pfmainConf verp_delimiter_filter
+syntax keyword pfmainConf virtual_alias_address_length_limit
 syntax keyword pfmainConf virtual_alias_domains
 syntax keyword pfmainConf virtual_alias_expansion_limit
 syntax keyword pfmainConf virtual_alias_maps
 syntax keyword pfmainConf virtual_alias_recursion_limit
+syntax keyword pfmainConf virtual_delivery_status_filter
 syntax keyword pfmainConf virtual_destination_concurrency_limit
 syntax keyword pfmainConf virtual_destination_recipient_limit
 syntax keyword pfmainConf virtual_gid_maps
@@ -743,6 +811,7 @@ syntax keyword pfmainConf virtual_mailbox_domains
 syntax keyword pfmainConf virtual_mailbox_limit
 syntax keyword pfmainConf virtual_mailbox_lock
 syntax keyword pfmainConf virtual_mailbox_maps
+syntax keyword pfmainConf virtual_maps
 syntax keyword pfmainConf virtual_minimum_uid
 syntax keyword pfmainConf virtual_transport
 syntax keyword pfmainConf virtual_uid_maps
@@ -765,6 +834,7 @@ syntax match pfmainRef "$\<address_verify_relayhost\>"
 syntax match pfmainRef "$\<address_verify_sender\>"
 syntax match pfmainRef "$\<address_verify_sender_dependent_default_transport_maps\>"
 syntax match pfmainRef "$\<address_verify_sender_dependent_relayhost_maps\>"
+syntax match pfmainRef "$\<address_verify_sender_ttl\>"
 syntax match pfmainRef "$\<address_verify_service_name\>"
 syntax match pfmainRef "$\<address_verify_transport_maps\>"
 syntax match pfmainRef "$\<address_verify_virtual_transport\>"
@@ -776,6 +846,7 @@ syntax match pfmainRef "$\<allow_min_user\>"
 syntax match pfmainRef "$\<allow_percent_hack\>"
 syntax match pfmainRef "$\<allow_untrusted_routing\>"
 syntax match pfmainRef "$\<alternate_config_directories\>"
+syntax match pfmainRef "$\<always_add_missing_headers\>"
 syntax match pfmainRef "$\<always_bcc\>"
 syntax match pfmainRef "$\<anvil_rate_time_unit\>"
 syntax match pfmainRef "$\<anvil_status_update_time\>"
@@ -785,6 +856,7 @@ syntax match pfmainRef "$\<application_event_drain_time\>"
 syntax match pfmainRef "$\<authorized_flush_users\>"
 syntax match pfmainRef "$\<authorized_mailq_users\>"
 syntax match pfmainRef "$\<authorized_submit_users\>"
+syntax match pfmainRef "$\<authorized_verp_clients\>"
 syntax match pfmainRef "$\<backwards_bounce_logfile_compatibility\>"
 syntax match pfmainRef "$\<berkeley_db_create_buffer_size\>"
 syntax match pfmainRef "$\<berkeley_db_read_buffer_size\>"
@@ -805,7 +877,9 @@ syntax match pfmainRef "$\<command_directory\>"
 syntax match pfmainRef "$\<command_execution_directory\>"
 syntax match pfmainRef "$\<command_expansion_filter\>"
 syntax match pfmainRef "$\<command_time_limit\>"
+syntax match pfmainRef "$\<compatibility_level\>"
 syntax match pfmainRef "$\<config_directory\>"
+syntax match pfmainRef "$\<confirm_delay_cleared\>"
 syntax match pfmainRef "$\<connection_cache_protocol_timeout\>"
 syntax match pfmainRef "$\<connection_cache_service_name\>"
 syntax match pfmainRef "$\<connection_cache_status_update_time\>"
@@ -813,14 +887,17 @@ syntax match pfmainRef "$\<connection_cache_ttl_limit\>"
 syntax match pfmainRef "$\<content_filter\>"
 syntax match pfmainRef "$\<cyrus_sasl_config_path\>"
 syntax match pfmainRef "$\<daemon_directory\>"
+syntax match pfmainRef "$\<daemon_table_open_error_is_fatal\>"
 syntax match pfmainRef "$\<daemon_timeout\>"
 syntax match pfmainRef "$\<data_directory\>"
 syntax match pfmainRef "$\<debug_peer_level\>"
 syntax match pfmainRef "$\<debug_peer_list\>"
+syntax match pfmainRef "$\<debugger_command\>"
 syntax match pfmainRef "$\<default_database_type\>"
 syntax match pfmainRef "$\<default_delivery_slot_cost\>"
 syntax match pfmainRef "$\<default_delivery_slot_discount\>"
 syntax match pfmainRef "$\<default_delivery_slot_loan\>"
+syntax match pfmainRef "$\<default_delivery_status_filter\>"
 syntax match pfmainRef "$\<default_destination_concurrency_failed_cohort_limit\>"
 syntax match pfmainRef "$\<default_destination_concurrency_limit\>"
 syntax match pfmainRef "$\<default_destination_concurrency_negative_feedback\>"
@@ -861,6 +938,7 @@ syntax match pfmainRef "$\<duplicate_filter_limit\>"
 syntax match pfmainRef "$\<empty_address_default_transport_maps_lookup_key\>"
 syntax match pfmainRef "$\<empty_address_recipient\>"
 syntax match pfmainRef "$\<empty_address_relayhost_maps_lookup_key\>"
+syntax match pfmainRef "$\<enable_errors_to\>"
 syntax match pfmainRef "$\<enable_long_queue_ids\>"
 syntax match pfmainRef "$\<enable_original_recipient\>"
 syntax match pfmainRef "$\<error_notice_recipient\>"
@@ -868,6 +946,8 @@ syntax match pfmainRef "$\<error_service_name\>"
 syntax match pfmainRef "$\<execution_directory_expansion_filter\>"
 syntax match pfmainRef "$\<expand_owner_alias\>"
 syntax match pfmainRef "$\<export_environment\>"
+syntax match pfmainRef "$\<extract_recipient_limit\>"
+syntax match pfmainRef "$\<fallback_relay\>"
 syntax match pfmainRef "$\<fallback_transport\>"
 syntax match pfmainRef "$\<fallback_transport_maps\>"
 syntax match pfmainRef "$\<fast_flush_domains\>"
@@ -901,25 +981,33 @@ syntax match pfmainRef "$\<ipc_idle\>"
 syntax match pfmainRef "$\<ipc_timeout\>"
 syntax match pfmainRef "$\<ipc_ttl\>"
 syntax match pfmainRef "$\<line_length_limit\>"
+syntax match pfmainRef "$\<lmdb_map_size\>"
 syntax match pfmainRef "$\<lmtp_address_preference\>"
+syntax match pfmainRef "$\<lmtp_address_verify_target\>"
+syntax match pfmainRef "$\<lmtp_assume_final\>"
 syntax match pfmainRef "$\<lmtp_bind_address\>"
 syntax match pfmainRef "$\<lmtp_bind_address6\>"
 syntax match pfmainRef "$\<lmtp_body_checks\>"
+syntax match pfmainRef "$\<lmtp_cache_connection\>"
 syntax match pfmainRef "$\<lmtp_cname_overrides_servername\>"
 syntax match pfmainRef "$\<lmtp_connect_timeout\>"
 syntax match pfmainRef "$\<lmtp_connection_cache_destinations\>"
 syntax match pfmainRef "$\<lmtp_connection_cache_on_demand\>"
 syntax match pfmainRef "$\<lmtp_connection_cache_time_limit\>"
+syntax match pfmainRef "$\<lmtp_connection_reuse_count_limit\>"
 syntax match pfmainRef "$\<lmtp_connection_reuse_time_limit\>"
 syntax match pfmainRef "$\<lmtp_data_done_timeout\>"
 syntax match pfmainRef "$\<lmtp_data_init_timeout\>"
 syntax match pfmainRef "$\<lmtp_data_xfer_timeout\>"
 syntax match pfmainRef "$\<lmtp_defer_if_no_mx_address_found\>"
+syntax match pfmainRef "$\<lmtp_delivery_status_filter\>"
 syntax match pfmainRef "$\<lmtp_destination_concurrency_limit\>"
 syntax match pfmainRef "$\<lmtp_destination_recipient_limit\>"
 syntax match pfmainRef "$\<lmtp_discard_lhlo_keyword_address_maps\>"
 syntax match pfmainRef "$\<lmtp_discard_lhlo_keywords\>"
+syntax match pfmainRef "$\<lmtp_dns_reply_filter\>"
 syntax match pfmainRef "$\<lmtp_dns_resolver_options\>"
+syntax match pfmainRef "$\<lmtp_dns_support_level\>"
 syntax match pfmainRef "$\<lmtp_enforce_tls\>"
 syntax match pfmainRef "$\<lmtp_generic_maps\>"
 syntax match pfmainRef "$\<lmtp_header_checks\>"
@@ -954,9 +1042,11 @@ syntax match pfmainRef "$\<lmtp_sasl_security_options\>"
 syntax match pfmainRef "$\<lmtp_sasl_tls_security_options\>"
 syntax match pfmainRef "$\<lmtp_sasl_tls_verified_security_options\>"
 syntax match pfmainRef "$\<lmtp_sasl_type\>"
+syntax match pfmainRef "$\<lmtp_send_dummy_mail_auth\>"
 syntax match pfmainRef "$\<lmtp_send_xforward_command\>"
 syntax match pfmainRef "$\<lmtp_sender_dependent_authentication\>"
 syntax match pfmainRef "$\<lmtp_skip_5xx_greeting\>"
+syntax match pfmainRef "$\<lmtp_skip_quit_response\>"
 syntax match pfmainRef "$\<lmtp_starttls_timeout\>"
 syntax match pfmainRef "$\<lmtp_tcp_port\>"
 syntax match pfmainRef "$\<lmtp_tls_CAfile\>"
@@ -972,6 +1062,7 @@ syntax match pfmainRef "$\<lmtp_tls_enforce_peername\>"
 syntax match pfmainRef "$\<lmtp_tls_exclude_ciphers\>"
 syntax match pfmainRef "$\<lmtp_tls_fingerprint_cert_match\>"
 syntax match pfmainRef "$\<lmtp_tls_fingerprint_digest\>"
+syntax match pfmainRef "$\<lmtp_tls_force_insecure_host_tlsa_lookup\>"
 syntax match pfmainRef "$\<lmtp_tls_key_file\>"
 syntax match pfmainRef "$\<lmtp_tls_loglevel\>"
 syntax match pfmainRef "$\<lmtp_tls_mandatory_ciphers\>"
@@ -982,11 +1073,16 @@ syntax match pfmainRef "$\<lmtp_tls_per_site\>"
 syntax match pfmainRef "$\<lmtp_tls_policy_maps\>"
 syntax match pfmainRef "$\<lmtp_tls_protocols\>"
 syntax match pfmainRef "$\<lmtp_tls_scert_verifydepth\>"
+syntax match pfmainRef "$\<lmtp_tls_secure_cert_match\>"
+syntax match pfmainRef "$\<lmtp_tls_security_level\>"
+syntax match pfmainRef "$\<lmtp_tls_session_cache_database\>"
 syntax match pfmainRef "$\<lmtp_tls_session_cache_timeout\>"
+syntax match pfmainRef "$\<lmtp_tls_trust_anchor_file\>"
 syntax match pfmainRef "$\<lmtp_tls_verify_cert_match\>"
 syntax match pfmainRef "$\<lmtp_use_tls\>"
 syntax match pfmainRef "$\<lmtp_xforward_timeout\>"
 syntax match pfmainRef "$\<local_command_shell\>"
+syntax match pfmainRef "$\<local_delivery_status_filter\>"
 syntax match pfmainRef "$\<local_destination_concurrency_limit\>"
 syntax match pfmainRef "$\<local_destination_recipient_limit\>"
 syntax match pfmainRef "$\<local_header_rewrite_clients\>"
@@ -1008,17 +1104,19 @@ syntax match pfmainRef "$\<mailq_path\>"
 syntax match pfmainRef "$\<manpage_directory\>"
 syntax match pfmainRef "$\<maps_rbl_domains\>"
 syntax match pfmainRef "$\<maps_rbl_reject_code\>"
-syntax match pfmainRef "$\<master_service_disable\>"
 syntax match pfmainRef "$\<masquerade_classes\>"
 syntax match pfmainRef "$\<masquerade_domains\>"
 syntax match pfmainRef "$\<masquerade_exceptions\>"
+syntax match pfmainRef "$\<master_service_disable\>"
 syntax match pfmainRef "$\<max_idle\>"
 syntax match pfmainRef "$\<max_use\>"
 syntax match pfmainRef "$\<maximal_backoff_time\>"
 syntax match pfmainRef "$\<maximal_queue_lifetime\>"
+syntax match pfmainRef "$\<message_drop_headers\>"
 syntax match pfmainRef "$\<message_reject_characters\>"
 syntax match pfmainRef "$\<message_size_limit\>"
 syntax match pfmainRef "$\<message_strip_characters\>"
+syntax match pfmainRef "$\<meta_directory\>"
 syntax match pfmainRef "$\<milter_command_timeout\>"
 syntax match pfmainRef "$\<milter_connect_macros\>"
 syntax match pfmainRef "$\<milter_connect_timeout\>"
@@ -1056,10 +1154,12 @@ syntax match pfmainRef "$\<newaliases_path\>"
 syntax match pfmainRef "$\<non_fqdn_reject_code\>"
 syntax match pfmainRef "$\<non_smtpd_milters\>"
 syntax match pfmainRef "$\<notify_classes\>"
+syntax match pfmainRef "$\<nullmx_reject_code\>"
 syntax match pfmainRef "$\