X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fconfig.c;h=28084aa1e6186fc2812a4e60fc3dcf8115823318;hb=6050cb23108ee10dafcceb65b9cafab51c013ae0;hp=4dc7698b45ec6420f1e385c54c48b4882a8adcd0;hpb=998e8e43701e080f3ef9d6849715e9a6f1616255;p=citadel.git diff --git a/citadel/config.c b/citadel/config.c index 4dc7698b4..28084aa1e 100644 --- a/citadel/config.c +++ b/citadel/config.c @@ -1,7 +1,7 @@ /* * Read and write the citadel.config file * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2014 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. @@ -13,21 +13,14 @@ */ #include "sysdep.h" -#include -#include -#include #include -#include -#include -#include #include #include -#include "citadel.h" -#include "server.h" #include "config.h" #include "ctdl_module.h" struct config config; +struct configlen configlen; /* * Put some sane default values into our configuration. Some will be overridden when we run setup. @@ -40,25 +33,25 @@ void brand_new_installation_set_defaults(void) { /* Determine our host name, in case we need to use it as a default */ uname(&my_utsname); - + memset(&configlen, 0, sizeof(struct configlen)); /* set some sample/default values in place of blanks... */ - extract_token(config.c_nodename, my_utsname.nodename, 0, '.', sizeof config.c_nodename); + configlen.c_nodename = extract_token(config.c_nodename, my_utsname.nodename, 0, '.', sizeof config.c_nodename); if (IsEmptyStr(config.c_fqdn) ) { if ((he = gethostbyname(my_utsname.nodename)) != NULL) { - safestrncpy(config.c_fqdn, he->h_name, sizeof config.c_fqdn); + configlen.c_fqdn = safestrncpy(config.c_fqdn, he->h_name, sizeof config.c_fqdn); } else { - safestrncpy(config.c_fqdn, my_utsname.nodename, sizeof config.c_fqdn); + configlen.c_fqdn = safestrncpy(config.c_fqdn, my_utsname.nodename, sizeof config.c_fqdn); } } - safestrncpy(config.c_humannode, "Citadel Server", sizeof config.c_humannode); - safestrncpy(config.c_phonenum, "US 800 555 1212", sizeof config.c_phonenum); + configlen.c_humannode = safestrncpy(config.c_humannode, "Citadel Server", sizeof config.c_humannode); + configlen.c_phonenum = safestrncpy(config.c_phonenum, "US 800 555 1212", sizeof config.c_phonenum); config.c_initax = 4; - safestrncpy(config.c_moreprompt, "", sizeof config.c_moreprompt); - safestrncpy(config.c_twitroom, "Trashcan", sizeof config.c_twitroom); - safestrncpy(config.c_baseroom, BASEROOM, sizeof config.c_baseroom); - safestrncpy(config.c_aideroom, "Aide", sizeof config.c_aideroom); + configlen.c_moreprompt = safestrncpy(config.c_moreprompt, "", sizeof config.c_moreprompt); + configlen.c_twitroom = safestrncpy(config.c_twitroom, "Trashcan", sizeof config.c_twitroom); + configlen.c_baseroom = safestrncpy(config.c_baseroom, BASEROOM, sizeof config.c_baseroom); + configlen.c_aideroom = safestrncpy(config.c_aideroom, "Aide", sizeof config.c_aideroom); config.c_port_number = 504; config.c_sleeping = 900; @@ -98,9 +91,38 @@ void brand_new_installation_set_defaults(void) { config.c_managesieve_port = 2020; config.c_xmpp_c2s_port = 5222; config.c_xmpp_s2s_port = 5269; + config.c_nntp_port = 119; + config.c_nntps_port = 563; } - +void setcfglen(void) +{ + configlen.c_nodename = strlen(config.c_nodename); + configlen.c_fqdn = strlen(config.c_fqdn); + configlen.c_humannode = strlen(config.c_humannode); + configlen.c_phonenum = strlen(config.c_phonenum); + configlen.c_twitroom = strlen(config.c_twitroom); + configlen.c_moreprompt = strlen(config.c_moreprompt); + configlen.c_site_location = strlen(config.c_site_location); + configlen.c_sysadm = strlen(config.c_sysadm); + configlen.c_niu_2 = strlen(config.c_niu_2); + configlen.c_ip_addr = strlen(config.c_ip_addr); + configlen.c_logpages = strlen(config.c_logpages); + configlen.c_baseroom = strlen(config.c_baseroom); + configlen.c_aideroom = strlen(config.c_aideroom); + configlen.c_ldap_host = strlen(config.c_ldap_host); + configlen.c_ldap_base_dn = strlen(config.c_ldap_base_dn); + configlen.c_ldap_bind_dn = strlen(config.c_ldap_bind_dn); + configlen.c_ldap_bind_pw = strlen(config.c_ldap_bind_pw); + configlen.c_journal_dest = strlen(config.c_journal_dest); + configlen.c_default_cal_zone = strlen(config.c_default_cal_zone); + configlen.c_funambol_host = strlen(config.c_funambol_host); + configlen.c_funambol_source = strlen(config.c_funambol_source); + configlen.c_funambol_auth = strlen(config.c_funambol_auth); + configlen.c_master_user = strlen(config.c_master_user); + configlen.c_master_pass = strlen(config.c_master_pass); + configlen.c_pager_program = strlen(config.c_pager_program); +} /* * get_config() is called during the initialization of Citadel server. @@ -131,6 +153,7 @@ void get_config(void) { ); } fclose(cfp); + setcfglen(); } else { brand_new_installation_set_defaults(); @@ -196,6 +219,7 @@ void get_config(void) { } } +long config_msgnum = 0; /* * Occasionally, we will need to write the config file, because some operations @@ -206,14 +230,75 @@ void put_config(void) FILE *cfp; int blocks_written = 0; - if ((cfp = fopen(file_citadel_config, "w")) != NULL) { + cfp = fopen(file_citadel_config, "w"); + if (cfp != NULL) { blocks_written = fwrite((char *) &config, sizeof(struct config), 1, cfp); if (blocks_written == 1) { - fclose(cfp); chown(file_citadel_config, CTDLUID, (-1)); chmod(file_citadel_config, 0600); + fclose(cfp); return; } + fclose(cfp); } syslog(LOG_EMERG, "%s: %s", file_citadel_config, strerror(errno)); } + + + +void CtdlGetSysConfigBackend(long msgnum, void *userdata) { + config_msgnum = msgnum; +} + + +char *CtdlGetSysConfig(char *sysconfname) { + char hold_rm[ROOMNAMELEN]; + long msgnum; + char *conf; + struct CtdlMessage *msg; + char buf[SIZ]; + + strcpy(hold_rm, CC->room.QRname); + if (CtdlGetRoom(&CC->room, SYSCONFIGROOM) != 0) { + CtdlGetRoom(&CC->room, hold_rm); + return NULL; + } + + + /* We want the last (and probably only) config in this room */ + begin_critical_section(S_CONFIG); + config_msgnum = (-1L); + CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL, + CtdlGetSysConfigBackend, NULL); + msgnum = config_msgnum; + end_critical_section(S_CONFIG); + + if (msgnum < 0L) { + conf = NULL; + } + else { + msg = CtdlFetchMessage(msgnum, 1); + if (msg != NULL) { + conf = strdup(msg->cm_fields[eMesageText]); + CM_Free(msg); + } + else { + conf = NULL; + } + } + + CtdlGetRoom(&CC->room, hold_rm); + + if (conf != NULL) do { + extract_token(buf, conf, 0, '\n', sizeof buf); + strcpy(conf, &conf[strlen(buf)+1]); + } while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) ); + + return(conf); +} + + +void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) { + CtdlWriteObject(SYSCONFIGROOM, sysconfname, sysconfdata, (strlen(sysconfdata)+1), NULL, 0, 1, 0); +} +