From 6cd4b62a62098566ed73d7662d22e29fc509b9f3 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Sun, 30 Jul 2017 18:57:48 -0400 Subject: [PATCH] Removed remaining bits of funambol config from server --- citadel/Makefile.in | 4 +-- citadel/config.c | 4 --- citadel/config.h | 8 +++--- citadel/control.c | 16 +++++------ citadel/debian/citadel-server.install | 1 - citadel/funambol_newmail_soap.xml | 40 --------------------------- citadel/include/citadel_dirs.h | 2 -- citadel/utillib/citadel_dirs.c | 7 ----- 8 files changed, 14 insertions(+), 68 deletions(-) delete mode 100644 citadel/funambol_newmail_soap.xml diff --git a/citadel/Makefile.in b/citadel/Makefile.in index 6f8a27d6f..34458a61c 100644 --- a/citadel/Makefile.in +++ b/citadel/Makefile.in @@ -214,7 +214,7 @@ install-data: network/systems; do \ $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \ done - @for i in funambol_newmail_soap.xml notify_about_newmail.js public_clients citadel_urlshorteners.rc \ + @for i in notify_about_newmail.js public_clients citadel_urlshorteners.rc \ `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \ @@ -241,7 +241,7 @@ install-data-new: done $(srcdir)/mkinstalldirs $(DESTDIR)$(HELP_DIR)/help - @for i in funambol_newmail_soap.xml notify_about_newmail.js \ + @for i in notify_about_newmail.js \ `find $(srcdir)/help -type f | grep -v .svn`; do \ echo $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \ $(INSTALL_DATA) $$i $(DESTDIR)$(HELP_DIR)/$$i; \ diff --git a/citadel/config.c b/citadel/config.c index 76a342c7a..d9eee63e7 100644 --- a/citadel/config.c +++ b/citadel/config.c @@ -207,10 +207,6 @@ void migrate_legacy_config(struct legacy_config *lconfig) CtdlSetConfigInt( "c_pftcpdict_port" , lconfig->c_pftcpdict_port ); CtdlSetConfigInt( "c_managesieve_port" , lconfig->c_managesieve_port ); CtdlSetConfigInt( "c_auth_mode" , lconfig->c_auth_mode ); - CtdlSetConfigStr( "c_funambol_host" , lconfig->c_funambol_host ); - CtdlSetConfigInt( "c_funambol_port" , lconfig->c_funambol_port ); - CtdlSetConfigStr( "c_funambol_source" , lconfig->c_funambol_source ); - CtdlSetConfigStr( "c_funambol_auth" , lconfig->c_funambol_auth ); CtdlSetConfigInt( "c_rbl_at_greeting" , lconfig->c_rbl_at_greeting ); CtdlSetConfigStr( "c_master_user" , lconfig->c_master_user ); CtdlSetConfigStr( "c_master_pass" , lconfig->c_master_pass ); diff --git a/citadel/config.h b/citadel/config.h index 8419a8c79..2dc63c51f 100644 --- a/citadel/config.h +++ b/citadel/config.h @@ -81,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]; diff --git a/citadel/control.c b/citadel/control.c index ef9a27fed..f541f982d 100644 --- a/citadel/control.c +++ b/citadel/control.c @@ -308,10 +308,10 @@ void cmd_conf(char *argbuf) cprintf("%d\n", CtdlGetConfigInt("c_pftcpdict_port")); cprintf("%d\n", CtdlGetConfigInt("c_managesieve_port")); cprintf("%d\n", CtdlGetConfigInt("c_auth_mode")); - cprintf("%s\n", CtdlGetConfigStr("c_funambol_host")); - cprintf("%d\n", CtdlGetConfigInt("c_funambol_port")); - cprintf("%s\n", CtdlGetConfigStr("c_funambol_source")); - cprintf("%s\n", CtdlGetConfigStr("c_funambol_auth")); + cprintf("\n"); + cprintf("\n"); + cprintf("\n"); + cprintf("\n"); cprintf("%d\n", CtdlGetConfigInt("c_rbl_at_greeting")); cprintf("%s\n", CtdlGetConfigStr("c_master_user")); cprintf("%s\n", CtdlGetConfigStr("c_master_pass")); @@ -518,16 +518,16 @@ void cmd_conf(char *argbuf) CtdlSetConfigInt("c_auth_mode", atoi(buf)); break; case 53: - CtdlSetConfigStr("c_funambol_host", buf); + /* niu */ break; case 54: - CtdlSetConfigInt("c_funambol_port", atoi(buf)); + /* niu */ break; case 55: - CtdlSetConfigStr("c_funambol_source", buf); + /* niu */ break; case 56: - CtdlSetConfigStr("c_funambol_auth", buf); + /* niu */ break; case 57: CtdlSetConfigInt("c_rbl_at_greeting", confbool(buf)); diff --git a/citadel/debian/citadel-server.install b/citadel/debian/citadel-server.install index 191d856d1..1676e27f9 100644 --- a/citadel/debian/citadel-server.install +++ b/citadel/debian/citadel-server.install @@ -2,7 +2,6 @@ etc/citadel/mail.aliases etc/citadel/public_clients etc/citadel/citadel_urlshorteners.rc usr/share/citadel-server/help -usr/share/citadel-server/funambol_newmail_soap.xml etc/citadel/messages usr/lib/citadel-server/ctdlmigrate usr/lib/citadel-server/setup diff --git a/citadel/funambol_newmail_soap.xml b/citadel/funambol_newmail_soap.xml deleted file mode 100644 index 1656c38b2..000000000 --- a/citadel/funambol_newmail_soap.xml +++ /dev/null @@ -1,40 +0,0 @@ - -^notifyuser -<java version="1.5.0_13" class="java.beans.XMLDecoder"> - <array class="com.funambol.framework.core.Alert" length="1"> - <void index="0"> - <object class="com.funambol.framework.core.Alert"> - <void property="cmdID"> - <object class="com.funambol.framework.core.CmdID"/> - </void> - <void property="data"> - <int>206</int> - </void> - <void property="items"> - <void method="add"> - <object class="com.funambol.framework.core.Item"> - <void property="meta"> - <object class="com.funambol.framework.core.Meta"> - <void property="metInf"> - <void property="type"> - <string>application/vnd.omads-email+xml</string> - </void> - </void> - </object> - </void> - <void property="target"> - <object class="com.funambol.framework.core.Target"> - <void property="locURI"> - <string>^syncsource</string> - </void> - </object> - </void> - </object> - </void> - </void> - </object> - </void> - </array> -</java> - -1 diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h index e417ed35b..86b7310dd 100644 --- a/citadel/include/citadel_dirs.h +++ b/citadel/include/citadel_dirs.h @@ -55,8 +55,6 @@ extern char file_guesstimezone[PATH_MAX]; extern char file_dpsam_conf[PATH_MAX]; extern char file_dspam_log[PATH_MAX]; -extern char file_funambol_msg[PATH_MAX]; - extern void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir, int dbg); diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c index daacbe3d7..95f644e24 100644 --- a/citadel/utillib/citadel_dirs.c +++ b/citadel/utillib/citadel_dirs.c @@ -69,7 +69,6 @@ char file_crpt_file_cer[PATH_MAX]=""; char file_chkpwd[PATH_MAX]=""; char file_base64[PATH_MAX]=""; char file_guesstimezone[PATH_MAX]=""; -char file_funambol_msg[PATH_MAX] = ""; char file_dpsam_conf[PATH_MAX] = ""; char file_dspam_log[PATH_MAX] = ""; @@ -299,11 +298,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir, #endif ); StripSlashes(file_mail_aliases, 0); - snprintf(file_funambol_msg, - sizeof file_funambol_msg, - "%sfunambol_newmail_soap.xml", - ctdl_shared_dir); - StripSlashes(file_funambol_msg, 0); DBG_PRINT(ctdl_bio_dir); DBG_PRINT(ctdl_data_dir); @@ -341,7 +335,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char *ctdldir, DBG_PRINT(file_chkpwd); DBG_PRINT(file_base64); DBG_PRINT(file_guesstimezone); - DBG_PRINT(file_funambol_msg); } -- 2.30.2