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; \
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; \
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 );
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];
]
)
AC_ARG_WITH(with_ldap, [ --with-ldap use OpenLDAP client library])
-dnl AC_ARG_WITH(with_libdspam, [ --with-libdspam use libdspam mail spam scanning library])
AC_ARG_WITH(with_gc, [ --with-gc use the Boehm-Demers-Weiser garbage collection library])
if test "x$with_db" != xno -a "x$with_db" != xyes -a "$with_db"; then
-dnl Checks for the libdspam mail spam scanning library.
-dnl if test "x$with_libdspam" != xno ; then
-dnl AC_CHECK_HEADERS(dspam/libdspam.h,
-dnl [AC_CHECK_LIB(dspam, dspam_init,
-dnl [ok_libdspam=yes],,
-dnl )])
-dnl fi
-dnl
-dnl if test "x$ok_libdspam" = xyes ; then
-dnl SERVER_LIBS="-ldspam $SERVER_LIBS"
-dnl AC_DEFINE(HAVE_LIBDSPAM, [], [(unfinished) define this if you have the libdspam mail spam scanning library available])
-dnl fi
-
-
-
dnl Checks for the Expat XML parser.
AC_CHECK_HEADER(expat.h,
[AC_CHECK_LIB(expat, XML_ParserCreateNS,
echo 'LDAP support: ' $ok_ldap
echo 'Character set conversion support:' $ok_iconv
echo 'Boehm-Demers-Weiser support: ' $ok_gc
-dnl echo 'DSpam Scanning support: ' $ok_libdspam
echo
echo 'Note: if you are not using Linux, make sure you are using GNU make'
echo '(gmake) to compile Citadel.'
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"));
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));
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
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?><soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><soapenv:Body><sendNotificationMessages soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
-<arg0 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">^notifyuser</arg0><arg1 xsi:type="soapenc:string" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">
-<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>
-</arg1><arg2 href="#id0"/></sendNotificationMessages>
-<multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="soapenc:int" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">1</multiRef></soapenv:Body></soapenv:Envelope>
/* all our directories */
extern char ctdl_bio_dir[PATH_MAX];
extern char ctdl_data_dir[PATH_MAX];
-extern char ctdl_dspam_dir[PATH_MAX];
extern char ctdl_file_dir[PATH_MAX];
extern char ctdl_shared_dir[PATH_MAX];
extern char ctdl_image_dir[PATH_MAX];
extern char file_chkpwd[PATH_MAX];
extern char file_base64[PATH_MAX];
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);
char ctdl_home_directory[PATH_MAX] = "";
char ctdl_bio_dir[PATH_MAX]="bio";
char ctdl_data_dir[PATH_MAX]="data";
-char ctdl_dspam_dir[PATH_MAX]="dspam";
char ctdl_file_dir[PATH_MAX]="files";
char ctdl_shared_dir[PATH_MAX]="";
char ctdl_image_dir[PATH_MAX]="images";
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] = "";
#endif
COMPUTE_DIRECTORY(ctdl_bio_dir);
COMPUTE_DIRECTORY(ctdl_data_dir);
- COMPUTE_DIRECTORY(ctdl_dspam_dir);
COMPUTE_DIRECTORY(ctdl_file_dir);
COMPUTE_DIRECTORY(ctdl_image_dir);
COMPUTE_DIRECTORY(ctdl_info_dir);
StripSlashes(ctdl_bio_dir, 1);
StripSlashes(ctdl_data_dir, 1);
- StripSlashes(ctdl_dspam_dir, 1);
StripSlashes(ctdl_file_dir, 1);
StripSlashes(ctdl_image_dir, 1);
StripSlashes(ctdl_info_dir, 1);
"%sguesstimezone.sh",
ctdl_utilbin_dir);
- snprintf(file_dpsam_conf,
- sizeof file_dpsam_conf,
- "%sdspam.conf",
- ctdl_etc_dir);
- StripSlashes(file_dpsam_conf, 0);
- snprintf(file_dspam_log,
- sizeof file_dspam_log,
- "%sdspam.log",
- ctdl_home_directory);
- StripSlashes(file_dspam_log, 0);
/*
* DIRTY HACK FOLLOWS! due to configs in the network dir in the
* legacy installations, we need to calculate ifdeffed here.
#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);
- DBG_PRINT(ctdl_dspam_dir);
DBG_PRINT(ctdl_file_dir);
DBG_PRINT(ctdl_image_dir);
DBG_PRINT(ctdl_info_dir);
DBG_PRINT(file_chkpwd);
DBG_PRINT(file_base64);
DBG_PRINT(file_guesstimezone);
- DBG_PRINT(file_funambol_msg);
}
char buf[SIZ];
int rv = 0;
+#ifndef OPENSSL_NO_EGD
if (!access("/var/run/egd-pool", F_OK)) {
RAND_egd("/var/run/egd-pool");
}
+#endif
if (!RAND_status()) {
syslog(LOG_WARNING, "PRNG not adequately seeded, won't do SSL/TLS\n");
if (cer = X509_new(), cer != NULL) {
ASN1_INTEGER_set(X509_get_serialNumber(cer), 0);
- X509_set_issuer_name(cer, req->req_info->subject);
- X509_set_subject_name(cer, req->req_info->subject);
+ X509_set_issuer_name(cer, X509_REQ_get_subject_name(req));
+ X509_set_subject_name(cer, X509_REQ_get_subject_name(req));
X509_gmtime_adj(X509_get_notBefore(cer), 0);
X509_gmtime_adj(X509_get_notAfter(cer),(long)60*60*24*SIGN_DAYS);
else {
syslog(LOG_INFO, "SSL_accept success\n");
}
- /*r = */BIO_set_close(newssl->rbio, BIO_NOCLOSE);
+ /*r = */BIO_set_close(SSL_get_rbio(newssl), BIO_NOCLOSE);
bits = SSL_CIPHER_get_bits(SSL_get_current_cipher(newssl), &alg_bits);
syslog(LOG_INFO, "SSL/TLS using %s on %s (%d of %d bits)\n",
SSL_CIPHER_get_name(SSL_get_current_cipher(newssl)),
Suggests: citadel-server, apache2 | apache, localepurge, gnome-icon-theme
Recommends: shared-mime-info
Description: web-based frontend to Citadel groupware server
- WebCit is a web-based, AJAX-enabled frontend to the Citadel groupware system.
- It is an attractive web middleware layer that allows user-friendly access.
+ WebCit is a web-based, dynamic web frontend to the Citadel groupware system.
+ It is an attractive web applicagtion that allows user-friendly access.
By combining WebCit and Citadel, you can have a versatile online environment
with many users concurrently accessing the same system using the user
interface of their choice (text, web, or downloaded client software).
-
projects / citadel.git / commitdiff