etc/profile.d/ldap.sh

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index 318e1e296d4d24be6c8e44d5d1290595883813fd..b5f957d68e06ac44f9f8d7f95dcd1107edd92d29 100644 (file)
--- a/etc/profile.d/ldap.sh
+++ b/etc/profile.d/ldap.sh
@@ -122,7 +122,7 @@ ldap_gup() {
       pass=${rec[0]}
       rec=("${rec[@]:1}") # shift
       for field in ${rec[@]}; do
-        echo $group $field $pass
+        echo $group $field:$pass
       done
     done
 

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index e267fd94a46856529ca288a2512bbedd3e4477fc..666a1697c9bc24bf568e7709f0b15b3333d76181 100644 (file)
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -855,7 +855,8 @@ function dbq_logout(referrer='') {
   http.open("GET", url, true, '\\0', 'password');
   http.onload = function() {
     if (!this.status || this.readyState != 4) return;
-    if (referrer) document.location = referrer;
+    if (referrer) { document.location = referrer; return; }
+    document.location = '/';
   };
   http.send();
 

diff --git a/www/dbq/etc/nginx.conf b/www/dbq/etc/nginx.conf
index 8c79a80f526654e6357733d1a979fd0bf5558ca9..b17427d2ff006bf05d5272c82368c3588aabc594 100644 (file)
--- a/www/dbq/etc/nginx.conf
+++ b/www/dbq/etc/nginx.conf
@@ -18,7 +18,7 @@ location ~ /\.ht { deny all; }
 #--------------------------------------------------------------#
 # All to index.php
 location @dbq {
-    try_files /index.php?$query_string =404;
+    try_files $uri /index.php?$query_string;
 }
 
 #--------------------------------------------------------------#