When THE DREADED AUTO-PURGER expires user accounts,

we were previously expiring accounts for which an associated Unix account no longer exists
if running in autologin mode.  This is now the ONLY condition under which an account will
be expired in this mode.

diff --git a/citadel/serv_expire.c b/citadel/serv_expire.c
index ba354fa2d5561509a06eb36db286c6c7e2ccc951..5b6fda96abab792500278b7251387f1ac63f1ab5 100644 (file)
--- a/citadel/serv_expire.c
+++ b/citadel/serv_expire.c
@@ -460,10 +460,13 @@ int PurgeUsers(void) {
        char *transcript = NULL;
 
        lprintf(CTDL_DEBUG, "PurgeUsers() called\n");
+#ifdef ENABLE_AUTOLOGIN
+       ForEachUser(do_uid_user_purge, NULL);
+#else
        if (config.c_userpurge > 0) {
                ForEachUser(do_user_purge, NULL);
        }
-       ForEachUser(do_uid_user_purge, NULL);
+#endif
 
        transcript = malloc(SIZ);
        strcpy(transcript, "The following users have been auto-purged:\n");