Propagate more error codes internally

[users/heiko/exim.git] / test / confs / 2102

diff --git a/test/confs/2102 b/test/confs/2102
index 6f29298b1cb7b7aabc0a01a89761f0a567f87994..38441e9d650e4d52af93ab13f56aaa5241e1ba8a 100644 (file)
--- a/test/confs/2102
+++ b/test/confs/2102
@@ -3,11 +3,11 @@
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+timezone = UTC

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -36,6 +36,7 @@ check_recipient:
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA : \
                       AES256-GCM-SHA384 : \
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA : \
                       AES256-GCM-SHA384 : \

+                      AES128-GCM-SHA256 : \

                       IDEA-CBC-MD5 : \
                       DES-CBC3-SHA : \
                      DHE-RSA-AES256-SHA : \
                       IDEA-CBC-MD5 : \
                       DES-CBC3-SHA : \
                      DHE-RSA-AES256-SHA : \


@@ -52,15 +53,19 @@ check_recipient:
          logwrite =  SR  <${certextract {serial_number}{$tls_in_peercert}}>
          logwrite =  SN  <${certextract {subject}      {$tls_in_peercert}}>
           logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>
          logwrite =  SR  <${certextract {serial_number}{$tls_in_peercert}}>
          logwrite =  SN  <${certextract {subject}      {$tls_in_peercert}}>
           logwrite =  IN  <${certextract {issuer}      {$tls_in_peercert}}>

-          logwrite =  NB  <${certextract {notbefore}   {$tls_in_peercert}}>
+          logwrite =  IN/O <${certextract {issuer,O}   {$tls_in_peercert}}>
+          logwrite =  NB/r <${certextract {notbefore,raw}      {$tls_in_peercert}}>
+          logwrite =  NB   <${certextract {notbefore}  {$tls_in_peercert}}>
+          logwrite =  NB/i <${certextract {notbefore,int}{$tls_in_peercert}}>

           logwrite =  NA  <${certextract {notafter}    {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>
          logwrite =       ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}}
          logwrite =       ${certextract {ocsp_uri}     {$tls_in_peercert} {OCU <$value>}{(no OCU)}}
          logwrite =       ${certextract {crl_uri}      {$tls_in_peercert} {CRU <$value>}{(no CRU)}}
           logwrite =  NA  <${certextract {notafter}    {$tls_in_peercert}}>
           logwrite =  SA  <${certextract {sig_algorithm}{$tls_in_peercert}}>
           logwrite =  SG  <${certextract {signature}   {$tls_in_peercert}}>
          logwrite =       ${certextract {subj_altname} {$tls_in_peercert} {SAN <$value>}{(no SAN)}}
          logwrite =       ${certextract {ocsp_uri}     {$tls_in_peercert} {OCU <$value>}{(no OCU)}}
          logwrite =       ${certextract {crl_uri}      {$tls_in_peercert} {CRU <$value>}{(no CRU)}}

-         logwrite =  md5 fingerprint ${md5:$tls_in_peercert}
-         logwrite =  sha1 fingerprint ${sha1:$tls_in_peercert}
+         logwrite =  md5    fingerprint ${md5:$tls_in_peercert}
+         logwrite =  sha1   fingerprint ${sha1:$tls_in_peercert}
+         logwrite =  sha256 fingerprint ${sha256:$tls_in_peercert}

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----