diff -u ../qmail-1.03/error.h ./error.h --- ../qmail-1.03/error.h 1998-06-15 06:53:16.000000000 -0400 +++ ./error.h 2006-06-01 13:50:31.000000000 -0400 @@ -1,7 +1,7 @@ #ifndef ERROR_H #define ERROR_H -extern int errno; +#include "errno.h" extern int error_intr; extern int error_nomem; diff -u ../qmail-1.03/Makefile ./Makefile --- ../qmail-1.03/Makefile 1998-06-15 06:53:16.000000000 -0400 +++ ./Makefile 2006-06-01 13:58:52.000000000 -0400 @@ -1462,11 +1462,11 @@ qmail-rspawn: \ load qmail-rspawn.o spawn.o tcpto_clean.o now.o coe.o sig.a open.a \ -seek.a lock.a wait.a fd.a stralloc.a alloc.a substdio.a error.a str.a \ +seek.a lock.a wait.a fd.a stralloc.a alloc.a substdio.a error.a env.a str.a \ auto_qmail.o auto_uids.o auto_spawn.o ./load qmail-rspawn spawn.o tcpto_clean.o now.o coe.o \ sig.a open.a seek.a lock.a wait.a fd.a stralloc.a alloc.a \ - substdio.a error.a str.a auto_qmail.o auto_uids.o \ + substdio.a error.a env.a str.a auto_qmail.o auto_uids.o \ auto_spawn.o qmail-rspawn.0: \ diff -u ../qmail-1.03/qmail-rspawn.c ./qmail-rspawn.c --- ../qmail-1.03/qmail-rspawn.c 1998-06-15 06:53:16.000000000 -0400 +++ ./qmail-rspawn.c 2006-06-01 13:52:02.000000000 -0400 @@ -5,12 +5,19 @@ #include "fork.h" #include "error.h" #include "tcpto.h" +#include "env.h" + +char *qmail_remote = "qmail-remote"; void initialize(argc,argv) int argc; char **argv; { + char *qr; + tcpto_clean(); + qr = env_get("QMAILREMOTE"); + if (qr && *qr) qmail_remote = qr; } int truncreport = 0; @@ -84,7 +91,7 @@ int f; char *(args[5]); - args[0] = "qmail-remote"; + args[0] = qmail_remote; args[1] = r + at + 1; args[2] = s; args[3] = r; .