summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-07-31 21:25:45 +0200
committerMichael Tänzer <neo@nhng.de>2013-07-31 21:25:45 +0200
commit2116db1d1656ddc28c3002acc8bee0f905e5a0a7 (patch)
treeebbbbe91a38e11db7ef1291d24ecddb42debef39
parentea42d51aed5a3e3ec0e2a0d38983c24665a1d6d5 (diff)
downloadcacert-devel-2116db1d1656ddc28c3002acc8bee0f905e5a0a7.tar.gz
cacert-devel-2116db1d1656ddc28c3002acc8bee0f905e5a0a7.tar.xz
cacert-devel-2116db1d1656ddc28c3002acc8bee0f905e5a0a7.zip
bug 893: Also add the check for the revocation date to the non-CCA version
of check_*_cert_running() Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--includes/notary.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 3de0b09..63aa40e 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -969,7 +969,7 @@
// called from includes/account.php if($oldid == 50 && $process != "")
$uid = intval($uid);
if (0==$cca) {
- $query1 = "select 1 from `emailcerts` where `memid`='$uid' and `expire`>NOW()";
+ $query1 = "select 1 from `emailcerts` where `memid`='$uid' and `expire`>NOW() and `revoked`<`created`";
$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) and `revoked`<`created`";
@@ -987,7 +987,7 @@
// called from includes/account.php if($oldid == 50 && $process != "")
$uid = intval($uid);
if (0==$cca) {
- $query1 = "select 1 from `domaincerts` where `memid`='$uid' and `expire`>NOW()";
+ $query1 = "select 1 from `domaincerts` where `memid`='$uid' and `expire`>NOW() and `revoked`<`created`";
$query2 = "select 1 from `domaincerts` where `memid`='$uid' and `revoked`>NOW()";
}else{
$query1 = "select 1 from `domaincerts` where `memid`='$uid' and `expire`>(NOW()-90*86400) and `revoked`<`created`";