Removed remnants of dspam module config

diff --git a/citadel/configure.ac b/citadel/configure.ac
index 32c7974d991620e2c26c7e3c079cf22a5d083f92..94ba60de5ae4ea528232e6edcd66ea9ccc1cc770 100644 (file)
--- a/citadel/configure.ac
+++ b/citadel/configure.ac
@@ -261,7 +261,6 @@ AC_ARG_WITH(ssl,
        ]
 )
 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
@@ -722,21 +721,6 @@ fi
 
 
 
-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,
@@ -1029,7 +1013,6 @@ echo ------------------------------------------------------------------------
 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.'

diff --git a/citadel/include/citadel_dirs.h b/citadel/include/citadel_dirs.h
index 86b7310dde466edcce257af84420c21c41f792c6..6ce044eed92205d0107178efd1f791a882b7de9b 100644 (file)
--- a/citadel/include/citadel_dirs.h
+++ b/citadel/include/citadel_dirs.h
@@ -10,7 +10,6 @@ extern char ctdl_home_directory[PATH_MAX];
 /* 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];
@@ -52,8 +51,6 @@ extern char file_crpt_file_cer[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 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 95f644e244bfed9b1415426623a53fa1c2eb6460..2d5dd7b2e6869dc602c3c87489d3d10d822e0b57 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -28,7 +28,6 @@
 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";
@@ -69,8 +68,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_dpsam_conf[PATH_MAX] = "";
-char file_dspam_log[PATH_MAX] = "";
 
 
 
@@ -158,7 +155,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 #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);
@@ -167,7 +163,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 
        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);
@@ -274,16 +269,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
                 "%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.
@@ -301,7 +286,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 
        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);