diff options
| author | INOPIAE <inopiae@cacert.org> | 2013-05-01 14:02:58 +0200 |
|---|---|---|
| committer | INOPIAE <inopiae@cacert.org> | 2013-05-01 14:02:58 +0200 |
| commit | 35f0ad04e490537d9dfcb8825acba2cfe1b82643 (patch) | |
| tree | 88c831ae732410959dbea61a0740facf30ac18ad | |
| parent | 27c8a1c6ffafda639754bcd9fda7b462117f7771 (diff) | |
| download | cacert-devel-35f0ad04e490537d9dfcb8825acba2cfe1b82643.tar.gz cacert-devel-35f0ad04e490537d9dfcb8825acba2cfe1b82643.tar.xz cacert-devel-35f0ad04e490537d9dfcb8825acba2cfe1b82643.zip | |
bug 893: fixed check of certificate retension time
| -rw-r--r-- | includes/temp_functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/temp_functions.php b/includes/temp_functions.php index 86b55c2..127acc6 100644 --- a/includes/temp_functions.php +++ b/includes/temp_functions.php @@ -186,7 +186,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); @@ -204,7 +204,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); |