Imported Upstream version 0.66.1

[hcoop/debian/courier-authlib.git] / libs / liblock / mail.c

diff --git a/liblock/mail.c b/libs/liblock/mail.c
similarity index 98%
rename from liblock/mail.c
rename to libs/liblock/mail.c
index bfe118f..82d380c 100644 (file)
--- a/liblock/mail.c
+++ b/libs/liblock/mail.c
@@ -19,7 +19,6 @@
 #include       <fcntl.h>
 #endif
 
-static const char rcsid[]="$Id: mail.c,v 1.10 2006/05/28 15:29:52 mrsam Exp $";
 
 struct ll_mail *ll_mail_alloc(const char *filename)
 {
@@ -316,7 +315,8 @@ static void dotlock_exists(const char *dotlock, char *myidbuf,
 
                if (readid(idbuf, fd) == 0 && (p=getpidid(idbuf, myidbuf)))
                {
-                       if (kill(p, 0) < 0 && errno == ESRCH)
+                       if (p == getpid() /* Possibly recycled PID */
+                           || (kill(p, 0) < 0 && errno == ESRCH))
                        {
                                close(fd);
                                if (unlink(dotlock) == 0)