X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fsiteconfig.c;h=4fa5541b165ce364bd15ca8431a5aea31b51d387;hb=HEAD;hp=7a93d44af096e10b43b155c49a502584d88cc3bc;hpb=329fae6737e16938ee440d79bc89a03e4eb5268c;p=citadel.git

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index 7a93d44af..39e90e614 100644
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -1,19 +1,24 @@
 /*
  * Administrative screen for site-wide configuration
  *
- * Copyright (c) 1996-2012 by the citadel.org team
+ * Copyright (c) 1996-2024 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.
- *
- * 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.
+ * This program is open source software.  Use, duplication, or disclosure
+ * are subject to the terms of the GNU General Public License version 3.
  */
 
 #include "webcit.h"
-#include "webserver.h"
+
+
+/*
+ * Expiry policy for the autopurger
+ */
+#define EXPIRE_NEXTLEVEL        0       /* Inherit expiration policy    */
+#define EXPIRE_MANUAL           1       /* Don't expire messages at all */
+#define EXPIRE_NUMMSGS          2       /* Keep only latest n messages  */
+#define EXPIRE_AGE              3       /* Expire messages after n days */
+
+CtxType CTX_SRVLOG = CTX_NONE;
 
 HashList *ZoneHash = NULL;
 
@@ -26,29 +31,27 @@ ConstStr ExpirePolicyStrings[][2] = {
 	{ { CStrOf(mailboxespolicy)} , { strof(mailboxespolicy)"_value", sizeof(strof(mailboxespolicy)"_value") - 1 } }
 };
 
-void LoadExpirePolicy(GPEXWhichPolicy which)
-{
+
+void LoadExpirePolicy(GPEXWhichPolicy which) {
 	StrBuf *Buf;
-	wcsession *WCC = WC;
 	long State;
 	const char *Pos = NULL;
 
 	serv_printf("GPEX %s", ExpirePolicyStrings[which][0].Key);
 	Buf = NewStrBuf();
 	StrBuf_ServGetln(Buf);
-	WCC->Policy[which].loaded = 1;
 	if (GetServerStatus(Buf, &State) == 2) {
 		Pos = ChrPtr(Buf) + 4;
-		WCC->Policy[which].expire_mode = StrBufExtractNext_long(Buf, &Pos, '|');
-		WCC->Policy[which].expire_value = StrBufExtractNext_long(Buf, &Pos, '|');
+		WC->Policy[which].expire_mode = StrBufExtractNext_long(Buf, &Pos, '|');
+		WC->Policy[which].expire_value = StrBufExtractNext_long(Buf, &Pos, '|');
 	}
 	else if (State == 550)
 		AppendImportantMessage(_("Higher access is required to access this function."), -1);
 	FreeStrBuf(&Buf);
 }
 
-void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which)
-{
+
+void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which) {
 	StrBuf *Buf;
 	long State;
 
@@ -65,9 +68,8 @@ void SaveExpirePolicyFromHTTP(GPEXWhichPolicy which)
 	FreeStrBuf(&Buf);
 }
 
-int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
+
+int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP) {
 	GPEXWhichPolicy which;
 	int CompareWith;
 
@@ -76,33 +78,29 @@ int ConditionalExpire(StrBuf *Target, WCTemplputParams *TP)
 
 	LoadExpirePolicy(which);
 	
-	return WCC->Policy[which].expire_mode == CompareWith;
+	return WC->Policy[which].expire_mode == CompareWith;
 }
 
-void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP)
-{
+
+void tmplput_ExpireValue(StrBuf *Target, WCTemplputParams *TP) {
 	GPEXWhichPolicy which;
-	wcsession *WCC = WC;
 		
 	which = GetTemplateTokenNumber(Target, TP, 0, 0);
 	LoadExpirePolicy(which);
-	StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_value);
+	StrBufAppendPrintf(Target, "%d", WC->Policy[which].expire_value);
 }
 
 
