summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-01 14:19:27 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-01 14:19:27 +0200
commit1a7d202759159a1f4f3df337832f770e70e26633 (patch)
tree9b667dc3581827a3a4991a3e994a18f44f746487 /includes
parent1268591f7fe8654d8f307aca1505a7c9417ae4ee (diff)
parent35f0ad04e490537d9dfcb8825acba2cfe1b82643 (diff)
downloadcacert-devel-1a7d202759159a1f4f3df337832f770e70e26633.tar.gz
cacert-devel-1a7d202759159a1f4f3df337832f770e70e26633.tar.xz
cacert-devel-1a7d202759159a1f4f3df337832f770e70e26633.zip
Merge branch 'bug-893' into testserver-stable
Diffstat (limited to 'includes')
-rw-r--r--includes/temp_functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/temp_functions.php b/includes/temp_functions.php
index 37525b0..fb73587 100644
--- a/includes/temp_functions.php
+++ b/includes/temp_functions.php
@@ -162,7 +162,7 @@ function check_client_cert_running($uid,$cca=0){
$query1 = "select 1 from `emailcerts` where `memid`='$uid' and `expire`>NOW()";
$query2 = "select 1 from `emailcerts` where `memid`='$uid' and `revoked`>NOW()";
}else{
- $query1 = "select 1 from `emailcerts` where `memid`='$uid' and `expire`>(NOW()-90*86400)";
+ $query1 = "select 1 from `emailcerts` where `memid`='$uid' and `expire`>(NOW()-90*86400) and `revoked`<`created`";
$query2 = "select 1 from `emailcerts` where `memid`='$uid' and `revoked`>(NOW()-90*86400)";
}
$res = mysql_query($query1);
@@ -180,7 +180,7 @@ function check_server_cert_running($uid,$cca=0){
$query1 = "select 1 from `domiancerts` where `memid`='$uid' and `expire`>NOW()";
$query2 = "select 1 from `domiancerts` where `memid`='$uid' and `revoked`>NOW()";
}else{
- $query1 = "select 1 from `domiancerts` where `memid`='$uid' and `expire`>(NOW()-90*86400)";
+ $query1 = "select 1 from `domiancerts` where `memid`='$uid' and `expire`>(NOW()-90*86400) and `revoked`<`created`";
$query2 = "select 1 from `domiancerts` where `memid`='$uid' and `revoked`>(NOW()-90*86400)";
}
$res = mysql_query($query1);