/*
* Read and write the citadel.config file
*
- * Copyright (c) 1987-2015 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.
#include "config.h"
#include "ctdl_module.h"
-struct config config; // legacy configuration
-HashList *ctdlconfig = NULL; // new configuration
+struct config config;
+struct configlen configlen;
#define STR_NOT_EMPTY(CFG_FIELDNAME) if (IsEmptyStr(config.CFG_FIELDNAME)) \
syslog(LOG_EMERG, "configuration setting "#CFG_FIELDNAME" is empty, but must not - check your config!");
TEST_PORT(c_nntp_port, 119);
TEST_PORT(c_nntps_port, 563);
- if (getpwuid(ctdluid) == NULL) {
- syslog(LOG_EMERG, "The UID (%d) citadel is configured to use is not defined in your system (/etc/passwd?)!", ctdluid);
- }
+ if (config.c_ctdluid == 0)
+ syslog(LOG_EMERG, "citadel should not be configured to run as root! Check the value of c_ctdluid");
+ else if (getpwuid(CTDLUID) == NULL)
+ syslog(LOG_EMERG, "The UID (%d) citadel is configured to use is not defined in your system (/etc/passwd?)! Check the value of c_ctdluid", CTDLUID);
}
*/
void brand_new_installation_set_defaults(void) {
+ struct passwd *pw;
struct utsname my_utsname;
struct hostent *he;
/* 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, "<more>", 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, "<more>", 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;
+ if (config.c_ctdluid == 0) {
+ pw = getpwnam("citadel");
+ if (pw != NULL) {
+ config.c_ctdluid = pw->pw_uid;
+ }
+ }
+ if (config.c_ctdluid == 0) {
+ pw = getpwnam("bbs");
+ if (pw != NULL) {
+ config.c_ctdluid = pw->pw_uid;
+ }
+ }
+ if (config.c_ctdluid == 0) {
+ pw = getpwnam("guest");
+ if (pw != NULL) {
+ config.c_ctdluid = pw->pw_uid;
+ }
+ }
if (config.c_createax == 0) {
config.c_createax = 3;
}
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);
+}
/*
- * Called during the initialization of Citadel server.
+ * get_config() is called during the initialization of Citadel server.
* It verifies the system's integrity and reads citadel.config into memory.
*/
-void initialize_config_system(void) {
+void get_config(void) {
FILE *cfp;
int rv;
- ctdlconfig = NewHash(1, NULL);
if (chdir(ctdl_bbsbase_dir) != 0) {
fprintf(stderr,
);
}
fclose(cfp);
+ setcfglen();
}
else {
brand_new_installation_set_defaults();
-/*
- * Called when Citadel server is shutting down.
- * Clears out the config hash table.
- */
-void shutdown_config_system(void)
-{
- DeleteHash(&ctdlconfig);
-}
-
-
-
-/*
- * Set a system config value. Simple key/value here.
- */
-void CtdlSetConfigStr(char *key, char *value)
-{
- int key_len = strlen(key);
- int value_len = strlen(value);
-
- /* Save it in memory */
- Put(ctdlconfig, key, key_len, strdup(value), NULL);
-
- /* Also write it to the config database */
-
- int dbv_size = key_len + value_len + 2;
- char *dbv = malloc(dbv_size);
- strcpy(dbv, key);
- strcpy(&dbv[key_len + 1], value);
- cdb_store(CDB_CONFIG, key, key_len, dbv, dbv_size);
- free(dbv);
-}
-
-
-/*
- * Set a numeric system config value (long integer)
- */
-void CtdlSetConfigLong(char *key, long value)
-{
- char longstr[256];
- sprintf(longstr, "%ld", value);
- CtdlSetConfigStr(key, longstr);
-}
-
-
-/*
- * Set a numeric system config value (integer)
- */
-void CtdlSetConfigInt(char *key, int value)
-{
- char intstr[256];
- sprintf(intstr, "%d", value);
- CtdlSetConfigStr(key, intstr);
-}
-
-
-/*
- * Fetch a system config value. Caller does *not* own the returned value and may not alter it.
- */
-char *CtdlGetConfigStr(char *key)
-{
- char *value = NULL;
- struct cdbdata *cdb;
- int key_len = strlen(key);
-
- /* First look in memory */
- if (GetHash(ctdlconfig, key, key_len, (void *)&value))
- {
- return value;
- }
-
- /* Then look in the database. */
-
- cdb = cdb_fetch(CDB_CONFIG, key, key_len);
-
- if (cdb == NULL) { /* nope, not there either. */
- return(NULL);
- }
-
- /* Got it. Save it in memory for the next fetch. */
- value = strdup(cdb->ptr + key_len + 1); /* The key was stored there too; skip past it */
- cdb_free(cdb);
- Put(ctdlconfig, key, key_len, value, NULL);
- return value;
-}
-
-
-
-
-
-/**********************************************************************/
-
-
-
-
-
-
-
-
-
-
void CtdlGetSysConfigBackend(long msgnum, void *userdata) {
config_msgnum = msgnum;
}
conf = NULL;
}
else {
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1, 1);
if (msg != NULL) {
conf = strdup(msg->cm_fields[eMesageText]);
CM_Free(msg);