-void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP)
-{
+void tmplput_ExpireMode(StrBuf *Target, WCTemplputParams *TP) {
 	GPEXWhichPolicy which;
-	wcsession *WCC = WC;
 		
 	which = GetTemplateTokenNumber(Target, TP, 2, 0);
 	LoadExpirePolicy(which);
-	StrBufAppendPrintf(Target, "%d", WCC->Policy[which].expire_mode);
+	StrBufAppendPrintf(Target, "%d", WC->Policy[which].expire_mode);
 }
 
 
-void LoadZoneFiles(void)
-{
+void LoadZoneFiles(void) {
 	icalarray *zones;
 	int z;
 	long len;
@@ -114,7 +112,7 @@ void LoadZoneFiles(void)
 	Put(ZoneHash, HKEY("UTC"), ZName, HFreeStrBuf);
 	zones = icaltimezone_get_builtin_timezones();
 	for (z = 0; z < zones->num_elements; ++z) {
-		/* syslog(9, "Location: %-40s tzid: %s\n",
+		/* syslog(LOG_DEBUG, "Location: %-40s tzid: %s\n",
 			icaltimezone_get_location(icalarray_element_at(zones, z)),
 			icaltimezone_get_tzid(icalarray_element_at(zones, z))
 		); */
@@ -129,6 +127,9 @@ void LoadZoneFiles(void)
 
 typedef struct _CfgMapping {
 	int type;
+	int min;
+	int max;
+	const char *defval;
 	const char *Key;
 	long len;
 } CfgMapping;
@@ -136,94 +137,97 @@ typedef struct _CfgMapping {
 #define CFG_STR 1
 #define CFG_YES 2
 #define CFG_NO 3
+#define CFG_INT 4
 
 CfgMapping ServerConfig[] = {
-	{CFG_STR, HKEY("c_nodename")},
-	{CFG_STR, HKEY("c_fqdn")},
-	{CFG_STR, HKEY("c_humannode")},
-	{CFG_STR, HKEY("c_phonenum")},
-	{CFG_YES, HKEY("c_creataide")},
-	{CFG_STR, HKEY("c_sleeping")},
-	{CFG_STR, HKEY("c_initax")},
-	{CFG_YES, HKEY("c_regiscall")},
-	{CFG_YES, HKEY("c_twitdetect")},
-	{CFG_STR, HKEY("c_twitroom")},
-	{CFG_STR, HKEY("c_moreprompt")},
-	{CFG_YES, HKEY("c_restrict")},
-	{CFG_STR, HKEY("c_bbs_city")},
-	{CFG_STR, HKEY("c_sysadm")},
-	{CFG_STR, HKEY("c_maxsessions")},
-	{CFG_STR, HKEY("reserved1")},
-	{CFG_STR, HKEY("c_userpurge")},
-	{CFG_STR, HKEY("c_roompurge")},
-	{CFG_STR, HKEY("c_logpages")},
-	{CFG_STR, HKEY("c_createax")},
-	{CFG_STR, HKEY("c_maxmsglen")},
-	{CFG_STR, HKEY("c_min_workers")},
-	{CFG_STR, HKEY("c_max_workers")},
-	{CFG_STR, HKEY("c_pop3_port")},
-	{CFG_STR, HKEY("c_smtp_port")},
-	{CFG_NO , HKEY("c_rfc822_strict_from")},	/* note: reverse bool */
-	{CFG_YES, HKEY("c_aide_zap")},
-	{CFG_STR, HKEY("c_imap_port")},
-	{CFG_STR, HKEY("c_net_freq")},
-	{CFG_YES, HKEY("c_disable_newu")},
-	{CFG_STR, HKEY("reserved2")},
-	{CFG_STR, HKEY("c_purge_hour")},
-	{CFG_STR, HKEY("c_ldap_host")},
-	{CFG_STR, HKEY("c_ldap_port")},
-	{CFG_STR, HKEY("c_ldap_base_dn")},
-	{CFG_STR, HKEY("c_ldap_bind_dn")},
-	{CFG_STR, HKEY("c_ldap_bind_pw")},
-	{CFG_STR, HKEY("c_ip_addr")},
-	{CFG_STR, HKEY("c_msa_port")},
-	{CFG_STR, HKEY("c_imaps_port")},
-	{CFG_STR, HKEY("c_pop3s_port")},
-	{CFG_STR, HKEY("c_smtps_port")},
-	{CFG_YES, HKEY("c_enable_fulltext")},
-	{CFG_YES, HKEY("c_auto_cull")},
-	{CFG_YES, HKEY("c_instant_expunge")},
-	{CFG_YES, HKEY("c_allow_spoofing")},
-	{CFG_YES, HKEY("c_journal_email")},
-	{CFG_YES, HKEY("c_journal_pubmsgs")},
-	{CFG_STR, HKEY("c_journal_dest")},
-	{CFG_STR, HKEY("c_default_cal_zone")},
-	{CFG_STR, HKEY("c_pftcpdict_port")},
-	{CFG_STR, HKEY("c_mgesve_port")},
-	{CFG_STR, HKEY("c_auth_mode")},
-	{CFG_STR, HKEY("c_funambol_host")},
-	{CFG_STR, HKEY("c_funambol_port")},
-	{CFG_STR, HKEY("c_funambol_source")},
-	{CFG_STR, HKEY("c_funambol_auth")},
-	{CFG_YES, HKEY("c_rbl_at_greeting")},
-	{CFG_STR, HKEY("c_master_user")},
-	{CFG_STR, HKEY("c_master_pass")},
-	{CFG_STR, HKEY("c_pager_program")},
-	{CFG_YES, HKEY("c_imap_keep_from")},
-	{CFG_STR, HKEY("c_xmpp_c2s_port")},
-	{CFG_STR, HKEY("c_xmpp_s2s_port")},
-	{CFG_STR, HKEY("c_pop3_fetch")},
-	{CFG_STR, HKEY("c_pop3_fastest")},
-	{CFG_YES, HKEY("c_spam_flag_only")},
-	{CFG_YES, HKEY("c_guest_logins")}
+	{CFG_STR, 0, 0, "", HKEY("c_nodename")},
+	{CFG_STR, 0, 0, "", HKEY("c_fqdn")},
+	{CFG_STR, 0, 0, "", HKEY("c_humannode")},
+	{CFG_STR, 0, 0, "", HKEY("c_phonenum")},
+	{CFG_YES, 0, 0, "", HKEY("c_creataide")},
+	{CFG_STR, 0, 0, "", HKEY("c_sleeping")},
+	{CFG_STR, 0, 0, "", HKEY("c_initax")},
+	{CFG_YES, 0, 0, "", HKEY("c_regiscall")},
+	{CFG_YES, 0, 0, "", HKEY("c_twitdetect")},
+	{CFG_STR, 0, 0, "", HKEY("c_twitroom")},
+	{CFG_STR, 0, 0, "", HKEY("c_moreprompt")},
+	{CFG_YES, 0, 0, "", HKEY("c_restrict")},
+	{CFG_STR, 0, 0, "", HKEY("c_bbs_city")},
+	{CFG_STR, 0, 0, "", HKEY("c_sysadm")},
+	{CFG_STR, 0, 0, "", HKEY("c_maxsessions")},
+	{CFG_STR, 0, 0, "", HKEY("reserved1")},
+	{CFG_STR, 0, 0, "", HKEY("c_userpurge")},
+	{CFG_STR, 0, 0, "", HKEY("c_roompurge")},
+	{CFG_STR, 0, 0, "", HKEY("c_logpages")},
+	{CFG_STR, 0, 0, "", HKEY("c_createax")},
+	{CFG_STR, 0, 0, "", HKEY("c_maxmsglen")},
+	{CFG_STR, 0, 0, "", HKEY("c_min_workers")},
+	{CFG_STR, 0, 0, "", HKEY("c_max_workers")},
+	{CFG_STR, 0, 0, "", HKEY("c_pop3_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_smtp_port")},
+	{CFG_INT, CFG_SMTP_FROM_FILTERALL, CFG_SMTP_FROM_REJECT, "0", HKEY("c_rfc822_strict_from")},	
+	{CFG_YES, 0, 0, "", HKEY("c_aide_zap")},
+	{CFG_STR, 0, 0, "", HKEY("c_imap_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_net_freq")},
+	{CFG_YES, 0, 0, "", HKEY("c_disable_newu")},
+	{CFG_STR, 0, 0, "", HKEY("reserved2")},
+	{CFG_STR, 0, 0, "", HKEY("c_purge_hour")},
+	{CFG_STR, 0, 0, "", HKEY("c_ldap_host")},
+	{CFG_STR, 0, 0, "", HKEY("c_ldap_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_ldap_base_dn")},
+	{CFG_STR, 0, 0, "", HKEY("c_ldap_bind_dn")},
+	{CFG_STR, 0, 0, "", HKEY("c_ldap_bind_pw")},
+	{CFG_STR, 0, 0, "", HKEY("c_ip_addr")},
+	{CFG_STR, 0, 0, "", HKEY("c_msa_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_imaps_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_pop3s_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_smtps_port")},
+	{CFG_YES, 0, 0, "", HKEY("c_enable_fulltext")},
+	{CFG_YES, 0, 0, "", HKEY("c_auto_cull")},
+	{CFG_YES, 0, 0, "", HKEY("reserved3")},
+	{CFG_YES, 0, 0, "", HKEY("c_allow_spoofing")},
+	{CFG_YES, 0, 0, "", HKEY("c_journal_email")},
+	{CFG_YES, 0, 0, "", HKEY("c_journal_pubmsgs")},
+	{CFG_STR, 0, 0, "", HKEY("c_journal_dest")},
+	{CFG_STR, 0, 0, "", HKEY("c_default_cal_zone")},
+	{CFG_STR, 0, 0, "", HKEY("c_pftcpdict_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_mgesve_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_auth_mode")},
+	{CFG_STR, 0, 0, "", HKEY("c_funambol_host")},
+	{CFG_STR, 0, 0, "", HKEY("c_funambol_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_funambol_source")},
+	{CFG_STR, 0, 0, "", HKEY("c_funambol_auth")},
+	{CFG_YES, 0, 0, "", HKEY("c_rbl_at_greeting")},
+	{CFG_STR, 0, 0, "", HKEY("c_master_user")},
+	{CFG_STR, 0, 0, "", HKEY("c_master_pass")},
+	{CFG_STR, 0, 0, "", HKEY("c_pager_program")},
+	{CFG_YES, 0, 0, "", HKEY("c_imap_keep_from")},
+	{CFG_STR, 0, 0, "", HKEY("c_xmpp_c2s_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_xmpp_s2s_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_pop3_fetch")},
+	{CFG_STR, 0, 0, "", HKEY("c_pop3_fastest")},
+	{CFG_YES, 0, 0, "", HKEY("c_spam_flag_only")},
+	{CFG_YES, 0, 0, "", HKEY("c_guest_logins")},
+	{CFG_STR, 0, 0, "", HKEY("c_port_number")},
+	{CFG_STR, 0, 0, "", HKEY("c_ctdluid")},
+	{CFG_STR, 0, 0, "", HKEY("c_nntp_port")},
+	{CFG_STR, 0, 0, "", HKEY("c_nntps_port")},
+	{CFG_YES, 0, 0, "", HKEY("smtp_advertise_starttls")}
 };
 
 
-
 /*
  *  display all configuration items
  */
-void load_siteconfig(void)
-{
-	wcsession *WCC = WC;
+void load_siteconfig(void) {
 	StrBuf *Buf;
 	HashList *Cfg;
 	long len;
 	int i, j;
 	
-	if (WCC->ServCfg == NULL)
-		WCC->ServCfg = NewHash(1, NULL);
-	Cfg = WCC->ServCfg;
+	if (WC->ServCfg == NULL)
+		WC->ServCfg = NewHash(1, NULL);
+	Cfg = WC->ServCfg;
 
 	Buf = NewStrBuf();
 
@@ -252,8 +256,9 @@ void load_siteconfig(void)
 			Buf = NewStrBuf();
 		}
 		else {
-			if (j == 0)
-				AppendImportantMessage(_("WARNING: Failed to parse Server Config; do you run a to new citserver?"), -1);
+			if (j == 0) {
+				syslog(LOG_WARNING, "The server sent more configuration data than this version of webcit is capable of changing.  Unknown configuration values will remain unchanged.");
+			}
 			j++;
 		}
 	}
@@ -266,14 +271,11 @@ void load_siteconfig(void)
 }
 
 
-
 /*
  * parse siteconfig changes 
  */
-void siteconfig(void)
-{
-	wcsession *WCC = WC;
-	int i;
+void siteconfig(void) {
+	int i, value;
 	StrBuf *Line;
 
 	if (strlen(bstr("ok_button")) == 0) {
@@ -308,6 +310,14 @@ void siteconfig(void)
 					  ServerConfig[i].len) ?
 				  "0" : "1");
 			break;
+		case CFG_INT:
+			value = IBstr(ServerConfig[i].Key, 
+				      ServerConfig[i].len);
+			if ((value < ServerConfig[i].min) ||
+			    (value > ServerConfig[i].max))
+				value = atol(ServerConfig[i].defval);
+			serv_printf("%d", value);
+			break;
 		}
 	}
         serv_puts("000");
@@ -315,39 +325,38 @@ void siteconfig(void)
 	SaveExpirePolicyFromHTTP(sitepolicy);
 	SaveExpirePolicyFromHTTP(mailboxespolicy);
 
-	FreeStrBuf(&WCC->serv_info->serv_default_cal_zone);
-	WCC->serv_info->serv_default_cal_zone = NewStrBufDup(sbstr("c_default_cal_zone"));
+	FreeStrBuf(&WC->serv_info->serv_default_cal_zone);
+	WC->serv_info->serv_default_cal_zone = NewStrBufDup(sbstr("c_default_cal_zone"));
 
 	AppendImportantMessage(_("Your system configuration has been updated."), -1);
-	DeleteHash(&WCC->ServCfg);
+	DeleteHash(&WC->ServCfg);
 	display_aide_menu();
 }
 
-void tmplput_servcfg(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
+
+// if WebCit Classic wasn't obsolete we would replace this with a "CONF GETVAL" type of thing
+void tmplput_servcfg(StrBuf *Target, WCTemplputParams *TP) {
 	void *vBuf;
 	StrBuf *Buf;
 
-	if (WCC->is_aide) {
-		if (WCC->ServCfg == NULL)
+	if (WC->is_aide) {
+		if (WC->ServCfg == NULL)
 			load_siteconfig();
-		GetHash(WCC->ServCfg, TKEY(0), &vBuf);
+		GetHash(WC->ServCfg, TKEY(0), &vBuf);
 		Buf = (StrBuf*) vBuf;
 		StrBufAppendTemplate(Target, TP, Buf, 1);
 	}
 }
 
-int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
+
+int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP) {
 	void *vBuf;
 	StrBuf *Buf;
 
-	if (WCC->is_aide) {
-		if (WCC->ServCfg == NULL)
+	if (WC->is_aide) {
+		if (WC->ServCfg == NULL)
 			load_siteconfig();
-		GetHash(WCC->ServCfg, TKEY(2), &vBuf);
+		GetHash(WC->ServCfg, TKEY(2), &vBuf);
 		if (vBuf == NULL) return 0;
 		Buf = (StrBuf*) vBuf;
 		if (TP->Tokens->nParameters == 3) {
@@ -370,17 +379,15 @@ int ConditionalServCfg(StrBuf *Target, WCTemplputParams *TP)
 	else return 0;
 }
 
-int ConditionalServCfgCTXStrBuf(StrBuf *Target, WCTemplputParams *TP)
-{
-	wcsession *WCC = WC;
+int ConditionalServCfgCTXStrBuf(StrBuf *Target, WCTemplputParams *TP) {
 	void *vBuf;
 	StrBuf *Buf;
-	StrBuf *ZoneToCheck = (StrBuf*) CTX;
+	StrBuf *ZoneToCheck = (StrBuf*) CTX(CTX_STRBUF);
 
-	if ((WCC->is_aide) || (ZoneToCheck == NULL)) {
-		if (WCC->ServCfg == NULL)
+	if ((WC->is_aide) || (ZoneToCheck == NULL)) {
+		if (WC->ServCfg == NULL)
 			load_siteconfig();
-		GetHash(WCC->ServCfg, TKEY(2), &vBuf);
+		GetHash(WC->ServCfg, TKEY(2), &vBuf);
 		if (vBuf == NULL) return 0;
 		Buf = (StrBuf*) vBuf;
 
@@ -407,13 +414,15 @@ void DeleteLogStatusStruct(void *v)
 
 void tmplput_servcfg_LogName(StrBuf *Target, WCTemplputParams *TP)
 {
-        LogStatusStruct *Stat = (LogStatusStruct*) CTX;
+        LogStatusStruct *Stat = (LogStatusStruct*) CTX(CTX_SRVLOG);
 	StrBufAppendTemplate(Target, TP, Stat->Name, 1);
 }
 
+
+
 int ConditionalServCfgThisLogEnabled(StrBuf *Target, WCTemplputParams *TP)
 {
-        LogStatusStruct *Stat = (LogStatusStruct*) CTX;
+        LogStatusStruct *Stat = (LogStatusStruct*) CTX(CTX_SRVLOG);
 	return Stat->Enable;
 }
 
@@ -460,11 +469,12 @@ void
 InitModule_SITECONFIG
 (void)
 {
+	RegisterCTX(CTX_SRVLOG);
 	WebcitAddUrlHandler(HKEY("siteconfig"), "", 0, siteconfig, CTX_NONE);
 
 	RegisterNamespace("SERV:CFG", 1, 2, tmplput_servcfg, NULL, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERVCFG"), 3, ConditionalServCfg, CTX_NONE);
-	RegisterConditional(HKEY("COND:SERVCFG:CTXSTRBUF"), 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF);
+	RegisterConditional("COND:SERVCFG", 3, ConditionalServCfg, CTX_NONE);
+	RegisterConditional("COND:SERVCFG:CTXSTRBUF", 4, ConditionalServCfgCTXStrBuf, CTX_STRBUF);
 	RegisterIterator("PREF:ZONE", 0, ZoneHash, NULL, NULL, NULL, CTX_STRBUF, CTX_NONE, IT_NOFLAG);
 
 	REGISTERTokenParamDefine(roompolicy);
@@ -477,11 +487,15 @@ InitModule_SITECONFIG
 	REGISTERTokenParamDefine(EXPIRE_NUMMSGS);
 	REGISTERTokenParamDefine(EXPIRE_AGE);
 
-	RegisterConditional(HKEY("COND:EXPIRE:MODE"), 2, ConditionalExpire, CTX_NONE);
+	REGISTERTokenParamDefine(CFG_SMTP_FROM_FILTERALL);
+	REGISTERTokenParamDefine(CFG_SMTP_FROM_NOFILTER);
+	REGISTERTokenParamDefine(CFG_SMTP_FROM_CORRECT);
+	REGISTERTokenParamDefine(CFG_SMTP_FROM_REJECT);
+
+	RegisterConditional("COND:EXPIRE:MODE", 2, ConditionalExpire, CTX_NONE);
 	RegisterNamespace("EXPIRE:VALUE", 1, 2, tmplput_ExpireValue, NULL, CTX_NONE);
 	RegisterNamespace("EXPIRE:MODE", 1, 2, tmplput_ExpireMode, NULL, CTX_NONE);
-
-	RegisterConditional(HKEY("COND:SERVCFG:THISLOGENABLE"), 4, ConditionalServCfgThisLogEnabled, CTX_SRVLOG);
+	RegisterConditional("COND:SERVCFG:THISLOGENABLE", 4, ConditionalServCfgThisLogEnabled, CTX_SRVLOG);
 	RegisterIterator("SERVCFG:LOGENABLE", 0, NULL, iterate_GetSrvLogEnable, NULL, DeleteHash, CTX_SRVLOG, CTX_NONE, IT_NOFLAG);
 	RegisterNamespace("SERVCFG:LOGNAME", 0, 1, tmplput_servcfg_LogName, NULL, CTX_SRVLOG);
 }