From 86e9b9054a97f75a111accc133e15233662aecfa Mon Sep 17 00:00:00 2001
From: patvdv <github@kudos.be>
Date: Thu, 27 Aug 2015 17:12:13 +0200
Subject: [PATCH 1/3] Small fix in sfttp_file()

---
 manage_sudo.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/manage_sudo.sh b/manage_sudo.sh
index 282021e..cc604bf 100644
--- a/manage_sudo.sh
+++ b/manage_sudo.sh
@@ -41,6 +41,7 @@
 # @(#) 2015-08-26: added DO_SFTP_CHMOD configuration parameter to avoid
 # @(#)             setstat failures with sftp_file() when remote file
 # @(#)             permissions do not allow (VRF 1.2.1) [Patrick Van der Veken]
+# @(#) 2015-08-27: smmall fix in sftp_file() (VRF 1.2.2) [Patrick Van der Veken]
 # -----------------------------------------------------------------------------
 # DO NOT CHANGE THIS FILE UNLESS YOU KNOW WHAT YOU ARE DOING!
 #******************************************************************************
@@ -54,7 +55,7 @@
 # or LOCAL_CONFIG_FILE instead
 
 # define the V.R.F (version/release/fix)
-MY_VRF="1.2.1"
+MY_VRF="1.2.2"
 # name of the global configuration file (script)
 GLOBAL_CONFIG_FILE="manage_sudo.conf"
 # name of the local configuration file (script)
@@ -677,14 +678,14 @@ OLD_PWD=$(pwd) && cd ${TRANSFER_DIR}
 # transfer, (possibly) chmod the file to/on the target server (keep STDERR)
 if (( DO_SFTP_CHMOD  ))
 then
-    sftp ${SFTP_ARGS} ${SSH_TRANSFER_USER}@${TRANSFER_HOST} >/dev/null <<EOT
+    sftp ${SFTP_ARGS} ${SUDO_TRANSFER_USER}@${TRANSFER_HOST} >/dev/null <<EOT
 cd ${REMOTE_DIR}
 put ${SOURCE_FILE}
 chmod ${TRANSFER_PERMS} ${SOURCE_FILE}
 EOT
     SFTP_RC=$?
 else
-    sftp ${SFTP_ARGS} ${SSH_TRANSFER_USER}@${TRANSFER_HOST} >/dev/null <<EOT
+    sftp ${SFTP_ARGS} ${SUDO_TRANSFER_USER}@${TRANSFER_HOST} >/dev/null <<EOT
 cd ${REMOTE_DIR}
 put ${SOURCE_FILE}
 EOT

From 8351a78e668da6266c0fa8d8decea4d473b24232 Mon Sep 17 00:00:00 2001
From: patvdv <github@kudos.be>
Date: Thu, 27 Aug 2015 17:12:29 +0200
Subject: [PATCH 2/3] Small fix

---
 update_sudo.pl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/update_sudo.pl b/update_sudo.pl
index 4bc4341..3c2f4f7 100644
--- a/update_sudo.pl
+++ b/update_sudo.pl
@@ -44,7 +44,7 @@ use File::Temp qw(tempfile);
 
 # ------------------------- CONFIGURATION starts here -------------------------
 # define the V.R.F (version/release/fix)
-my $MY_VRF = "1.1.1";
+my $MY_VRF = "1.1.2";
 # name of global configuration file (no path, must be located in the script directory)
 my $global_config_file = "update_sudo.conf";
 # name of localized configuration file (no path, must be located in the script directory)
@@ -55,7 +55,7 @@ my $selinux_context = "etc_t";
 # initialize variables
 my ($debug, $verbose, $preview, $global, $use_fqdn) = (0,0,0,0,0);
 my (@config_files, $fragments_dir, $visudo_bin, $immutable_self_file, $immutable_self_cmd);
-my (%options, %aliases, %frags, @grants);
+my (%options, @uname, %aliases, %frags, @grants);
 my ($os, $host, $hostname, $run_dir);
 my ($selinux_status, $selinux_context, $has_selinux) = ("","",0);
 $|++;
@@ -742,4 +742,5 @@ S<       >Show version of the script.
 @(#) 2014-12-16: VRF 1.0.2: fixed a problem with the immutable self fragment code [Patrick Van der Veken]
 @(#) 2015-02-02: VRF 1.0.3: changed 'basename' into 'fileparse' call to support fragment files with extensions [Patrick Van der Veken]
 @(#) 2015-08-18: VRF 1.1.0: replace uname/hostname syscalls, now support for FQDN via $use_fqdn, other fixes [Patrick Van der Veken]
-@(#) 2015-08-26: VRF 1.1.1: small and not so small fixes [Patrick Van der Veken]
\ No newline at end of file
+@(#) 2015-08-26: VRF 1.1.1: small and not so small fixes [Patrick Van der Veken]
+@(#) 2015-08-27: VRF 1.1.2: small fix [Patrick Van der Veken]

From fc666f4a4f25f3b47630d5ebda3a7068e6db1ca4 Mon Sep 17 00:00:00 2001
From: patvdv <github@kudos.be>
Date: Thu, 27 Aug 2015 17:19:16 +0200
Subject: [PATCH 3/3] Fixed options

---
 manage_sudo.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manage_sudo.conf b/manage_sudo.conf
index 56e9c27..cdbd32b 100644
--- a/manage_sudo.conf
+++ b/manage_sudo.conf
@@ -16,8 +16,8 @@ SUDO_TRANSFER_USER=""
 # name of the OS group that should own the SUDO controls files
 SUDO_OWNER_GROUP="sudoadmin"
 
-# whether a 'chmod' needs to be executed after each sftp transfer [0=Yes; 1=No]
-DO_SFTP_CHMOD=0
+# whether a 'chmod' needs to be executed after each sftp transfer [0=No; 1=Yes]
+DO_SFTP_CHMOD=1
 
 # extra arguments/options for the SFTP command
 SFTP_ARGS="-o StrictHostKeyChecking=no -o ConnectTimeout=10 -b - "