From c5b7aa153235d39720d80c3e7e700d83e9ff2e91 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 24 Feb 2006 01:56:26 +0000
Subject: [PATCH] The orig_umask value is now a mode_t.

---
 clientserver.c | 2 +-
 log.c          | 4 ++--
 pipe.c         | 2 +-
 rsync.c        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clientserver.c b/clientserver.c
index b631ef2c..138695ec 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -42,9 +42,9 @@ extern int filesfrom_fd;
 extern int remote_protocol;
 extern int protocol_version;
 extern int io_timeout;
-extern int orig_umask;
 extern int no_detach;
 extern int default_af_hint;
+extern mode_t orig_umask;
 extern char *bind_address;
 extern char *sockopts;
 extern char *config_file;
diff --git a/log.c b/log.c
index 77ce6d18..034aaccb 100644
--- a/log.c
+++ b/log.c
@@ -39,13 +39,13 @@ extern int local_server;
 extern int quiet;
 extern int module_id;
 extern int msg_fd_out;
-extern int orig_umask;
 extern int allow_8bit_chars;
 extern int protocol_version;
 extern int preserve_times;
 extern int log_format_has_i;
 extern int log_format_has_o_or_i;
 extern int daemon_log_format_has_o_or_i;
+extern mode_t orig_umask;
 extern char *auth_user;
 extern char *log_format;
 #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
@@ -144,7 +144,7 @@ static void syslog_init()
 
 static void logfile_open(void)
 {
-	int old_umask = umask(022 | orig_umask);
+	mode_t old_umask = umask(022 | orig_umask);
 	logfile = fopen(logfname, "a");
 	umask(old_umask);
 	if (!logfile) {
diff --git a/pipe.c b/pipe.c
index da1b4de0..84706085 100644
--- a/pipe.c
+++ b/pipe.c
@@ -24,8 +24,8 @@
 extern int am_sender;
 extern int am_server;
 extern int blocking_io;
-extern int orig_umask;
 extern int filesfrom_fd;
+extern mode_t orig_umask;
 extern struct chmod_mode_struct *chmod_modes;
 
 /**
diff --git a/rsync.c b/rsync.c
index 8ff841d0..69c98217 100644
--- a/rsync.c
+++ b/rsync.c
@@ -37,7 +37,6 @@ extern int preserve_perms;
 extern int preserve_executability;
 extern int preserve_times;
 extern int omit_dir_times;
-extern int orig_umask;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
@@ -49,6 +48,7 @@ extern int preserve_gid;
 extern int inplace;
 extern int keep_dirlinks;
 extern int make_backups;
+extern mode_t orig_umask;
 extern struct stats stats;
 extern struct chmod_mode_struct *daemon_chmod_modes;
 
-- 
2.34.1