*
* 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"
#include "ctdl_module.h"
+
+/*
+ * Fix up the name for Citadel user 0 and try to remove any extra users with number 0
+ */
+void fix_sys_user_name(void)
+{
+ struct ctdluser usbuf;
+ char usernamekey[USERNAME_SIZE];
+
+ /** If we have a user called Citadel rename them to SYS_Citadel */
+ if (getuser(&usbuf, "Citadel") == 0)
+ {
+ rename_user("Citadel", "SYS_Citadel");
+ }
+
+ while (getuserbynumber(&usbuf, 0) == 0)
+ {
+ /* delete user with number 0 and no name */
+ if (IsEmptyStr(usbuf.fullname))
+ cdb_delete(CDB_USERS, "", 0);
+ else
+ { /* temporarily set this user to -1 */
+ usbuf.usernum = -1;
+ putuser(&usbuf);
+ }
+ }
+
+ /** Make sure user SYS_* is user 0 */
+ while (getuserbynumber(&usbuf, -1) == 0)
+ {
+ if (strncmp(usbuf.fullname, "SYS_", 4))
+ { /** Delete any user 0 that doesn't start with SYS_ */
+ makeuserkey(usernamekey, usbuf.fullname);
+ cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
+ }
+ else
+ {
+ usbuf.usernum = 0;
+ putuser(&usbuf);
+ }
+ }
+}
+
+
/*
* Back end processing function for cmd_bmbx
*/
while (rplist != NULL) {
if (lgetroom(&qr, rplist->name) == 0) {
- lprintf(CTDL_DEBUG, "Processing <%s>...\n", rplist->name);
+ CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", rplist->name);
if ( (qr.QRflags & QR_MAILBOX) == 0) {
- lprintf(CTDL_DEBUG, " -- not a mailbox\n");
+ CtdlLogPrintf(CTDL_DEBUG, " -- not a mailbox\n");
}
else {
qr.QRgen = time(NULL);
- lprintf(CTDL_DEBUG, " -- fixed!\n");
+ CtdlLogPrintf(CTDL_DEBUG, " -- fixed!\n");
}
lputroom(&qr);
}
* quick fix to bump mailbox generation numbers
*/
void bump_mailbox_generation_numbers(void) {
- lprintf(CTDL_WARNING, "Applying security fix to mailbox rooms\n");
+ CtdlLogPrintf(CTDL_WARNING, "Applying security fix to mailbox rooms\n");
ForEachRoom(cmd_bmbx_backend, NULL);
cmd_bmbx_backend(NULL, NULL);
return;
while (uplist != NULL) {
if (lgetuser(&us, uplist->user) == 0) {
- lprintf(CTDL_DEBUG, "Processing <%s>...\n", uplist->user);
+ CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", uplist->user);
if (us.uid == CTDLUID) {
us.uid = (-1);
}
* quick fix to change all CTDLUID users to (-1)
*/
void convert_ctdluid_to_minusone(void) {
- lprintf(CTDL_WARNING, "Applying uid changes\n");
+ CtdlLogPrintf(CTDL_WARNING, "Applying uid changes\n");
ForEachUser(cbtm_backend, NULL);
cbtm_backend(NULL, NULL);
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
*/
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();
}
void check_server_upgrades(void) {
get_control();
- lprintf(CTDL_INFO, "Server-hosted upgrade level is %d.%02d\n",
+ CtdlLogPrintf(CTDL_INFO, "Server-hosted upgrade level is %d.%02d\n",
(CitControl.version / 100),
(CitControl.version % 100) );
if (CitControl.version < REV_LEVEL) {
- lprintf(CTDL_WARNING,
+ CtdlLogPrintf(CTDL_WARNING,
"Server hosted updates need to be processed at "
"this time. Please wait...\n");
}
update_config();
if ((CitControl.version > 000) && (CitControl.version < 555)) {
- lprintf(CTDL_EMERG,
+ CtdlLogPrintf(CTDL_EMERG,
"Your data files are from a version of Citadel\n"
"that is too old to be upgraded. Sorry.\n");
exit(EXIT_FAILURE);
if ((CitControl.version > 000) && (CitControl.version < 659)) {
rebuild_euid_index();
}
-
+ if (CitControl.version < 735) {
+ fix_sys_user_name();
+ }
+ if (CitControl.version < 736) {
+ rebuild_usersbynumber();
+ }
CitControl.version = REV_LEVEL;
put_control();
}
-CTDL_MODULE_INIT(upgrade)
+CTDL_MODULE_UPGRADE(upgrade)
{
- if (!threading)
- {
- check_server_upgrades();
- }
+ check_server_upgrades();
/* return our Subversion id for the Log */
return "$Id$";
projects / citadel.git / blobdiff