[continued from previous message]

! const char * tls_config = "default-tls-version";

if (! StreamOK(sizeof (struct stream_type))) {
DPRINT(Debug,1,(&Debug,
***************
*** 135,156 ****
"Bad option storage",0);
}

! if (0 != (service_config->value->flags & TLS_starttls))
! tls = service_config->value->v_starttls;
! else if (0 != (service_config->value->flags & TLS_tls))
! tls = service_config->value->v_tls;

if (tls_none == tls) {
DPRINT(Debug,4,(&Debug,
"tls:pop_STLS_handler: tls disabled\n"));
goto fail;
! }
!
!
!
}

!

if (!commands->push_command(folder,"STLS",1)) {
commands->clear_command(folder);
--- 138,179 ----
"Bad option storage",0);
}

! if (0 != (service_config->value->flags & TLS_starttls)) {
! tls = service_config->value->v_starttls;
! tls_config = "tls:starttls-version";
! } else if (0 != (service_config->value->flags & TLS_tls)) {
! tls = service_config->value->v_tls;
! tls_config = "tls:tls-version";
! }

if (tls_none == tls) {
DPRINT(Debug,4,(&Debug,
"tls:pop_STLS_handler: tls disabled\n"));
goto fail;
! }
! } else {
! DPRINT(Debug,10,(&Debug,
! "tls:pop_STLS_handler: no mail services config\n"));
! }
!
! DPRINT(Debug,4,(&Debug,
! "tls:pop_STLS_handler: version %d",tls));
! switch(tls) {
! case tls_none: DPRINT(Debug,4,(&Debug, " tls_none")); break;
! case v_ssl: DPRINT(Debug,4,(&Debug, " v_ssl")); break;
! case v_tls: DPRINT(Debug,4,(&Debug, " v_tls")); break;
! case v_tls1: DPRINT(Debug,4,(&Debug, " v_tls1")); break;
!