[Mixmaster-devel] r849 - in trunk/Mix: . Src

[<we...@so...>]

Author: weasel
Date: 2004-05-13 08:44:00 +0200 (Thu, 13 May 2004)
New Revision: 849

Modified:
   trunk/Mix/Src/config.h
   trunk/Mix/Src/mix.c
   trunk/Mix/Src/pool.c
   trunk/Mix/mixmaster.1
Log:
Support nonpublished destination allow

Modified: trunk/Mix/Src/config.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/Src/config.h	2004-05-07 10:48:19 UTC (rev 848)
+++ trunk/Mix/Src/config.h	2004-05-13 06:44:00 UTC (rev 849)
@@ -223,6 +223,7 @@
 /* Filenames must be seperated by one space.                   */
 #define DEFAULT_DESTBLOCK "dest.blk rab.blk"
 #define DEFAULT_DESTALLOW "dest.alw"
+#define DEFAULT_DESTALLOW2 "dest.alw.nonpublished"
 #define DEFAULT_SOURCEBLOCK "source.blk"
 #define DEFAULT_HDRFILTER "header.blk"
 #define DEFAULT_REGULAR "time.log"
@@ -268,6 +269,7 @@
 extern char PGPMAXCOUNT[];
 extern char DESTBLOCK[];
 extern char DESTALLOW[];
+extern char DESTALLOW2[];
 extern char SOURCEBLOCK[];
 extern char HDRFILTER[];
 extern char REGULAR[];

Modified: trunk/Mix/Src/mix.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/Src/mix.c	2004-05-07 10:48:19 UTC (rev 848)
+++ trunk/Mix/Src/mix.c	2004-05-13 06:44:00 UTC (rev 849)
@@ -63,6 +63,7 @@
 char PGPMAXCOUNT[PATHMAX];
 char DESTBLOCK[PATHMAX];
 char DESTALLOW[PATHMAX];
+char DESTALLOW2[PATHMAX];
 char SOURCEBLOCK[PATHMAX];
 char HDRFILTER[PATHMAX];
 char REGULAR[PATHMAX];
@@ -394,6 +395,7 @@
 	strnncpy(PGPMAXCOUNT  , DEFAULT_PGPMAXCOUNT);
 	strnncpy(DESTBLOCK    , DEFAULT_DESTBLOCK);
 	strnncpy(DESTALLOW    , DEFAULT_DESTALLOW);
+	strnncpy(DESTALLOW2   , DEFAULT_DESTALLOW2);
 	strnncpy(SOURCEBLOCK  , DEFAULT_SOURCEBLOCK);
 	strnncpy(HDRFILTER    , DEFAULT_HDRFILTER);
 	strnncpy(REGULAR      , DEFAULT_REGULAR);
@@ -586,7 +588,8 @@
 	  read_conf(PUBRING) || read_conf(IDLOG) ||
 	  read_conf(STATS) || read_conf(DESTBLOCK) ||
 	  read_conf(PGPMAXCOUNT) ||
-	  read_conf(DESTALLOW) || read_conf(SOURCEBLOCK) ||
+	  read_conf(DESTALLOW) || read_conf(DESTALLOW2) ||
+	  read_conf(SOURCEBLOCK) ||
 	  read_conf(STAREX) ||
 	  read_conf(HDRFILTER) || read_conf(REGULAR) ||
 	  read_conf(POOL) || read_conf(TYPE1LIST) ||

Modified: trunk/Mix/Src/pool.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/Src/pool.c	2004-05-07 10:48:19 UTC (rev 848)
+++ trunk/Mix/Src/pool.c	2004-05-13 06:44:00 UTC (rev 849)
@@ -557,11 +557,12 @@
  * addresses are in dest.allow. If yes return 1; 0 otherwhise
  */
 {
-  BUFFER *out, *allow, *line, *line2;
+  BUFFER *out, *allow, *allow2, *line, *line2;
   int err=3D1;
   FILE *f;
=20
   allow =3D buf_new();
+  allow2 =3D buf_new();
   out =3D buf_new();
   line =3D buf_new();
   line2 =3D buf_new();
@@ -571,6 +572,12 @@
     buf_read(allow, f);
     fclose(f);
   }
+  f =3D mix_openfile(DESTALLOW2, "r");
+  if (f !=3D NULL) {
+    buf_read(allow2, f);
+    fclose(f);
+    buf_cat(allow, allow2);
+  }
=20
   /* Do header lines */
   while (buf_getline(in, line) =3D=3D 0) {
@@ -602,6 +609,7 @@
   buf_move(in, out);
   buf_free(out);
   buf_free(allow);
+  buf_free(allow2);
   buf_free(line);
   buf_free(line2);
   return (err);

Modified: trunk/Mix/mixmaster.1
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/Mix/mixmaster.1	2004-05-07 10:48:19 UTC (rev 848)
+++ trunk/Mix/mixmaster.1	2004-05-13 06:44:00 UTC (rev 849)
@@ -949,6 +949,11 @@
 .B dest.alw
 List of addresses to which Mixmaster will deliver, even in middleman mod=
e (\fBDESTALLOW\fP).
 .TP
+.B dest.alw.nonpublished
+Similar to
+.BR dest.alw ,
+with the only difference that this list is not published in remailer-con=
f replies (\fBDESTALLOW2\fP).
+.TP
 .B dest.blk
 List of blocked destination addresses.
 Mixmaster does not send mail to the blocked addresses listed in this fil=
e (\fBDESTBLOCK\fP).