Removed remaining bits of funambol config from server

[citadel.git] / citadel / config.h

diff --git a/citadel/config.h b/citadel/config.h
index 79f24427439249371bf2d8650b2787180bb77b7c..2dc63c51f7b7efb61991402b7a4e5c07f8bda8dc 100644 (file)
--- a/citadel/config.h
+++ b/citadel/config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2016 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.
@@ -13,10 +13,6 @@
 #include "serv_extensions.h"
 #include "citadel_dirs.h"
 
-#define CtdlGetConfigInt(x)    atoi(CtdlGetConfigStr(x))
-#define CtdlGetConfigLong(x)   atol(CtdlGetConfigStr(x))
-
-
 
 
 /*
@@ -85,10 +81,10 @@ struct legacy_config {
        int c_pftcpdict_port;
        int c_managesieve_port;
        int c_auth_mode;
-       char c_funambol_host[256];
-       int c_funambol_port;
-       char c_funambol_source[256];
-       char c_funambol_auth[256];
+       char c_niu_8[256];
+       int c_niu_9;
+       char c_niu_10[256];
+       char c_niu_11[256];
        char c_rbl_at_greeting;
        char c_master_user[32];
        char c_master_pass[32];
@@ -112,9 +108,13 @@ void shutdown_config_system(void);
 void put_config(void);
 void CtdlSetConfigStr(char *, char *);
 char *CtdlGetConfigStr(char *);
+int CtdlGetConfigInt(char *);
+long CtdlGetConfigLong(char *);
 void CtdlSetConfigInt(char *key, int value);
 void CtdlSetConfigLong(char *key, long value);
+void CtdlDelConfig(char *key);
 
 char *CtdlGetSysConfig(char *sysconfname);
 void CtdlPutSysConfig(char *sysconfname, char *sysconfdata);
 void validate_config(void);
+void netcfg_keyname(char *, long);