diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-05-06 18:53:34 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-06-04 14:57:03 +0100 |
| commit | 613dd4aed0ae1d1165f89a3d6819e51a033fcfb6 (patch) | |
| tree | 13cae2b5e2efe0e285a3c4b3039a48bee5cde6e4 /src | |
| parent | 193e3acd2723abeaaad8575fec3c058df674fc5d (diff) | |
Fix tls variables order, and testsuite case 5401 (cutthrough) for changes that went in with dual-tls.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/expand.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/src/expand.c b/src/src/expand.c index f3bd3f162..1642c67b7 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -616,10 +616,6 @@ static var_entry var_table[] = { { "tls_bits", vtype_int, &tls_in.bits }, { "tls_certificate_verified", vtype_int, &tls_in.certificate_verified }, { "tls_cipher", vtype_stringptr, &tls_in.cipher }, - { "tls_peerdn", vtype_stringptr, &tls_in.peerdn }, -#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS) - { "tls_sni", vtype_stringptr, &tls_in.sni }, -#endif { "tls_out_bits", vtype_int, &tls_out.bits }, { "tls_out_certificate_verified", vtype_int,&tls_out.certificate_verified }, { "tls_out_cipher", vtype_stringptr, &tls_out.cipher }, @@ -627,6 +623,10 @@ static var_entry var_table[] = { #if defined(SUPPORT_TLS) && !defined(USE_GNUTLS) { "tls_out_sni", vtype_stringptr, &tls_out.sni }, #endif + { "tls_peerdn", vtype_stringptr, &tls_in.peerdn }, /* mind the alphabetical order! */ +#if defined(SUPPORT_TLS) && !defined(USE_GNUTLS) + { "tls_sni", vtype_stringptr, &tls_in.sni }, /* mind the alphabetical order! */ +#endif { "tod_bsdinbox", vtype_todbsdin, NULL }, { "tod_epoch", vtype_tode, NULL }, |