remove no longer needed chroot option

2 files changed, 3 insertions, 32 deletions

diff --git a/extras/wip/filters/filter-spamassassin/filter-spamassassin.8 b/extras/wip/filters/filter-spamassassin/filter-spamassassin.8
index c14b4a5..9ebff45 100644
--- a/extras/wip/filters/filter-spamassassin/filter-spamassassin.8
+++ b/extras/wip/filters/filter-spamassassin/filter-spamassassin.8
@@ -21,8 +21,7 @@
 .Nd smtpd filter for SpamAssassin spamd
 .Sh SYNOPSIS
 .Nm
-.Op Fl Cdv
-.Op Fl c Ar path
+.Op Fl dv
 .Op Fl h Ar host
 .Op Fl l Ar limit
 .Op Fl p Ar port
@@ -39,21 +38,6 @@ according to its own configuration.
 .Pp
 The options are as follows:
 .Bl -tag -width "-s strategy"
-.It Fl C
-No
-.Xr chroot 2
-mode, if this option is specified,
-.Nm
-will not run in a chroot.
-.It Fl c Ar path
-Set the chroot
-.Ar path .
-.Pp
-The default
-.Ar path
-is
-.Pa /var/empty
-(compile option).
 .It Fl d
 Debug mode, if this option is specified,
 .Nm
@@ -135,7 +119,6 @@ to listen on 127.0.0.1 port 783 for incoming requests.
 This matches to the default configuration of the daemon.
 .Sh SEE ALSO
 .Xr spamd 1 ,
-.Xr chroot 2 ,
 .Xr filter_api 3 ,
 .Xr smtpd.conf 5 ,
 .Xr smtpd 8
diff --git a/extras/wip/filters/filter-spamassassin/filter_spamassassin.c b/extras/wip/filters/filter-spamassassin/filter_spamassassin.c
index d9e68cb..57beb3a 100644
--- a/extras/wip/filters/filter-spamassassin/filter_spamassassin.c
+++ b/extras/wip/filters/filter-spamassassin/filter_spamassassin.c
@@ -312,20 +312,14 @@ spamassassin_resolve(const char *h, const char *p)
 int
 main(int argc, char **argv)
 {
-	int ch, C = 0, d = 0, v = 0;
+	int ch, d = 0, v = 0;
 	const char *errstr, *l = NULL;
-	char *c = NULL, *h = SPAMASSASSIN_HOST, *p = SPAMASSASSIN_PORT, *s = NULL;
+	char *h = SPAMASSASSIN_HOST, *p = SPAMASSASSIN_PORT, *s = NULL;
 
 	log_init(1);
 
 	while ((ch = getopt(argc, argv, "dh:l:p:s:v")) != -1) {
 		switch (ch) {
-		case 'C':
-			C = 1;
-			break;
-		case 'c':
-			c = optarg;
-			break;
 		case 'd':
 			d = 1;
 			break;
@@ -353,8 +347,6 @@ main(int argc, char **argv)
 	argc -= optind;
 	argv += optind;
 
-	if (c)
-		c = strip(c);
 	if (h)
 		h = strip(h);
 	if (p)
@@ -385,10 +377,6 @@ main(int argc, char **argv)
 	filter_api_on_eom(spamassassin_on_eom);
 	filter_api_on_commit(spamassassin_on_commit);
 	filter_api_on_rollback(spamassassin_on_rollback);
-	if (c)
-		filter_api_set_chroot(c);
-	if (C)
-		filter_api_no_chroot();
 
 	filter_api_loop();
 	log_debug("debug: exiting");