Changeset View
Changeset View
Standalone View
Standalone View
security/courier-authlib/files/patch-libs_liblock_locktest.c
| --- libs/liblock/locktest.c.orig Mon Dec 6 14:18:55 1999 | --- libs/liblock/locktest.c.orig 2014-07-13 13:58:08 UTC | ||||
| +++ libs/liblock/locktest.c Sun May 15 08:00:42 2005 | +++ libs/liblock/locktest.c | ||||
| @@ -5,6 +5,7 @@ | @@ -3,6 +3,7 @@ | ||||
| ** distribution information. | |||||
| */ | |||||
| /* $Id */ | |||||
| +#include <paths.h> | +#include <paths.h> | ||||
| #include "liblock.h" | #include "liblock.h" | ||||
| #if USE_FCNTL | #if USE_FCNTL | ||||
| #include "lockfcntl.c" | #include "lockfcntl.c" | ||||
| @@ -20,11 +21,23 @@ | @@ -20,7 +21,7 @@ | ||||
| int main() | int main() | ||||
| { | { | ||||
| +#define FILENAME "courier-authlib.locktest.XXXXX" | -#define FILENAME "courier-imap.locktest.XXXXXXXXXX" | ||||
| +#define FILENAME "courier-authlib.locktest.XXXXXXXXXX" | |||||
| int fd[2]; | int fd[2]; | ||||
| pid_t p; | pid_t p; | ||||
| int s; | int s; | ||||
| int f; | @@ -29,7 +30,7 @@ int f; | ||||
| char *name; | |||||
| + char *name; | const char *tmpdir; | ||||
| + const char *tmpdir; | if ((tmpdir = (char *)getenv("TMPDIR")) == NULL || !*tmpdir) | ||||
| + if ((tmpdir = (char *)getenv("TMPDIR")) == NULL) | - tmpdir = "/tmp"; | ||||
| + tmpdir = _PATH_TMP; | + tmpdir = _PATH_TMP; | ||||
| + (void)asprintf(&name, "%s%s%s", tmpdir, | |||||
| + (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME); | |||||
| + if (name == NULL) { | |||||
| + perror("get filename"); | |||||
| + exit(1); | |||||
| + } | |||||
| + | |||||
| signal(SIGCHLD, SIG_DFL); | |||||
| if (pipe(fd)) | |||||
| { | |||||
| @@ -32,6 +45,12 @@ | |||||
| return (1); | |||||
| } | |||||
| + if ((f=mkstemp(name)) < 0) | if ((name=malloc(strlen(tmpdir)+sizeof(FILENAME)+1)) == NULL) | ||||
| + { | |||||
| + perror("open"); | |||||
| + exit(1); | |||||
| + } | |||||
| + | |||||
| if ((p=fork()) == (pid_t)-1) | |||||
| { | { | ||||
| perror("fork"); | @@ -37,7 +38,8 @@ int f; | ||||
| @@ -46,7 +65,7 @@ | |||||
| read(fd[0], &c, 1); | |||||
| close(fd[0]); | |||||
| - if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0) | |||||
| + if ((f=open(name, O_RDWR)) < 0) | |||||
| { | |||||
| perror("open"); | |||||
| exit(1); | exit(1); | ||||
| @@ -56,22 +75,18 @@ | |||||
| if (ll_lockfd(f, ll_writelock, 0, 0)) | |||||
| { | |||||
| close(f); | |||||
| + unlink(name); | |||||
| exit(0); | |||||
| } | } | ||||
| close(f); | |||||
| exit(1); | |||||
| } | |||||
| - | |||||
| - if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0) | |||||
| - { | |||||
| - perror("open"); | |||||
| - exit(1); | |||||
| - } | |||||
| if (ll_lockfd(f, ll_writelock, 0, 0)) | - (void)sprintf(name, "%s/%s", tmpdir, FILENAME); | ||||
| { | + (void)sprintf(name, "%s%s%s", tmpdir, | ||||
| perror("lock"); | + (tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME); | ||||
| close(f); | |||||
| + unlink(name); | signal(SIGCHLD, SIG_DFL); | ||||
| exit(1); | if (pipe(fd)) | ||||
| } | |||||
| close(fd[1]); | |||||