--- Source-Tree/nqsdaemon/all-systems/nqs_mai.c.orig	Sun Mar 19 13:19:21 2000

+++ Source-Tree/nqsdaemon/all-systems/nqs_mai.c	Sat Oct  6 10:21:00 2001

@@ -247,8 +247,14 @@

 		argv [0] = "mail";

 		argv [1] = maildest;

 		argv [2] = (char *) 0;

-		execve ("/bin/mail", argv,	/* Execve() mail program */

-			envp);

+		{

+			struct stat stb;

+			if (stat("/bin/mail", &stb) != -1)

+				execve ("/bin/mail",/* Execve() mail program */

+					argv, envp);

+			else if (stat("/usr/bin/mail", &stb) != -1)

+				execve ("/usr/bin/mail", argv, envp);

+		}

 		_exit (1);

 	}

 	else if (pid == -1) return (-1);	/* Fork failed */

--- Source-Tree/pipeclient/all-systems/pipeclient.c.orig	Sun Mar 19 13:19:42 2000

+++ Source-Tree/pipeclient/all-systems/pipeclient.c	Tue Oct  9 10:51:53 2001

@@ -1059,7 +1059,11 @@

 	signal(SIGPIPE, catch_sigpipe);

 	do {

+#if HAS_BSD_PIPE

+		interconn();

+#else

 		interset(-1);

+#endif

 		interclear ();

 		interw32i (rawreq->orig_seqno);

 		interw32u (rawreq->orig_mid);