Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -r1.29 -r1.30
--- openacs-4/packages/acs-subsite/lib/login.tcl	29 Aug 2008 17:21:40 -0000	1.29
+++ openacs-4/packages/acs-subsite/lib/login.tcl	6 Sep 2008 04:00:56 -0000	1.30
@@ -67,11 +67,14 @@
 
 set subsite_url [subsite::get_element -element url]
 set system_name [ad_system_name]
-
+ns_log Notice "acs_subsite/lib/login.tcl [subsite::get_url -absolute_p 1 -protocol http] [subsite::get_url -absolute_p 1 -protocol https]"
+ns_log Notice "acs_subsite/lib/login.tcl [security::get_secure_location] [security::get_insecure_location]"
+ns_log Notice "acs_subsite/lib/login.tcl [security::get_secure_qualified_url $return_url] [security::get_insecure_qualified_url $return_url]"
+ns_log Notice "acs_subsite/lib/login.tcl [lindex [security::locations] 0] [lindex [security::locations] 1]"
 if { [exists_and_not_null return_url] } {
     if {[util_complete_url_p $return_url] 
-	&& ![string match "[string trimright [subsite::get_url -absolute_p 1 -protocol http] /]/*" $return_url] 
-	&& ![string match "[string trimright [subsite::get_url -absolute_p 1 -protocol https] /]/*" $return_url]} {
+        && ![string match "[lindex [security::locations] 0]/*" $return_url] 
+	&& ![string match "[lindex [security::locations] 1]/*" $return_url]} {
       ad_returnredirect -message "only urls without a host name are permitted" "."
       ad_script_abort
     }