Skip to content

Commit 47081b1

Browse files
committed
fix for using fallback interface and wrong results for non TLS installation
Many thanks to Antonio for flagging this and provide insights
1 parent 84cd103 commit 47081b1

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

‎packages/acs-tcl/tcl/security-procs.tcl‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2652,15 +2652,20 @@ ad_proc -public security::driver {} {
26522652
}
26532653
}
26542654
}
2655+
# if we can use the "ns_driver info" interface, and no sdriver
2656+
# is found - there is no secure driver. No need to fall back
2657+
# to the legacy code interface.
2658+
return $::acs::sdriver
2659+
26552660
} on error {errorMsg} {
26562661
ns_log warning "Probably use of version of NaviServer before 4.99.15: $errorMsg"
26572662
}
26582663
if {$::acs::sdriver eq ""} {
26592664
#
2660-
# fallback to legacy code
2665+
# fallback for old NaviServer instances
26612666
#
26622667
set server_modules [ad_server_modules]
2663-
foreach driver {nsssl nsssl_v4 nsssl_v6 nsopenssl nsssle http https} {
2668+
foreach driver {nsssl nsssl_v4 nsssl_v6 nsopenssl nsssle https} {
26642669
if {$driver ni $server_modules} continue
26652670
set ::acs::sdriver $driver
26662671
break

0 commit comments

Comments
 (0)