s4:librpc/rpc: make use of dcerpc_secondary_smb_send/recv() in dcerpc_secondary_context()

[mat/samba.git] / libgpo / gpo_ini.c

diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c
index a4bff0e86b8381412bfc3980163248065c9ba99e..a2cb106d73c9ad335852262604aea0805cd23ef6 100644 (file)
--- a/libgpo/gpo_ini.c
+++ b/libgpo/gpo_ini.c
@@ -63,6 +63,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
        NTSTATUS status;
        size_t n = 0;
        size_t converted_size;
+       mode_t mask;
 
        if (!filename_out) {
                return NT_STATUS_INVALID_PARAMETER;
@@ -81,7 +82,9 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
                goto out;
        }
 
+       mask = umask(S_IRWXO | S_IRWXG);
        tmp_fd = mkstemp(tmp_name);
+       umask(mask);
        if (tmp_fd == -1) {
                status = NT_STATUS_ACCESS_DENIED;
                goto out;
@@ -108,7 +111,7 @@ static NTSTATUS convert_file_from_ucs2(TALLOC_CTX *mem_ctx,
        }
 
        if (write(tmp_fd, data_out, converted_size) != converted_size) {
-               status = map_nt_error_from_unix(errno);
+               status = map_nt_error_from_unix_common(errno);
                goto out;
        }