#! /bin/sh /usr/share/dpatch/dpatch-run
## 10_open_mode.dpatch by James Westby <james.westby@canonical.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Add mode argument to open() calls with O_CREAT.
@DPATCH@
diff -urNad dx-4.4.4~/src/exec/libdx/fileio.c dx-4.4.4/src/exec/libdx/fileio.c
--- dx-4.4.4~/src/exec/libdx/fileio.c 2006-01-05 22:55:47.000000000 +0000
+++ dx-4.4.4/src/exec/libdx/fileio.c 2009-01-17 17:06:51.000000000 +0000
@@ -263,7 +263,7 @@
case 2:/* read/write */
fd = open(name, O_RDWR);
if (fd < 0) {
- fd = open(name, O_WRONLY | O_CREAT);
+ fd = open(name, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
if (fd < 0) {
DXSetError(ERROR_DATA_INVALID,
"can't open/create file '%s'", name);
diff -urNad dx-4.4.4~/src/exec/libdx/plock.c dx-4.4.4/src/exec/libdx/plock.c
--- dx-4.4.4~/src/exec/libdx/plock.c 2002-07-17 05:48:18.000000000 +0100
+++ dx-4.4.4/src/exec/libdx/plock.c 2009-01-17 17:06:51.000000000 +0000
@@ -37,7 +37,8 @@
#define SEM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
#define SHM_FLAGS (IPC_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
-#define OPEN_FLAGS (O_CREAT | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
+#define OPEN_FLAGS (O_CREAT)
+#define OPEN_MODE (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)
#define IS_MINE(a) (locks->_owner[a] == getpid())
#define SET_OWNER(a) (locks->_owner[a] = getpid())
#define CLEAR_OWNER(a) (locks->_owner[a] = 0)
@@ -268,7 +269,7 @@
if (stat(LOCKFILE, &statbuf))
{
- int fd = open(LOCKFILE, OPEN_FLAGS);
+ int fd = open(LOCKFILE, OPEN_FLAGS, OPEN_MODE);
if (fd < 0)
{
fprintf(stderr, "initLocks: error accessing locks shared block: open\n");