Index: openacs-4/packages/acs-tcl/tcl/security-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/security-procs.tcl,v diff -u -r1.135 -r1.136 --- openacs-4/packages/acs-tcl/tcl/security-procs.tcl 11 Jun 2025 09:36:10 -0000 1.135 +++ openacs-4/packages/acs-tcl/tcl/security-procs.tcl 12 Jun 2025 17:05:14 -0000 1.136 @@ -2639,37 +2639,37 @@ return $::acs::sdriver } set ::acs::sdriver "" - + # # Get the drivers registered for nsd (this requires at least NaviServer 4.99.15, Jan 2017) + # try { foreach driver_info [ns_driver info] { if {[dict get $driver_info type] eq "nsssl"} { # check, if the current server is using this driver set serversSection [ns_configsection ns/module/[dict get $driver_info module]/servers] if {$serversSection ne "" && [ns_info server] in [ns_set keys $serversSection]} { set ::acs::sdriver [dict get $driver_info module] - return $::acs::sdriver + break } } } - # if we can use the "ns_driver info" interface, and no sdriver - # is found - there is no secure driver. No need to fall back - # to the legacy code interface. + # + # If we can use the "ns_driver info" interface, return the + # potentially found secure driver. + # return $::acs::sdriver } on error {errorMsg} { ns_log warning "Probably use of version of NaviServer before 4.99.15: $errorMsg" } - if {$::acs::sdriver eq ""} { - # - # fallback for old NaviServer instances - # - set server_modules [ad_server_modules] - foreach driver {nsssl nsssl_v4 nsssl_v6 nsopenssl nsssle https} { - if {$driver ni $server_modules} continue - set ::acs::sdriver $driver - break - } + # + # Fallback for old NaviServer instances + # + set server_modules [ad_server_modules] + foreach driver {nsssl nsssl_v4 nsssl_v6 nsopenssl nsssle https} { + if {$driver ni $server_modules} continue + set ::acs::sdriver $driver + break } return $::acs::sdriver }