34 lines
1018 B
Diff
34 lines
1018 B
Diff
|
diff -ur a/main.c b/main.c
|
||
|
|
--- a/main.c 2023-12-05 09:54:32.727382197 +0100
|
||
|
|
+++ b/main.c 2023-12-06 11:07:50.176112126 +0100
|
||
|
|
@@ -454,8 +454,15 @@
|
||
|
|
input = stdin;
|
||
|
|
rcvmode = !to && !tflag;
|
||
|
|
spreserve();
|
||
|
|
- if (!nosrc)
|
||
|
|
- load(PATH_MASTER_RC);
|
||
|
|
+ if (!nosrc) {
|
||
|
|
+#ifdef DISTCONFMAILRC
|
||
|
|
+ struct stat st;
|
||
|
|
+ if (stat(PATH_MASTER_RC, &st) < 0)
|
||
|
|
+ load(DISTCONFMAILRC);
|
||
|
|
+ else
|
||
|
|
+#endif
|
||
|
|
+ load(PATH_MASTER_RC);
|
||
|
|
+ }
|
||
|
|
/*
|
||
|
|
* Expand returns a savestr, but load only uses the file name
|
||
|
|
* for fopen, so it's safe to do this.
|
||
|
|
diff -ur a/Makefile b/Makefile
|
||
|
|
--- a/Makefile 2023-12-05 09:54:32.727382197 +0100
|
||
|
|
+++ b/Makefile 2023-12-06 11:08:00.418064025 +0100
|
||
|
|
@@ -60,7 +60,7 @@
|
||
|
|
###########################################################################
|
||
|
|
###########################################################################
|
||
|
|
|
||
|
|
-FEATURES = $(IPv6)
|
||
|
|
+FEATURES = $(IPv6) $(DISTCONF)
|
||
|
|
|
||
|
|
OBJ = aux.o base64.o cache.o cmd1.o cmd2.o cmd3.o cmdtab.o collect.o \
|
||
|
|
dotlock.o edit.o fio.o getname.o getopt.o head.o hmac.o \
|