Citadel API clean up.

[citadel.git] / citadel / modules / upgrade / serv_upgrade.c

diff --git a/citadel/modules/upgrade/serv_upgrade.c b/citadel/modules/upgrade/serv_upgrade.c
index ce147b9b951888300c35bdc4f7745da45ff8cbbd..c7a7b7220c03b7e1d4a05e9bd47c64f6082a4fc7 100644 (file)
--- a/citadel/modules/upgrade/serv_upgrade.c
+++ b/citadel/modules/upgrade/serv_upgrade.c
@@ -3,6 +3,21 @@
  *
  * Transparently handle the upgrading of server data formats.
  *
+ * Copyright (c) 1987-2009 by the citadel.org team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "sysdep.h"
@@ -37,7 +52,6 @@
 #include "config.h"
 #include "control.h"
 #include "database.h"
-#include "room_ops.h"
 #include "user_ops.h"
 #include "msgbase.h"
 #include "serv_upgrade.h"
@@ -99,7 +113,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
        struct RoomProcList *ptr;
        struct ctdlroom qr;
 
-       /* Lazy programming here.  Call this function as a ForEachRoom backend
+       /* Lazy programming here.  Call this function as a CtdlForEachRoom backend
         * in order to queue up the room names, or call it with a null room
         * to make it do the processing.
         */
@@ -116,7 +130,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
 
        while (rplist != NULL) {
 
-               if (lgetroom(&qr, rplist->name) == 0) {
+               if (CtdlGetRoomLock(&qr, rplist->name) == 0) {
                        CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", rplist->name);
                        if ( (qr.QRflags & QR_MAILBOX) == 0) {
                                CtdlLogPrintf(CTDL_DEBUG, "  -- not a mailbox\n");
@@ -126,7 +140,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
                                qr.QRgen = time(NULL);
                                CtdlLogPrintf(CTDL_DEBUG, "  -- fixed!\n");
                        }
-                       lputroom(&qr);
+                       CtdlPutRoomLock(&qr);
                }
 
                ptr = rplist;
@@ -140,7 +154,7 @@ void cmd_bmbx_backend(struct ctdlroom *qrbuf, void *data) {
  */
 void bump_mailbox_generation_numbers(void) {
        CtdlLogPrintf(CTDL_WARNING, "Applying security fix to mailbox rooms\n");
-       ForEachRoom(cmd_bmbx_backend, NULL);
+       CtdlForEachRoom(cmd_bmbx_backend, NULL);
        cmd_bmbx_backend(NULL, NULL);
        return;
 }
@@ -195,6 +209,27 @@ void convert_ctdluid_to_minusone(void) {
        return;
 }
 
+
+/*
+ * Attempt to guess the name of the time zone currently in use
+ * on the underlying host system.
+ */
+void guess_time_zone(void) {
+       FILE *fp;
+       char buf[PATH_MAX];
+
+       fp = popen(file_guesstimezone, "r");
+       if (fp) {
+               if (fgets(buf, sizeof buf, fp) && (strlen(buf) > 2)) {
+                       buf[strlen(buf)-1] = 0;
+                       safestrncpy(config.c_default_cal_zone, buf, sizeof config.c_default_cal_zone);
+                       CtdlLogPrintf(CTDL_INFO, "Configuring timezone: %s\n", config.c_default_cal_zone);
+               }
+               fclose(fp);
+       }
+}
+
+
 /*
  * Do various things to our configuration file
  */
@@ -230,6 +265,21 @@ void update_config(void) {
                config.c_xmpp_s2s_port = 5269;
        }
 
+       /* Erase LDAP config that might be left over from the old connector
+        * which served a different purpose.
+        */
+       if (CitControl.version < 760) {
+               strcpy(config.c_ldap_host, "");
+               config.c_ldap_port = 389;
+               strcpy(config.c_ldap_base_dn, "");
+               strcpy(config.c_ldap_bind_dn, "");
+               strcpy(config.c_ldap_bind_pw, "");
+       }
+
+       if (IsEmptyStr(config.c_default_cal_zone)) {
+               guess_time_zone();
+       }
+
        put_config();
 }
 
@@ -269,9 +319,12 @@ void check_server_upgrades(void) {
        if ((CitControl.version > 000) && (CitControl.version < 659)) {
                rebuild_euid_index();
        }
-       if (CitControl.version > 734) {
+       if (CitControl.version < 735) {
                fix_sys_user_name();
        }
+       if (CitControl.version < 736) {
+               rebuild_usersbynumber();
+       }
        CitControl.version = REV_LEVEL;
        put_control();
 }