Modified the behavior of ForEachUser() to do the two phase load/perform cycle

[citadel.git] / citadel / control.c

diff --git a/citadel/control.c b/citadel/control.c
index cf587a0443c9e89bd273a22348fbbc04a7de3a41..3463de80b3baf0e6e817e1b96d62c9daf52e3297 100644 (file)
--- a/citadel/control.c
+++ b/citadel/control.c
@@ -1,7 +1,7 @@
 /*
  * This module handles states which are global to the entire server.
  *
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2019 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -96,14 +96,19 @@ void control_find_highest(struct ctdlroom *qrbuf, void *data)
 /*
  * Callback to get highest user number.
  */
-void control_find_user(struct ctdluser *EachUser, void *out_data)
-{
-       if (EachUser->usernum > CtdlGetConfigLong("MMnextuser")) {
+void control_find_user(char *username, void *out_data) {
+       struct ctdluser EachUser;
+
+       if (CtdlGetUser(&EachUser, username) != 0) {
+               return;
+       }
+
+       if (EachUser.usernum > CtdlGetConfigLong("MMnextuser")) {
                syslog(LOG_DEBUG, "control: fixing MMnextuser %ld > %ld , found in %s",
-                       EachUser->usernum, CtdlGetConfigLong("MMnextuser"), EachUser->fullname
+                       EachUser.usernum, CtdlGetConfigLong("MMnextuser"), EachUser.fullname
                );
                if (!sanity_diag_mode) {
-                       CtdlSetConfigLong("MMnextuser", EachUser->usernum);
+                       CtdlSetConfigLong("MMnextuser", EachUser.usernum);
                }
        }
 }
@@ -318,8 +323,8 @@ void cmd_conf(char *argbuf)
                cprintf("\n");
                cprintf("\n");
                cprintf("%d\n",         CtdlGetConfigInt("c_rbl_at_greeting"));
-               cprintf("%s\n",         CtdlGetConfigStr("c_master_user"));
-               cprintf("%s\n",         CtdlGetConfigStr("c_master_pass"));
+               cprintf("\n");
+               cprintf("\n");
                cprintf("%s\n",         CtdlGetConfigStr("c_pager_program"));
                cprintf("%d\n",         CtdlGetConfigInt("c_imap_keep_from"));
                cprintf("%d\n",         CtdlGetConfigInt("c_xmpp_c2s_port"));
@@ -538,10 +543,10 @@ void cmd_conf(char *argbuf)
                                CtdlSetConfigInt("c_rbl_at_greeting", confbool(buf));
                                break;
                        case 58:
-                               CtdlSetConfigStr("c_master_user", buf);
+                               /* niu */
                                break;
                        case 59:
-                               CtdlSetConfigStr("c_master_pass", buf);
+                               /* niu */
                                break;
                        case 60:
                                CtdlSetConfigStr("c_pager_program", buf);