projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7480ce5
)
UT: fix comparison for expired timestamps.
author
Wilfried Goesgens
<dothebart@citadel.org>
Wed, 5 Jun 2013 07:46:20 +0000
(09:46 +0200)
committer
Wilfried Goesgens
<dothebart@citadel.org>
Wed, 5 Jun 2013 07:46:20 +0000
(09:46 +0200)
citadel/database.c
patch
|
blob
|
history
diff --git
a/citadel/database.c
b/citadel/database.c
index 3bab5776d90ebe522eefb34b1c751f631de98ca1..398f1eb0f864b5b420f48fb401d4f4abb4c4bf3a 100644
(file)
--- a/
citadel/database.c
+++ b/
citadel/database.c
@@
-923,24
+923,25
@@
time_t CheckIfAlreadySeen(const char *Facility,
long ccid,
long ioid)
{
long ccid,
long ioid)
{
+ time_t InDBTimeStamp = 0;
struct UseTable ut;
struct cdbdata *cdbut;
if (cType != eWrite)
{
struct UseTable ut;
struct cdbdata *cdbut;
if (cType != eWrite)
{
- time_t InDBTimeStamp = 0;
SEENM_syslog(LOG_DEBUG, "Loading");
cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
if (cdbut != NULL) {
memcpy(&ut, cdbut->ptr,
((cdbut->len > sizeof(struct UseTable)) ?
sizeof(struct UseTable) : cdbut->len));
SEENM_syslog(LOG_DEBUG, "Loading");
cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
if (cdbut != NULL) {
memcpy(&ut, cdbut->ptr,
((cdbut->len > sizeof(struct UseTable)) ?
sizeof(struct UseTable) : cdbut->len));
-
- if (ut.ut_timestamp > antiexpire)
+ InDBTimeStamp = ut.ut_timestamp;
+
+ if (InDBTimeStamp < antiexpire)
{
SEENM_syslog(LOG_DEBUG, "Found - Not expired.");
cdb_free(cdbut);
{
SEENM_syslog(LOG_DEBUG, "Found - Not expired.");
cdb_free(cdbut);
- return
ut.ut_times
tamp;
+ return
InDBTimeS
tamp;
}
else
{
}
else
{
@@
-968,7
+969,7
@@
time_t CheckIfAlreadySeen(const char *Facility,
&ut, sizeof(struct UseTable) );
SEENM_syslog(LOG_DEBUG, "Done Saving");
&ut, sizeof(struct UseTable) );
SEENM_syslog(LOG_DEBUG, "Done Saving");
- return
0
;
+ return
InDBTimeStamp
;
}
}