/*
- * $Id$
- *
* Transparently handle the upgrading of server data formats.
*
+ * Copyright (c) 1987-2010 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 "config.h"
#include "control.h"
#include "database.h"
-#include "room_ops.h"
#include "user_ops.h"
#include "msgbase.h"
#include "serv_upgrade.h"
char usernamekey[USERNAME_SIZE];
/** If we have a user called Citadel rename them to SYS_Citadel */
- if (getuser(&usbuf, "Citadel") == 0)
+ if (CtdlGetUser(&usbuf, "Citadel") == 0)
{
rename_user("Citadel", "SYS_Citadel");
}
- while (getuserbynumber(&usbuf, 0) == 0)
+ while (CtdlGetUserByNumber(&usbuf, 0) == 0)
{
/* delete user with number 0 and no name */
if (IsEmptyStr(usbuf.fullname))
else
{ /* temporarily set this user to -1 */
usbuf.usernum = -1;
- putuser(&usbuf);
+ CtdlPutUser(&usbuf);
}
}
/** Make sure user SYS_* is user 0 */
- while (getuserbynumber(&usbuf, -1) == 0)
+ while (CtdlGetUserByNumber(&usbuf, -1) == 0)
{
if (strncmp(usbuf.fullname, "SYS_", 4))
{ /** Delete any user 0 that doesn't start with SYS_ */
- makeuserkey(usernamekey, usbuf.fullname);
+ makeuserkey(usernamekey,
+ usbuf.fullname,
+ cutuserkey(usbuf.fullname));
cdb_delete(CDB_USERS, usernamekey, strlen(usernamekey));
}
else
{
usbuf.usernum = 0;
- putuser(&usbuf);
+ CtdlPutUser(&usbuf);
}
}
}
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.
*/
while (rplist != NULL) {
- if (lgetroom(&qr, rplist->name) == 0) {
- CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", rplist->name);
+ if (CtdlGetRoomLock(&qr, rplist->name) == 0) {
+ syslog(LOG_DEBUG, "Processing <%s>...\n", rplist->name);
if ( (qr.QRflags & QR_MAILBOX) == 0) {
- CtdlLogPrintf(CTDL_DEBUG, " -- not a mailbox\n");
+ syslog(LOG_DEBUG, " -- not a mailbox\n");
}
else {
qr.QRgen = time(NULL);
- CtdlLogPrintf(CTDL_DEBUG, " -- fixed!\n");
+ syslog(LOG_DEBUG, " -- fixed!\n");
}
- lputroom(&qr);
+ CtdlPutRoomLock(&qr);
}
ptr = rplist;
* quick fix to bump mailbox generation numbers
*/
void bump_mailbox_generation_numbers(void) {
- CtdlLogPrintf(CTDL_WARNING, "Applying security fix to mailbox rooms\n");
- ForEachRoom(cmd_bmbx_backend, NULL);
+ syslog(LOG_WARNING, "Applying security fix to mailbox rooms\n");
+ CtdlForEachRoom(cmd_bmbx_backend, NULL);
cmd_bmbx_backend(NULL, NULL);
return;
}
while (uplist != NULL) {
- if (lgetuser(&us, uplist->user) == 0) {
- CtdlLogPrintf(CTDL_DEBUG, "Processing <%s>...\n", uplist->user);
+ if (CtdlGetUserLock(&us, uplist->user) == 0) {
+ syslog(LOG_DEBUG, "Processing <%s>...\n", uplist->user);
if (us.uid == CTDLUID) {
us.uid = (-1);
}
- lputuser(&us);
+ CtdlPutUserLock(&us);
}
ptr = uplist;
* quick fix to change all CTDLUID users to (-1)
*/
void convert_ctdluid_to_minusone(void) {
- CtdlLogPrintf(CTDL_WARNING, "Applying uid changes\n");
+ syslog(LOG_WARNING, "Applying uid changes\n");
ForEachUser(cbtm_backend, NULL);
cbtm_backend(NULL, NULL);
return;
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);
+ syslog(LOG_INFO, "Configuring timezone: %s\n", config.c_default_cal_zone);
}
fclose(fp);
}
}
if (CitControl.version < 623) {
- strcpy(config.c_ip_addr, "0.0.0.0");
+ strcpy(config.c_ip_addr, "*");
}
if (CitControl.version < 650) {
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();
}
void check_server_upgrades(void) {
get_control();
- CtdlLogPrintf(CTDL_INFO, "Server-hosted upgrade level is %d.%02d\n",
+ syslog(LOG_INFO, "Server-hosted upgrade level is %d.%02d\n",
(CitControl.version / 100),
(CitControl.version % 100) );
if (CitControl.version < REV_LEVEL) {
- CtdlLogPrintf(CTDL_WARNING,
+ syslog(LOG_WARNING,
"Server hosted updates need to be processed at "
"this time. Please wait...\n");
}
update_config();
if ((CitControl.version > 000) && (CitControl.version < 555)) {
- CtdlLogPrintf(CTDL_EMERG,
+ syslog(LOG_EMERG,
"Your data files are from a version of Citadel\n"
"that is too old to be upgraded. Sorry.\n");
exit(EXIT_FAILURE);
check_server_upgrades();
/* return our Subversion id for the Log */
- return "$Id$";
+ return "upgrade";
}
projects / citadel.git / blobdiff