From patchwork Mon Apr  6 16:50:44 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: bmarzins@sourceware.org
X-Patchwork-Id: 16613
Received: from hormel.redhat.com (hormel1.redhat.com [209.132.177.33])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n36Gph2c021415
	for <patchwork-dm-devel@patchwork.kernel.org>;
	Mon, 6 Apr 2009 16:51:44 GMT
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com
	[10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP id DE3DF619B39;
	Mon,  6 Apr 2009 12:51:43 -0400 (EDT)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	n36Gpg4o017803 for <dm-devel@listman.util.phx.redhat.com>;
	Mon, 6 Apr 2009 12:51:42 -0400
Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id
	n36Gpi9s024288
	for <dm-devel@redhat.com>; Mon, 6 Apr 2009 12:51:44 -0400
Received: from sourceware.org (sourceware.org [209.132.176.174])
	by mx1.redhat.com (8.13.8/8.13.8) with SMTP id n36GojtN011731
	for <dm-devel@redhat.com>; Mon, 6 Apr 2009 12:50:45 -0400
Received: (qmail 22476 invoked by uid 9475); 6 Apr 2009 16:50:44 -0000
Date: 6 Apr 2009 16:50:44 -0000
Message-ID: <20090406165044.22474.qmail@sourceware.org>
From: bmarzins@sourceware.org
To: dm-cvs@sourceware.org, dm-devel@redhat.com
X-RedHat-Spam-Score: -4 
X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
X-Scanned-By: MIMEDefang 2.63 on 172.16.48.31
X-loop: dm-devel@redhat.com
Cc: 
Subject: [dm-devel] multipath-tools/multipathd main.c multipathd.i ...
X-BeenThere: dm-devel@redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: device-mapper development <dm-devel@redhat.com>
List-Id: device-mapper development <dm-devel.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/dm-devel>
List-Post: <mailto:dm-devel@redhat.com>
List-Help: <mailto:dm-devel-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/dm-devel>,
	<mailto:dm-devel-request@redhat.com?subject=subscribe>
Sender: dm-devel-bounces@redhat.com
Errors-To: dm-devel-bounces@redhat.com

CVSROOT:	/cvs/dm
Module name:	multipath-tools
Branch: 	RHEL5_FC6
Changes by:	bmarzins@sourceware.org	2009-04-06 16:50:44

Modified files:
	multipathd     : main.c multipathd.init.redhat 

Log message:
	Fix for bz #493402. Change umask for multipathd. Already fixed upstream.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/main.c.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.69.2.17&r2=1.69.2.18
http://sourceware.org/cgi-bin/cvsweb.cgi/multipath-tools/multipathd/multipathd.init.redhat.diff?cvsroot=dm&only_with_tag=RHEL5_FC6&r1=1.2.4.3&r2=1.2.4.4
---
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel

--- multipath-tools/multipathd/main.c	2009/04/03 15:09:03	1.69.2.17
+++ multipath-tools/multipathd/main.c	2009/04/06 16:50:43	1.69.2.18
@@ -775,6 +775,7 @@
 	add_handler(RESTOREQ+MAPS, cli_restore_all_queueing);
 	add_handler(RESIZE+MAP, cli_resize);
 
+	umask(077);
 	uxsock_listen(&uxsock_trigger, ap);
 
 	return NULL;
@@ -1497,7 +1498,6 @@
 	close(in_fd);
 	close(out_fd);
 	chdir("/");
-	umask(0);
 }
 
 enum child_flag_bits {
--- multipath-tools/multipathd/multipathd.init.redhat	2008/08/28 19:22:33	1.2.4.3
+++ multipath-tools/multipathd/multipathd.init.redhat	2009/04/06 16:50:44	1.2.4.4
@@ -29,6 +29,7 @@
 
 teardown_slaves()
 {
+pwd=`pwd`
 cd $1; 
 if [ -d "slaves" ]; then
 for slave in slaves/*;
@@ -54,6 +55,7 @@
 			exit 1
 		fi
 fi
+cd $pwd
 }
 
 #