X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Finclude%2Fctdl_module.h;h=86255e2f304a410ed020e01ba689484b9a188b7d;hb=4db4fc48793f3680c5defd28ea32c97044a2b569;hp=5ea37bfe57be087cf445a513766bfc1000295102;hpb=b44a77a2aa913db5f48f01a8d58149c0df564684;p=citadel.git

diff --git a/citadel/include/ctdl_module.h b/citadel/include/ctdl_module.h
index 5ea37bfe5..86255e2f3 100644
--- a/citadel/include/ctdl_module.h
+++ b/citadel/include/ctdl_module.h
@@ -376,11 +376,39 @@ struct config {
 	int c_nntp_port;
 	int c_nntps_port;
 };
+struct configlen {
+	long c_nodename;
+	long c_fqdn;
+	long c_humannode;
+	long c_phonenum;
+	long c_twitroom;
+	long c_moreprompt;
+	long c_site_location;
+	long c_sysadm;
+	long c_niu_2;
+	long c_ip_addr;
+	long c_logpages;
+	long c_baseroom;
+	long c_aideroom;
+	long c_ldap_host;
+	long c_ldap_base_dn;
+	long c_ldap_bind_dn;
+	long c_ldap_bind_pw;
+	long c_journal_dest;
+	long c_default_cal_zone;
+	long c_funambol_host;
+	long c_funambol_source;
+	long c_funambol_auth;
+	long c_master_user;
+	long c_master_pass;
+	long c_pager_program;
+};
 
-#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))
+#define SET_CFGSTRBUF(which, buffer) configlen.which = safestrncpy(config.which, ChrPtr(buffer), sizeof(config.which))
+#define SET_CFGSTR(which, buffer) configlen.which = safestrncpy(config.which, buffer, sizeof(config.which))
 
 extern struct config config;
+extern struct configlen configlen;
 
 
 #define NODENAME		config.c_nodename
@@ -392,7 +420,7 @@ extern struct config config;
 #define TWITROOM		config.c_twitroom
 #define RESTRICT_INTERNET	config.c_restrict
 
-#define CFG_KEY(which) config.which, strlen(config.which)
+#define CFG_KEY(which) config.which, configlen.which
 
 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);