On Jan 8, 2004, at 2:43 PM, Noe wrote:
I expected not success delivery, but defferlal delivery. Am I wrong?
Please, let me know your opinion.
This patch should correct the problem. deliver_mail() was returning
unexpected values, causing vdelivermail to not exit with an error.
===
RCS file: /cvsroot/vpopmail/vpopmail/vdelivermail.c,v
retrieving revision 1.8
diff -u -r1.8 vdelivermail.c
--- vdelivermail.c 3 Jan 2004 07:05:39 - 1.8
+++ vdelivermail.c 8 Jan 2004 23:28:24 -
@@ -611,7 +611,7 @@
if ( lseek(0, 0L, SEEK_SET) < 0 ) {
printf("lseek errno=%d\n", errno);
-return(errno);
+return(-2);
}
/* write the Return-Path: and Delivered-To: headers */
@@ -624,7 +624,7 @@
return(-1);
} else {
printf("failed to write delivered to line
errno=%d\n",errno);
- return(errno);
+ return(-2);
}
}
@@ -639,7 +639,7 @@
*/
if ( unlink(local_file) != 0 ) {
printf("unlink failed %s errno = %d\n", local_file,
errno);
-return(errno);
+return(-2);
}
/* Check if the user is over quota */
@@ -647,7 +647,7 @@
return(-1);
} else {
printf("write failed errno = %d\n", errno);
-return(errno);
+return(-2);
}
}
}
@@ -689,7 +689,7 @@
printf("rename failed %s %s errno = %d\n",
local_file, local_file_new, errno);
/* shouldn't we unlink the file here? */
-return(errno);
+return(-2);
/* rename worked, so we are okay now */
} else {
@@ -701,7 +701,7 @@
printf("link REALLY failed %s %s errno = %d\n",
local_file, local_file_new, errno);
unlink(local_file);
-return(errno);
+return(-2);
}
}
}
--
Tom Collins - [EMAIL PROTECTED]
QmailAdmin: http://qmailadmin.sf.net/ Vpopmail: http://vpopmail.sf.net/
Info on the Sniffter hand-held Network Tester: http://sniffter.com/
