#include "user_ops.h"
#include "control.h"
#include "serv_network.h" /* Needed for defenition of UseTable */
-
+#include "threads.h"
#include "ctdl_module.h"
struct ValidUser *ValidUserList = NULL;
int messages_purged;
int users_not_purged;
+char *users_corrupt_msg = NULL;
struct ctdlroomref *rr = NULL;
+
/*
* Back end function to check user accounts for expiration.
*/
/* The default rule is to not purge. */
purge = 0;
- /* If the user hasn't called in two months, his/her account
+ /* If the user hasn't called in two months and expiring of accounts is turned on, his/her account
* has expired, so purge the record.
*/
- now = time(NULL);
- if ((now - us->lastcall) > purge_time) purge = 1;
-
- /* If the user set his/her password to 'deleteme', he/she
- * wishes to be deleted, so purge the record.
- */
- if (!strcasecmp(us->password, "deleteme")) purge = 1;
+ if (config.c_userpurge > 0)
+ {
+ now = time(NULL);
+ if ((now - us->lastcall) > purge_time) purge = 1;
+ }
/* If the record is marked as permanent, don't purge it.
*/
*/
if (us->axlevel == 0) purge = 1;
+ /* If the user set his/her password to 'deleteme', he/she
+ * wishes to be deleted, so purge the record.
+ * Moved this lower down so that aides and permanent users get purged if they ask to be.
+ */
+ if (!strcasecmp(us->password, "deleteme")) purge = 1;
+
/* 0 calls is impossible. If there are 0 calls, it must
* be a corrupted record, so purge it.
+ * Actually it is possible if an Aide created the user so now we check for less than 0 (DRW)
*/
- if (us->timescalled == 0) purge = 1;
+ if (us->timescalled < 0) purge = 1;
/* User number 0, as well as any negative user number, is
* also impossible.
*/
if (us->usernum < 1L) purge = 1;
+
+ /* If the user has no full name entry then we can't purge them
+ * since the actual purge can't find them.
+ * This shouldn't happen but does somehow.
+ * So we make an Aide message to alert to it but don't add it to the purge list
+ */
+ if (IsEmptyStr(us->fullname))
+ {
+ purge=0;
+ if (users_corrupt_msg == NULL)
+ {
+ users_corrupt_msg = malloc(SIZ);
+ strcpy(users_corrupt_msg, "The auto-purger found the following user numbers with no name.\n"
+ "Unfortunately the auto-purger is not yet able to fix this problem.\n"
+ "This problem is not considered serious since a user with no name can\n"
+ "not log in.\n");
+ }
+
+ users_corrupt_msg=realloc(users_corrupt_msg, strlen(users_corrupt_msg)+SIZ);
+ snprintf(&users_corrupt_msg[strlen(users_corrupt_msg)], SIZ, " %ld\n", us->usernum);
+ }
+
if (purge == 1) {
pptr = (struct PurgeList *) malloc(sizeof(struct PurgeList));
lprintf(CTDL_DEBUG, "PurgeUsers() called\n");
users_not_purged = 0;
- if (config.c_auth_mode == 1) {
- /* host auth mode */
- ForEachUser(do_uid_user_purge, NULL);
- }
- else {
- /* native auth mode */
- if (config.c_userpurge > 0) {
+ switch(config.c_auth_mode) {
+ case AUTHMODE_NATIVE:
ForEachUser(do_user_purge, NULL);
- }
+ break;
+ case AUTHMODE_HOST:
+ ForEachUser(do_uid_user_purge, NULL);
+ break;
+ default:
+ lprintf(CTDL_DEBUG, "Unknown authentication mode!\n");
+ break;
}
transcript = malloc(SIZ);
if (num_users_purged > 0) aide_message(transcript, "User Purge Message");
free(transcript);
+ if(users_corrupt_msg)
+ {
+ aide_message(users_corrupt_msg, "User Corruption Message");
+ free (users_corrupt_msg);
+ users_corrupt_msg = NULL;
+ }
+
+
lprintf(CTDL_DEBUG, "Purged %d users.\n", num_users_purged);
return(num_users_purged);
}
static time_t last_purge = 0;
time_t now;
struct tm tm;
+ struct CitContext purgerCC;
- CT_PUSH(); // Makes it easier to access this threads structure
+ lprintf(CTDL_DEBUG, "indexer_thread() initializing\n");
- cdb_allocate_tsd();
+ memset(&purgerCC, 0, sizeof(struct CitContext));
+ purgerCC.internal_pgm = 1;
+ purgerCC.cs_pid = 0;
+ pthread_setspecific(MyConKey, (void *)&purgerCC );
- while (!CtdlThreadCheckStop(CT)) {
+ while (!CtdlThreadCheckStop()) {
/* Do the auto-purge if the current hour equals the purge hour,
* but not if the operation has already been performed in the
* last twelve hours. This is usually enough granularity.
lprintf(CTDL_INFO, "Auto-purger: starting.\n");
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeUsers();
lprintf(CTDL_NOTICE, "Purged %d users.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
PurgeMessages();
lprintf(CTDL_NOTICE, "Expired %d messages.\n", messages_purged);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeRooms();
lprintf(CTDL_NOTICE, "Expired %d rooms.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeVisits();
lprintf(CTDL_NOTICE, "Purged %d visits.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeUseTable();
lprintf(CTDL_NOTICE, "Purged %d entries from the use table.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = PurgeEuidIndexTable();
lprintf(CTDL_NOTICE, "Purged %d entries from the EUID index.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
retval = TDAP_ProcessAdjRefCountQueue();
lprintf(CTDL_NOTICE, "Processed %d message reference count adjustments.\n", retval);
}
- if (!CtdlThreadCheckStop(CT))
+ if (!CtdlThreadCheckStop())
{
lprintf(CTDL_INFO, "Auto-purger: finished.\n");
last_purge = now; /* So we don't do it again soon */
projects / citadel.git / blobdiff