From: Wilfried Göesgens Date: Sat, 10 Nov 2007 23:12:19 +0000 (+0000) Subject: * if -D added, citserver will print out the Directories. X-Git-Tag: v7.86~2799 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=f88dc560b72a2fd99c4ba446031d0852c1080a7b;p=citadel.git * if -D added, citserver will print out the Directories. --- diff --git a/citadel/aidepost.c b/citadel/aidepost.c index c902a7b11..4634f8095 100644 --- 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 5bdb571c1..ff856cddc 100644 --- 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 503bb7438..560bd55a4 100644 --- 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(¶ms, sizeof(params)); diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c index f7c746d88..1e3508750 100644 --- 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 16a4b6297..f7ba1f3db 100644 --- 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 921726068..524140734 100644 --- 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 c0709ec57..4254d7213 100644 --- 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 80a71cc99..f8b95019d 100644 --- 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 11d34cded..845a3408d 100644 --- 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 b55c1752b..c8b070318 100644 --- 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 b60ebbd9f..be5dbe05e 100644 --- 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