X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fexpire%2Fserv_expire.c;fp=citadel%2Fmodules%2Fexpire%2Fserv_expire.c;h=7da3ef84ebbd53726c494e6c11ce68cb48475279;hp=e03d43b6adc6b7ac386d28f1199111fbb9e53178;hb=d262741cce924786b2de5f3f10f5470e5d45743e;hpb=63dc1de06b047b4be691541935e98845457c4c04

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index e03d43b6a..7da3ef84e 100644
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -694,7 +694,7 @@ int PurgeVisits(void) {
  * Purge the use table of old entries.
  *
  */
-int PurgeUseTable(void) {
+int PurgeUseTable(StrBuf *ErrMsg) {
 	int purged = 0;
 	struct cdbdata *cdbut;
 	struct UseTable ut;
@@ -702,6 +702,12 @@ int PurgeUseTable(void) {
 	struct UPurgeList *uptr; 
 
 	/* Phase 1: traverse through the table, discovering old records... */
+	if (CheckTDAPVeto(CDB_USETABLE, ErrMsg))
+	{
+		syslog(LOG_DEBUG, "Purge use table: VETO!");
+		return 0;
+	}
+
 	syslog(LOG_DEBUG, "Purge use table: phase 1");
 	cdb_rewind(CDB_USETABLE);
 	while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL) {
@@ -899,8 +905,13 @@ void purge_databases(void)
 
 	if (!server_shutting_down)
 	{
-		retval = PurgeUseTable();
+		StrBuf *ErrMsg;
+
+		ErrMsg = NewStrBuf ();
+		retval = PurgeUseTable(ErrMsg);
        		syslog(LOG_NOTICE, "Purged %d entries from the use table.", retval);
+////TODO: fix errmsg
+		FreeStrBuf(&ErrMsg);
 	}
 
 	if (!server_shutting_down)