- /* we initially set the perms without the
- setuid/setgid bits to ensure that there is no race
- condition. They are then correctly updated after
- the lchown. Thanks to snabb@epipe.fi for pointing
- this out */
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & ACCESSPERMS);
-
- if (fd2 == -1 && relative_paths && errno == ENOENT &&
- create_directory_path(fnametmp) == 0) {
- fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
- file->mode & ACCESSPERMS);
- }
- if (fd2 == -1) {
- rprintf(FERROR,"open %s : %s\n",fnametmp,strerror(errno));
- receive_data(f_in,buf,-1,NULL,file->length);
- if (buf) unmap_file(buf);
- if (fd1 != -1) close(fd1);
- continue;
+ strlcpy(template, fnametmp, sizeof template);
+
+ /* we initially set the perms without the
+ * setuid/setgid bits to ensure that there is no race
+ * condition. They are then correctly updated after
+ * the lchown. Thanks to snabb@epipe.fi for pointing
+ * this out. We also set it initially without group
+ * access because of a similar race condition. */
+ fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+
+ /* in most cases parent directories will already exist
+ * because their information should have been previously
+ * transferred, but that may not be the case with -R */
+ if (fd2 == -1 && relative_paths && errno == ENOENT
+ && create_directory_path(fnametmp, orig_umask) == 0) {
+ strlcpy(fnametmp, template, sizeof fnametmp);
+ fd2 = do_mkstemp(fnametmp, file->mode & INITACCESSPERMS);
+ }
+ if (fd2 == -1) {
+ rsyserr(FERROR, errno, "mkstemp %s failed",
+ full_fname(fnametmp));
+ receive_data(f_in,mapbuf,-1,NULL,file->length);
+ if (mapbuf)
+ unmap_file(mapbuf);
+ if (fd1 != -1)
+ close(fd1);
+ continue;
+ }
+
+ cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);