Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/dist/pf/libexec/spamd Pull up revision 1.7 (requested by ...



details:   https://anonhg.NetBSD.org/src/rev/7e3f49391ff0
branches:  netbsd-3
changeset: 575343:7e3f49391ff0
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 13 16:16:14 2005 +0000

description:
Pull up revision 1.7 (requested by jwise in ticket #138):
Instead of hardcoding /var/chroot/spamd in two places, use a macro
SPAMD_CHROOT, which is passed in by src/usr.sbin/pf/spamd/Makefile.

diffstat:

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

diffs (20 lines):

diff -r b621297a8519 -r 7e3f49391ff0 dist/pf/libexec/spamd/spamd.c
--- a/dist/pf/libexec/spamd/spamd.c     Wed Apr 13 16:15:24 2005 +0000
+++ b/dist/pf/libexec/spamd/spamd.c     Wed Apr 13 16:16:14 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spamd.c,v 1.6 2004/11/16 05:14:12 yamt Exp $   */
+/*     $NetBSD: spamd.c,v 1.6.2.1 2005/04/13 16:16:14 tron Exp $       */
 /*     $OpenBSD: spamd.c,v 1.71 2004/08/17 09:38:07 henning Exp $      */
 
 /*
@@ -1096,8 +1096,8 @@
        }
 
 jail:
-       if (chroot("/var/chroot/spamd") == -1 || chdir("/") == -1) {
-               syslog(LOG_ERR, "cannot chdir to /var/chroot/spamd.");
+       if (chroot(SPAMD_CHROOT) == -1 || chdir("/") == -1) {
+               syslog(LOG_ERR, "cannot chdir to " SPAMD_CHROOT ".");
                exit(1);
        }
 



Home | Main Index | Thread Index | Old Index