* if -D added, citserver will print out the Directories.

diff --git a/citadel/aidepost.c b/citadel/aidepost.c
index c902a7b11e183adfcab8943f7b0419738ee5e140..4634f809500487ad74b498c6cc09f011c3abd039 100644 (file)
--- a/citadel/aidepost.c
+++ b/citadel/aidepost.c
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
        char ctdldir[PATH_MAX]=CTDLDIR;
 
        /* TODO: should we be able to calculate relative dirs? */
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
 
        get_config();

diff --git a/citadel/chkpw.c b/citadel/chkpw.c
index 5bdb571c16c9e37fa39fded038eb4630d1a737cb..ff856cddc6bd86d655d7b63930d2145752488f66 100644 (file)
--- a/citadel/chkpw.c
+++ b/citadel/chkpw.c
@@ -94,7 +94,7 @@ int main(int argc, char **argv) {
        int uid;
        char ctdldir[PATH_MAX]=CTDLDIR;
        
-       calc_dirs_n_files(0,0,"", ctdldir);
+       calc_dirs_n_files(0,0,"", ctdldir, 0);
        
        printf("\n\n ** host auth mode test utility **\n\n");
        start_chkpwd_daemon();

diff --git a/citadel/citadel.c b/citadel/citadel.c
index 503bb743889c290bf4bb75a12a39fa506d92faed..560bd55a4b11dc397440fd3c4e74269b381d2c0b 100644 (file)
--- a/citadel/citadel.c
+++ b/citadel/citadel.c
@@ -1412,7 +1412,7 @@ int main(int argc, char **argv)
 //     eCrashSymbolTable symbol_table;
 #endif
        CtdlInitBase64Table();
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
 #ifdef HAVE_BACKTRACE
        bzero(&params, sizeof(params));

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index f7c746d88ba2b3f2a96608db4913b48aebb747e9..1e35087503134bf8111df3d0c5c244af55cbeffd 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -89,7 +89,10 @@ int home_specified = 0;
                         dirbuffer,\
                         (dirbuffer[0]!='\0')?"/":"");
 
-void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir)
+#define DBG_PRINT(A) if (dbg==1) fprintf (stderr,"%s : %s \n", #A, A)
+
+
+void calc_dirs_n_files(int relh, int home, const char *relhome, const char  *ctdldir, int dbg)
 {
        const char* basedir = "";
        char dirbuffer[PATH_MAX] = "";
@@ -231,16 +234,51 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
         * DIRTY HACK FOLLOWS! due to configs in the network dir in the 
         * legacy installations, we need to calculate ifdeffed here.
         */
-               snprintf(file_mail_aliases, 
-                                sizeof file_mail_aliases,
-                                "%smail.aliases",
+       snprintf(file_mail_aliases, 
+                sizeof file_mail_aliases,
+                "%smail.aliases",
 #ifdef HAVE_ETC_DIR
-                                ctdl_etc_dir
+                ctdl_etc_dir
 #else
-                                ctdl_spool_dir
+                ctdl_spool_dir
 #endif
-                                );
-
+               );
+
+       DBG_PRINT(ctdl_bio_dir);
+       DBG_PRINT(ctdl_bb_dir);
+       DBG_PRINT(ctdl_data_dir);
+       DBG_PRINT(ctdl_file_dir);
+       DBG_PRINT(ctdl_hlp_dir);
+       DBG_PRINT(ctdl_image_dir);
+       DBG_PRINT(ctdl_info_dir);
+       DBG_PRINT(ctdl_key_dir);
+       DBG_PRINT(ctdl_message_dir);
+       DBG_PRINT(ctdl_usrpic_dir);
+       DBG_PRINT(ctdl_etc_dir);
+       DBG_PRINT(ctdl_run_dir);
+       DBG_PRINT(ctdl_spool_dir);
+       DBG_PRINT(ctdl_netout_dir);
+       DBG_PRINT(ctdl_netin_dir);
+       DBG_PRINT(ctdl_netcfg_dir);
+       DBG_PRINT(ctdl_bbsbase_dir);
+       DBG_PRINT(ctdl_sbin_dir);
+       DBG_PRINT(ctdl_bin_dir);
+       DBG_PRINT(ctdl_utilbin_dir);
+       DBG_PRINT(file_citadel_control);
+       DBG_PRINT(file_citadel_rc);
+       DBG_PRINT(file_citadel_config);
+       DBG_PRINT(file_lmtp_socket);
+       DBG_PRINT(file_lmtp_unfiltered_socket);
+       DBG_PRINT(file_arcq);
+       DBG_PRINT(file_citadel_socket);
+       DBG_PRINT(file_mail_aliases);
+       DBG_PRINT(file_pid_file);
+       DBG_PRINT(file_pid_paniclog);
+       DBG_PRINT(file_crpt_file_key);
+       DBG_PRINT(file_crpt_file_csr);
+       DBG_PRINT(file_crpt_file_cer);
+       DBG_PRINT(file_chkpwd);
+       DBG_PRINT(file_base64);
 }
 
 

diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h
index 16a4b6297d0083e8c0bac4c3a4c3368688f43851..f7ba1f3db3b739de4d78534392d7469570e05474 100644 (file)
--- a/citadel/citadel_dirs.h
+++ b/citadel/citadel_dirs.h
@@ -49,7 +49,7 @@ extern char file_crpt_file_cer[PATH_MAX];
 extern char file_chkpwd[PATH_MAX];
 extern char file_base64[PATH_MAX];
 
-extern void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir);
+extern void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir, int dbg);
 
 
 void assoc_file_name(char *buf, size_t n,

diff --git a/citadel/citmail.c b/citadel/citmail.c
index 9217260685b1427a2d6bafd95a213e28f0b3763b..5241407343bc3cb5167a917b5da323353b5ce449 100644 (file)
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -201,7 +201,7 @@ int main(int argc, char **argv) {
        }
               
        /* TODO: should we be able to calculate relative dirs? */
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
        pw = getpwuid(getuid());
 

diff --git a/citadel/sendcommand.c b/citadel/sendcommand.c
index c0709ec57d7f66f752d9d046610b00ace1ea41a7..4254d72133b10a40f7391ff41c8c936b1bbf0b2d 100644 (file)
--- a/citadel/sendcommand.c
+++ b/citadel/sendcommand.c
@@ -204,7 +204,7 @@ int main(int argc, char **argv)
                }
        }
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
        get_config();
 
        signal(SIGINT, cleanup);

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 80a71cc992a3bf70c35d457f285b2f70a75ab701..f8b95019d2f96991213c0bd9ef1db8b661b0b705 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -84,6 +84,7 @@ int main(int argc, char **argv)
        size_t size;
        int relh=0;
        int home=0;
+       int dbg=0;
        char relhome[PATH_MAX]="";
        char ctdldir[PATH_MAX]=CTDLDIR;
 #ifdef HAVE_RUN_DIR
@@ -140,6 +141,10 @@ int main(int argc, char **argv)
                        do_defrag = 1;
                }
 
+               else if (!strncmp(argv[a], "-D", 2)) {
+                       dbg = 1;
+               }
+
                /* -r tells the server not to drop root permissions. don't use
                 * this unless you know what you're doing. this should be
                 * removed in the next release if it proves unnecessary. */
@@ -151,7 +156,7 @@ int main(int argc, char **argv)
                        lprintf(CTDL_EMERG,     "citserver: usage: "
                                        "citserver "
                                        "[-lLogFacility] "
-                                       "[-d] [-f]"
+                                       "[-d] [-f] [-D] "
                                        " [-tTraceFile]"
                                        " [-xLogLevel] [-hHomeDir]\n");
                        exit(1);
@@ -159,7 +164,7 @@ int main(int argc, char **argv)
 
        }
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
        /* daemonize, if we were asked to */
        if (running_as_daemon) {
                start_daemon(0);

diff --git a/citadel/setup.c b/citadel/setup.c
index 11d34cdede4493a3130c26e3f357a943d8da4b72..845a3408dff7630c54d09d290a9dd3f26193d68f 100644 (file)
--- a/citadel/setup.c
+++ b/citadel/setup.c
@@ -1005,7 +1005,7 @@ int main(int argc, char *argv[])
                safestrncpy(relhome, ctdl_home_directory, sizeof relhome);
        }
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
        
        enable_home=(relh|home);
 

diff --git a/citadel/userlist.c b/citadel/userlist.c
index b55c1752b46fe365031023a0b46ab608d82b0be7..c8b070318d3e129aad7f7ccaa216600af79b1acf 100644 (file)
--- a/citadel/userlist.c
+++ b/citadel/userlist.c
@@ -78,7 +78,7 @@ int main(int argc, char **argv)
        char ctdldir[PATH_MAX]=CTDLDIR;
 
        CtdlInitBase64Table();
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
        ipc = CtdlIPC_new(argc, argv, hostbuf, portbuf);
        CtdlIPC_chat_recv(ipc, buf);

diff --git a/citadel/whobbs.c b/citadel/whobbs.c
index b60ebbd9f518466709dc11b2bca3f03593b8f806..be5dbe05eaca1714563a87f17b8f47bf5ef65afb 100644 (file)
--- a/citadel/whobbs.c
+++ b/citadel/whobbs.c
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 
        CtdlInitBase64Table();
 
-       calc_dirs_n_files(relh, home, relhome, ctdldir);
+       calc_dirs_n_files(relh, home, relhome, ctdldir, 0);
 
        /* If this environment variable is set, we assume that the program
         * is being called as a cgi-bin from a webserver and will output