[src/netbsd-3]: src/dist/pf/libexec/spamd-setup Pull up revision 1.4 (request...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c1c7cee5f8f
branches:  netbsd-3
changeset: 575348:4c1c7cee5f8f
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 13 16:22:29 2005 +0000

description:
Pull up revision 1.4 (requested by jwise in ticket #138):
If path to /etc/spamd.conf is passed in on cpp command line, don't override it.

diffstat:

 dist/pf/libexec/spamd-setup/spamd-setup.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r 68ab51fd83fe -r 4c1c7cee5f8f dist/pf/libexec/spamd-setup/spamd-setup.c
--- a/dist/pf/libexec/spamd-setup/spamd-setup.c Wed Apr 13 16:21:19 2005 +0000
+++ b/dist/pf/libexec/spamd-setup/spamd-setup.c Wed Apr 13 16:22:29 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spamd-setup.c,v 1.3 2004/11/14 11:26:48 yamt Exp $ */
+/*     $NetBSD: spamd-setup.c,v 1.3.2.1 2005/04/13 16:22:29 tron Exp $ */
 /*     $OpenBSD: spamd-setup.c,v 1.19 2004/06/29 11:19:07 mickey Exp $ */
 
 /*
@@ -41,7 +41,9 @@
 
 #define PATH_FTP               "/usr/bin/ftp"
 #define PATH_PFCTL             "/sbin/pfctl"
+#ifndef PATH_SPAMD_CONF
 #define PATH_SPAMD_CONF                "/etc/spamd.conf"
+#endif
 #define SPAMD_ARG_MAX          256 /* max # of args to an exec */
 
 #define MAX(a, b)      ((a) > (b) ? (a) : (b))