f8085c7 Enforce applying expecting modes to newly merged conflict files — HardenedBSD-pkg

HardenedBSD Package Manager

Enforce applying expecting modes to newly merged conflict files

Baptiste Daroussin committed 10 years ago

commit f8085c7f4d86b298829d0374acafdd84cf31b8a7
parent 2c587f0dbcf2826e3d89fe69cd6a9fbe322e76e3

1 file changed +2 -0

modified libpkg/pkg_add.c

@@ -262,6 +262,8 @@ do_extract(struct archive *a, struct archive_entry *ae, const char *location,

 			}
 			fprintf(f, "%s", sbuf_data(newconf));
 			fclose(f);
 			/* Apply expect mode setting */
 			chmod(rpath, aest->st_mode);
 		}
 		if (ret != ARCHIVE_OK) {