Now we name all the private contexts.

[citadel.git] / citadel / modules / expire / serv_expire.c

diff --git a/citadel/modules/expire/serv_expire.c b/citadel/modules/expire/serv_expire.c
index b494d9755495cd513c6ca5856464cd9f2a0a6047..ea852dd49dd135b016e33d98f29020c09bf78a2f 100644 (file)
--- a/citadel/modules/expire/serv_expire.c
+++ b/citadel/modules/expire/serv_expire.c
@@ -115,6 +115,7 @@ struct ValidUser *ValidUserList = NULL;
 int messages_purged;
 int users_not_purged;
 char *users_corrupt_msg = NULL;
+char *users_zero_msg = NULL;
 
 struct ctdlroomref *rr = NULL;
 
@@ -443,7 +444,10 @@ void do_user_purge(struct ctdluser *us, void *data) {
        /* User number 0, as well as any negative user number, is
         * also impossible.
         */
-       if (us->usernum < 1L) purge = 1;
+       if (us->usernum < 0L) purge = 1;
+       
+       /** Don't purge user 0. That user is there for the system */
+       if (us->usernum == 0) purge = 0;
        
        /* If the user has no full name entry then we can't purge them
         * since the actual purge can't find them.
@@ -452,18 +456,47 @@ void do_user_purge(struct ctdluser *us, void *data) {
         */
        if (IsEmptyStr(us->fullname))
        {
-               purge=0;
-               if (users_corrupt_msg == NULL)
+               if (us->usernum > 0L)
                {
-                       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");
-               }
+                       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"
+                               "If the user number is 0 you should report this to the Citadel development\n"
+                               "team either by a bugzilla report at http://bugzilla.citadel.org or\n"
+                               "posting a message in the Citadel Support room on Uncensored at\n"
+                               "https://uncensored.citadel.org You should make it clear that you have seen a\n"
+                               "user 0 messages in the Aide room which means a module has not named its\n"
+                               "private context.\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);
+                       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);
+               }
+               else if (us->usernum == 0L)
+               {
+                       purge=0;
+                       if (users_zero_msg == NULL)
+                       {
+                               users_zero_msg = malloc(SIZ);
+                               strcpy(users_zero_msg, "The auto-purger found a user with a user number of 0 but no name.\n"
+                               "This is the result of a bug where a private contaxt has been created but\n"
+                               "not named.\n\n"
+                               "Please report this to the Citadel development team either by a bugzilla\n"
+                               "report at http://bugzilla.citadel.org or by posting a message in the\n"
+                               "Citadel Support room on Uncensored at https://uncensored.citadel.org\n"
+                               "You should make it clear that you have seen a user 0 messages in the\n"
+                               "Aide room which means a module has not named its private context.\n\n"
+                               "This problem is not considered serious since it does not constitute a\n"
+                               "security risk and should not impare system operation.\n"
+                               );
+                       }
+               }
+
        }
 
 
@@ -540,6 +573,12 @@ int PurgeUsers(void) {
                users_corrupt_msg = NULL;
        }
        
+       if(users_zero_msg)
+       {
+               aide_message(users_zero_msg, "User Zero Message");
+               free (users_zero_msg);
+               users_zero_msg = NULL;
+       }
                
        CtdlLogPrintf(CTDL_DEBUG, "Purged %d users.\n", num_users_purged);
        return(num_users_purged);
@@ -761,10 +800,8 @@ void *purge_databases(void *args)
 
        CtdlLogPrintf(CTDL_DEBUG, "Auto-purger_thread() initializing\n");
 
-       memset(&purgerCC, 0, sizeof(struct CitContext));
-       purgerCC.internal_pgm = 1;
-       purgerCC.cs_pid = 0;
-       pthread_setspecific(MyConKey, (void *)&purgerCC );
+       CtdlFillPrivateContext(&purgerCC, "purger");
+       citthread_setspecific(MyConKey, (void *)&purgerCC );
 
         while (!CtdlThreadCheckStop()) {
                 /* Do the auto-purge if the current hour equals the purge hour,