X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitmail.c;h=09b6c93479614b39e9b52826819d257713cc7ebf;hb=1248e88ae490d17b4896ada5a74a0a9ea23b365c;hp=69af5958f036a5b79aba20bd4bd608b43f84fa09;hpb=e612033104c17c8adcad19d7dc8efbafa8b33f2e;p=citadel.git

diff --git a/citadel/citmail.c b/citadel/citmail.c
index 69af5958f..09b6c9347 100644
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -27,6 +27,7 @@
 #include "snprintf.h"
 #endif
 #include "config.h"
+#include "citadel_dirs.h"
 
 /* #define DEBUG  */	/* uncomment to get protocol traces */
 
@@ -175,6 +176,13 @@ int main(int argc, char **argv) {
 	struct passwd *pw;
 	int from_header = 0;
 	int in_body = 0;
+	int relh=0;
+	int home=0;
+	char relhome[PATH_MAX]="";
+	char ctdldir[PATH_MAX]=CTDLDIR;
+
+	/* TODO: should we be able to calculate relative dirs? */
+	calc_dirs_n_files(relh, home, relhome, ctdldir);
 
 	get_config();
 
@@ -203,13 +211,7 @@ int main(int argc, char **argv) {
 	}
 	strip_trailing_nonprint(fromline);
 
-	serv_sock = uds_connectsock(
-#ifndef HAVE_RUN_DIR
-						   "."
-#else
-						   RUN_DIR
-#endif
-						   "/lmtp.socket");
+	serv_sock = uds_connectsock(file_lmtp_socket);
 	serv_gets(buf);
 	if (buf[0]!='2') cleanup(1);