Commit 25e74062 authored by Ben Collins's avatar Ben Collins
Browse files

when opening files in /tmp use O_CREAT|O_EXCL to overcome race conditions

parent a132d14f
...@@ -35,8 +35,16 @@ ...@@ -35,8 +35,16 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/stat.h>
#include <ac/unistd.h> /* get ftruncate() */ #include <ac/unistd.h> /* get ftruncate() */
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_FCNTL_H
#include <fcntl.h>
#endif
#include "slurp.h" #include "slurp.h"
#include "globals.h" #include "globals.h"
...@@ -227,17 +235,28 @@ Rq_dump( ...@@ -227,17 +235,28 @@ Rq_dump(
{ {
Re *re; Re *re;
FILE *fp; FILE *fp;
int tmpfd;
if ( rq == NULL ) { if ( rq == NULL ) {
Debug( LDAP_DEBUG_ANY, "Rq_dump: rq is NULL!\n", 0, 0, 0 ); Debug( LDAP_DEBUG_ANY, "Rq_dump: rq is NULL!\n", 0, 0, 0 );
return; return;
} }
if (( fp = fopen( SLURPD_DUMPFILE, "w" )) == NULL ) { if (unlink(SLURPD_DUMPFILE) == -1 && errno != ENOENT) {
Debug( LDAP_DEBUG_ANY, "Rq_dump: \"%s\" exists, and cannot unlink\n",
SLURPD_DUMPFILE, 0, 0 );
return;
}
if (( tmpfd = open(SLURPD_DUMPFILE, O_CREAT|O_RDWR|O_EXCL, 0600)) == -1) {
Debug( LDAP_DEBUG_ANY, "Rq_dump: cannot open \"%s\" for write\n", Debug( LDAP_DEBUG_ANY, "Rq_dump: cannot open \"%s\" for write\n",
SLURPD_DUMPFILE, 0, 0 ); SLURPD_DUMPFILE, 0, 0 );
return; return;
} }
if (( fp = fdopen( tmpfd, "w" )) == NULL ) {
Debug( LDAP_DEBUG_ANY, "Rq_dump: cannot fdopen \"%s\" for write\n",
SLURPD_DUMPFILE, 0, 0 );
return;
}
rq->rq_lock( rq ); rq->rq_lock( rq );
for ( re = rq->rq_gethead( rq ); re != NULL; re = rq->rq_getnext( re )) { for ( re = rq->rq_gethead( rq ); re != NULL; re = rq->rq_getnext( re )) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment