Flag day for spamd -

1) config files move to /etc/mail
2) -g option goes away in spamd-setup and spamd - greylisting is now the default
3) option change to spamd, -b addr becomes -l addr.
4) -b option in spamd-setup and spamd to turn on old blacklisting mode.

Man page shortly to be flensed to make this easier to explain
ok deraadt@ millert@

2 files changed, 14 insertions, 14 deletions

diff --git a/libexec/spamd-setup/spamd-setup.8 b/libexec/spamd-setup/spamd-setup.8
index 1df1afe7ed2..5022b182488 100644
--- a/libexec/spamd-setup/spamd-setup.8
+++ b/libexec/spamd-setup/spamd-setup.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: spamd-setup.8,v 1.10 2007/02/24 19:28:13 millert Exp $
+.\"	$OpenBSD: spamd-setup.8,v 1.11 2007/02/27 02:10:58 beck Exp $
 .\"
 .\" Copyright (c) 2003 Jason L. Wright (jason@thought.net)
 .\" All rights reserved.
@@ -55,11 +55,11 @@ The options are as follows:
 .Bl -tag -width Ds
 .It Fl d
 Debug mode reports a few pieces of information.
-.It Fl g
-Greylisting mode.
-Blacklist data is stored only in
+.It Fl b
+Blacklisting only mode.
+Blacklist data is normally stored only in
 .Xr spamd 8 .
-In the absence of this flag, data is stored in both
+With this flag, data is stored in both
 .Xr spamd 8
 and
 .Xr pf 4 .
@@ -70,7 +70,7 @@ No data is shipped to
 .El
 .Pp
 Blacklists and whitelists are specified in the configuration file
-.Pa /etc/spamd.conf
+.Pa /etc/mail/spamd.conf
 and are processed in the order specified in the
 .Ar all
 tag.
@@ -93,7 +93,7 @@ reads all configuration information from a
 file.
 .Sh FILES
 .Bd -literal
-/etc/spamd.conf
+/etc/mail/spamd.conf
 .Ed
 .Sh SEE ALSO
 .Xr ftp 1 ,
diff --git a/libexec/spamd-setup/spamd-setup.c b/libexec/spamd-setup/spamd-setup.c
index da3dcb226f3..4efcbc5f223 100644
--- a/libexec/spamd-setup/spamd-setup.c
+++ b/libexec/spamd-setup/spamd-setup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spamd-setup.c,v 1.31 2007/02/25 22:59:38 millert Exp $ */
+/*	$OpenBSD: spamd-setup.c,v 1.32 2007/02/27 02:10:58 beck Exp $ */
 
 /*
  * Copyright (c) 2003 Bob Beck.  All rights reserved.
@@ -41,7 +41,7 @@
 
 #define PATH_FTP		"/usr/bin/ftp"
 #define PATH_PFCTL		"/sbin/pfctl"
-#define PATH_SPAMD_CONF		"/etc/spamd.conf"
+#define PATH_SPAMD_CONF		"/etc/mail/spamd.conf"
 #define SPAMD_ARG_MAX		256 /* max # of args to an exec */
 
 struct cidr {
@@ -86,7 +86,7 @@ __dead void	  usage(void);
 
 int		  debug;
 int		  dryrun;
-int		  greyonly;
+int		  greyonly = 1;
 
 extern char 	 *__progname;
 
@@ -780,7 +780,7 @@ __dead void
 usage(void)
 {
 
-	fprintf(stderr, "usage: %s [-dgn]\n", __progname);
+	fprintf(stderr, "usage: %s [-bdn]\n", __progname);
 	exit(1);
 }
 
@@ -793,7 +793,7 @@ main(int argc, char *argv[])
 	struct servent *ent;
 	int i, ch;
 
-	while ((ch = getopt(argc, argv, "ndg")) != -1) {
+	while ((ch = getopt(argc, argv, "bdn")) != -1) {
 		switch (ch) {
 		case 'n':
 			dryrun = 1;
@@ -801,8 +801,8 @@ main(int argc, char *argv[])
 		case 'd':
 			debug = 1;
 			break;
-		case 'g':
-			greyonly = 1;
+		case 'b':
+			greyonly = 0;
 			break;
 		default:
 			usage();