X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=lib%2Ffile%2Ffile.c;h=6028005712788c9b8dd8c4d552561f211f2fcdcd;hb=5d7f93f2ee09de515e1e474fd752d52590b51793;hp=57a251901a5afd1dbc1234313af2b1827d65f685;hpb=abf92c05c31955333719f1a83cffb0d0d194c770;p=petitboot

diff --git a/lib/file/file.c b/lib/file/file.c
index 57a2519..6028005 100644
--- a/lib/file/file.c
+++ b/lib/file/file.c
@@ -44,7 +44,6 @@ int copy_file_secure_dest(void *ctx, const char *source_file,
 	unsigned char *buffer;
 	ssize_t r;
 	size_t l1;
-	mode_t oldmask;
 
 	source_handle = fopen(source_file, "r");
 	if (!source_handle) {
@@ -53,17 +52,15 @@ int copy_file_secure_dest(void *ctx, const char *source_file,
 			return -1;
 	}
 
-	oldmask = umask(0644);
 	destination_fd = mkstemp(template);
-	umask(oldmask);
 	if (destination_fd < 0) {
-		pb_log("%s: unable to create temp file, %m\n", __func__);
+		pb_log_fn("unable to create temp file, %m\n");
 		fclose(source_handle);
 		return -1;
 	}
 	destination_handle = fdopen(destination_fd, "w");
 	if (!destination_handle) {
-		pb_log("%s: unable to open destination file, %m\n", __func__);
+		pb_log_fn("unable to open destination file, %m\n");
 		fclose(source_handle);
 		close(destination_fd);
 		return -1;
@@ -84,7 +81,7 @@ int copy_file_secure_dest(void *ctx, const char *source_file,
 			if (ferror(destination_handle)) {
 				/* General error */
 				result = -1;
-				pb_log("%s: failed: unknown fault\n", __func__);
+				pb_log_fn("failed: unknown fault\n");
 			}
 			else {
 				/* No space on destination device */