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.
*/
* 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));
switch(config.c_auth_mode) {
case AUTHMODE_NATIVE:
- if (config.c_userpurge > 0) {
- ForEachUser(do_user_purge, NULL);
- }
+ ForEachUser(do_user_purge, NULL);
break;
case AUTHMODE_HOST:
ForEachUser(do_uid_user_purge, NULL);
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);
}