From a70d92c76251e9a8a3f16ab1b2783129ead420b7 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 30 Apr 2015 10:05:09 -0400 Subject: [PATCH] CONF GET command ported to new config system --- citadel/control.c | 137 +++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 69 deletions(-) diff --git a/citadel/control.c b/citadel/control.c index 3fd141983..c4612bb91 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -22,7 +22,6 @@ #include "user_ops.h" struct CitControl CitControl; -extern struct config config; FILE *control_fp = NULL; long control_highest_user = 0; @@ -309,44 +308,44 @@ void cmd_conf(char *argbuf) extract_token(cmd, argbuf, 0, '|', sizeof cmd); if (!strcasecmp(cmd, "GET")) { cprintf("%d Configuration...\n", LISTING_FOLLOWS); - cprintf("%s\n", config.c_nodename); - cprintf("%s\n", config.c_fqdn); - cprintf("%s\n", config.c_humannode); + cprintf("%s\n", CtdlGetConfigStr("c_nodename")); + cprintf("%s\n", CtdlGetConfigStr("c_fqdn")); + cprintf("%s\n", CtdlGetConfigStr("c_humannode")); cprintf("xxx\n"); /* placeholder -- field no longer in use */ - cprintf("%d\n", config.c_creataide); - cprintf("%d\n", config.c_sleeping); - cprintf("%d\n", config.c_initax); - cprintf("%d\n", config.c_regiscall); - cprintf("%d\n", config.c_twitdetect); - cprintf("%s\n", config.c_twitroom); - cprintf("%s\n", config.c_moreprompt); - cprintf("%d\n", config.c_restrict); - cprintf("%s\n", config.c_site_location); - cprintf("%s\n", config.c_sysadm); - cprintf("%d\n", config.c_maxsessions); + cprintf("%d\n", CtdlGetConfigInt("c_creataide")); + cprintf("%d\n", CtdlGetConfigInt("c_sleeping")); + cprintf("%d\n", CtdlGetConfigInt("c_initax")); + cprintf("%d\n", CtdlGetConfigInt("c_regiscall")); + cprintf("%d\n", CtdlGetConfigInt("c_twitdetect")); + cprintf("%s\n", CtdlGetConfigStr("c_twitroom")); + cprintf("%s\n", CtdlGetConfigStr("c_moreprompt")); + cprintf("%d\n", CtdlGetConfigInt("c_restrict")); + cprintf("%s\n", CtdlGetConfigStr("c_site_location")); + cprintf("%s\n", CtdlGetConfigStr("c_sysadm")); + cprintf("%d\n", CtdlGetConfigInt("c_maxsessions")); cprintf("xxx\n"); /* placeholder -- field no longer in use */ - cprintf("%d\n", config.c_userpurge); - cprintf("%d\n", config.c_roompurge); - cprintf("%s\n", config.c_logpages); - cprintf("%d\n", config.c_createax); - cprintf("%ld\n", config.c_maxmsglen); - cprintf("%d\n", config.c_min_workers); - cprintf("%d\n", config.c_max_workers); - cprintf("%d\n", config.c_pop3_port); - cprintf("%d\n", config.c_smtp_port); - cprintf("%d\n", config.c_rfc822_strict_from); - cprintf("%d\n", config.c_aide_zap); - cprintf("%d\n", config.c_imap_port); - cprintf("%ld\n", config.c_net_freq); - cprintf("%d\n", config.c_disable_newu); + cprintf("%d\n", CtdlGetConfigInt("c_userpurge")); + cprintf("%d\n", CtdlGetConfigInt("c_roompurge")); + cprintf("%s\n", CtdlGetConfigStr("c_logpages")); + cprintf("%d\n", CtdlGetConfigInt("c_createax")); + cprintf("%ld\n", CtdlGetConfigLong("c_maxmsglen")); + cprintf("%d\n", CtdlGetConfigInt("c_min_workers")); + cprintf("%d\n", CtdlGetConfigInt("c_max_workers")); + cprintf("%d\n", CtdlGetConfigInt("c_pop3_port")); + cprintf("%d\n", CtdlGetConfigInt("c_smtp_port")); + cprintf("%d\n", CtdlGetConfigInt("c_rfc822_strict_from")); + cprintf("%d\n", CtdlGetConfigInt("c_aide_zap")); + cprintf("%d\n", CtdlGetConfigInt("c_imap_port")); + cprintf("%ld\n", CtdlGetConfigLong("c_net_freq")); + cprintf("%d\n", CtdlGetConfigInt("c_disable_newu")); cprintf("1\n"); /* niu */ - cprintf("%d\n", config.c_purge_hour); + cprintf("%d\n", CtdlGetConfigInt("c_purge_hour")); #ifdef HAVE_LDAP - cprintf("%s\n", config.c_ldap_host); - cprintf("%d\n", config.c_ldap_port); - cprintf("%s\n", config.c_ldap_base_dn); - cprintf("%s\n", config.c_ldap_bind_dn); - cprintf("%s\n", config.c_ldap_bind_pw); + cprintf("%s\n", CtdlGetConfigStr("c_ldap_host")); + cprintf("%d\n", CtdlGetConfigInt("c_ldap_port")); + cprintf("%s\n", CtdlGetConfigStr("c_ldap_base_dn")); + cprintf("%s\n", CtdlGetConfigStr("c_ldap_bind_dn")); + cprintf("%s\n", CtdlGetConfigStr("c_ldap_bind_pw")); #else cprintf("\n"); cprintf("0\n"); @@ -354,41 +353,41 @@ void cmd_conf(char *argbuf) cprintf("\n"); cprintf("\n"); #endif - cprintf("%s\n", config.c_ip_addr); - cprintf("%d\n", config.c_msa_port); - cprintf("%d\n", config.c_imaps_port); - cprintf("%d\n", config.c_pop3s_port); - cprintf("%d\n", config.c_smtps_port); - cprintf("%d\n", config.c_enable_fulltext); - cprintf("%d\n", config.c_auto_cull); + cprintf("%s\n", CtdlGetConfigStr("c_ip_addr")); + cprintf("%d\n", CtdlGetConfigInt("c_msa_port")); + cprintf("%d\n", CtdlGetConfigInt("c_imaps_port")); + cprintf("%d\n", CtdlGetConfigInt("c_pop3s_port")); + cprintf("%d\n", CtdlGetConfigInt("c_smtps_port")); + cprintf("%d\n", CtdlGetConfigInt("c_enable_fulltext")); + cprintf("%d\n", CtdlGetConfigInt("c_auto_cull")); cprintf("1\n"); - cprintf("%d\n", config.c_allow_spoofing); - cprintf("%d\n", config.c_journal_email); - cprintf("%d\n", config.c_journal_pubmsgs); - cprintf("%s\n", config.c_journal_dest); - cprintf("%s\n", config.c_default_cal_zone); - cprintf("%d\n", config.c_pftcpdict_port); - cprintf("%d\n", config.c_managesieve_port); - cprintf("%d\n", config.c_auth_mode); - cprintf("%s\n", config.c_funambol_host); - cprintf("%d\n", config.c_funambol_port); - cprintf("%s\n", config.c_funambol_source); - cprintf("%s\n", config.c_funambol_auth); - cprintf("%d\n", config.c_rbl_at_greeting); - cprintf("%s\n", config.c_master_user); - cprintf("%s\n", config.c_master_pass); - cprintf("%s\n", config.c_pager_program); - cprintf("%d\n", config.c_imap_keep_from); - cprintf("%d\n", config.c_xmpp_c2s_port); - cprintf("%d\n", config.c_xmpp_s2s_port); - cprintf("%ld\n", config.c_pop3_fetch); - cprintf("%ld\n", config.c_pop3_fastest); - cprintf("%d\n", config.c_spam_flag_only); - cprintf("%d\n", config.c_guest_logins); - cprintf("%d\n", config.c_port_number); - cprintf("%d\n", ctdluid); - cprintf("%d\n", config.c_nntp_port); - cprintf("%d\n", config.c_nntps_port); + cprintf("%d\n", CtdlGetConfigInt("c_allow_spoofing")); + cprintf("%d\n", CtdlGetConfigInt("c_journal_email")); + cprintf("%d\n", CtdlGetConfigInt("c_journal_pubmsgs")); + cprintf("%s\n", CtdlGetConfigStr("c_journal_dest")); + cprintf("%s\n", CtdlGetConfigStr("c_default_cal_zone")); + cprintf("%d\n", CtdlGetConfigInt("c_pftcpdict_port")); + cprintf("%d\n", CtdlGetConfigInt("c_managesieve_port")); + cprintf("%d\n", CtdlGetConfigInt("c_auth_mode")); + cprintf("%s\n", CtdlGetConfigStr("c_funambol_host")); + cprintf("%d\n", CtdlGetConfigInt("c_funambol_port")); + cprintf("%s\n", CtdlGetConfigStr("c_funambol_source")); + cprintf("%s\n", CtdlGetConfigStr("c_funambol_auth")); + cprintf("%d\n", CtdlGetConfigInt("c_rbl_at_greeting")); + cprintf("%s\n", CtdlGetConfigStr("c_master_user")); + cprintf("%s\n", CtdlGetConfigStr("c_master_pass")); + cprintf("%s\n", CtdlGetConfigStr("c_pager_program")); + cprintf("%d\n", CtdlGetConfigInt("c_imap_keep_from")); + cprintf("%d\n", CtdlGetConfigInt("c_xmpp_c2s_port")); + cprintf("%d\n", CtdlGetConfigInt("c_xmpp_s2s_port")); + cprintf("%ld\n", CtdlGetConfigLong("c_pop3_fetch")); + cprintf("%ld\n", CtdlGetConfigLong("c_pop3_fastest")); + cprintf("%d\n", CtdlGetConfigInt("c_spam_flag_only")); + cprintf("%d\n", CtdlGetConfigInt("c_guest_logins")); + cprintf("%d\n", CtdlGetConfigInt("c_port_number")); + cprintf("%d\n", ctdluid); + cprintf("%d\n", CtdlGetConfigInt("c_nntp_port")); + cprintf("%d\n", CtdlGetConfigInt("c_nntps_port")); cprintf("000\n"); } -- 2.30.2