X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finclude%2Fctdl_module.h;fp=citadel%2Finclude%2Fctdl_module.h;h=05a5a7037b80f9f6609222898fe4a7b6a7d6ed0e;hb=1ce87e9f74acae1f6c294bc19189542b859a466b;hp=744e64fd3d19f75512f25af9a93361d4460933ad;hpb=a70d92c76251e9a8a3f16ab1b2783129ead420b7;p=citadel.git

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 744e64fd3..05a5a7037 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -293,23 +293,14 @@ enum {
  */
 void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, const char *search_string, const char *func_name);
 
-
-#define SET_CFGSTRBUF(which, buffer) safestrncpy(config.which, ChrPtr(buffer), sizeof(config.which))
-#define SET_CFGSTR(which, buffer) safestrncpy(config.which, buffer, sizeof(config.which))
-
-extern struct config config;
-
-
-#define NODENAME		config.c_nodename
-#define FQDN			config.c_fqdn
+#define NODENAME		CtdlGetConfigStr("c_nodename")
+#define FQDN			CtdlGetConfigStr("c_fqdn")
 #define CTDLUID			ctdluid
-#define CREATAIDE		config.c_creataide
-#define REGISCALL		config.c_regiscall
-#define TWITDETECT		config.c_twitdetect
-#define TWITROOM		config.c_twitroom
-#define RESTRICT_INTERNET	config.c_restrict
-
-#define CFG_KEY(which) config.which, strlen(config.which)
+#define CREATAIDE		CtdlGetConfigInt("c_creataide")
+#define REGISCALL		CtdlGetConfigInt("c_regiscall")
+#define TWITDETECT		CtdlGetConfigInt("c_twitdetect")
+#define TWITROOM		CtdlGetConfigStr("c_twitroom")
+#define RESTRICT_INTERNET	CtdlGetConfigInt("c_restrict")
 
 typedef void (*CfgLineParser)(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *rncfg);
 typedef void (*CfgLineSerializer)(const CfgLineType *ThisOne, StrBuf *OuptputBuffer, OneRoomNetCfg *rncfg, RoomNetCfgLine *data);