File 0001-Medium-CTDB-Preserve-permissions-on-smb.co... of Package resource-agents

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Medium-CTDB-Preserve-permissions-on-smb.conf-bsc-935.patch of Package resource-agents

From 07e741297a6b5428732974ca4436e09c7e7f1955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
Date: Thu, 18 Jun 2015 14:43:42 +0200
Subject: [PATCH 1/3] Medium: CTDB: Preserve permissions on smb.conf
 (bsc#935253)

When updating smb.conf, the permissions are not preserved.
This may cause smbclient to be unable to read the file where
it was previously able.

Resolve the problem by copying the new configuration into
place, rather than moving it.
---
 heartbeat/CTDB | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/heartbeat/CTDB b/heartbeat/CTDB
index 3419b54..bc55cb3 100755
--- a/heartbeat/CTDB
+++ b/heartbeat/CTDB
@@ -452,6 +452,8 @@ init_smb_conf() {
 			vfs_fileid="$vfs_fileid\tvfs objects = fileid\n"
 		fi
 	fi
+	# Preserve permissions of smb.conf
+	cp -a $OCF_RESKEY_smb_conf $OCF_RESKEY_smb_conf.$$
 	awk '
 		/^[[:space:]]*\[/ { global = 0 }
 		/^[[:space:]]*\[global\]/ { global = 1 }
@@ -472,7 +474,8 @@ init_smb_conf() {
 \tidmap backend = $OCF_RESKEY_smb_idmap_backend\n\
 \tctdbd socket = $OCF_RESKEY_ctdb_socket\n$private_dir$vfs_fileid\
 \t# CTDB-RA: End auto-generated section (do not change above)" > $OCF_RESKEY_smb_conf.$$
-	mv -f $OCF_RESKEY_smb_conf.$$ $OCF_RESKEY_smb_conf
+	dd conv=notrunc,fsync of=$OCF_RESKEY_smb_conf.$$ if=/dev/null >/dev/null 2>&1
+	mv $OCF_RESKEY_smb_conf.$$ $OCF_RESKEY_smb_conf
 }
 
 
@@ -480,8 +483,10 @@ init_smb_conf() {
 cleanup_smb_conf() {
 	ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" || return 0
 
+	# preserve permissions of smb.conf
+	cp -a $OCF_RESKEY_smb_conf $OCF_RESKEY_smb_conf.$$
 	sed '/# CTDB-RA: Begin/,/# CTDB-RA: End/d' $OCF_RESKEY_smb_conf > $OCF_RESKEY_smb_conf.$$
-	mv -f $OCF_RESKEY_smb_conf.$$ $OCF_RESKEY_smb_conf
+	mv $OCF_RESKEY_smb_conf.$$ $OCF_RESKEY_smb_conf
 }
 
 append_ctdb_sysconfig() {
-- 
2.5.1

Places

File 0001-Medium-CTDB-Preserve-permissions-on-smb.conf-bsc-935.patch of Package resource-agents

Places