Fix default landing mechanism

[citadel.git] / webcit / siteconfig.c

diff --git a/webcit/siteconfig.c b/webcit/siteconfig.c
index f755b54f9f9a1626ffee39979c27604975230e71..ecfc0cc6575dd062b69e97ee2a13833fab039736 100644 (file)
--- a/webcit/siteconfig.c
+++ b/webcit/siteconfig.c
@@ -115,7 +115,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))
                ); */
@@ -187,7 +187,7 @@ CfgMapping ServerConfig[] = {
        {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("c_instant_expunge")},
+       {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")},
@@ -478,8 +478,8 @@ InitModule_SITECONFIG
        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);
@@ -497,11 +497,11 @@ InitModule_SITECONFIG
        REGISTERTokenParamDefine(CFG_SMTP_FROM_CORRECT);
        REGISTERTokenParamDefine(CFG_SMTP_FROM_REJECT);
 
-       RegisterConditional(HKEY("COND:EXPIRE:MODE"), 2, ConditionalExpire, CTX_NONE);
+       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);
 }