[Pkg-cyrus-sasl2-commits] r244 - in /cyrus-sasl-2.1/trunk/debian/patches: 0016_pid_file_lock_creation_mask.dpatch 00list

[fabbe at users.alioth.debian.org]

Author: fabbe
Date: Tue Jun 26 09:12:21 2007
New Revision: 244

URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/?sc=1&rev=244
Log:
Add patch from Sam Hocevar to fix octal/decimal confusion in pid_file_lock.

Added:
    cyrus-sasl-2.1/trunk/debian/patches/0016_pid_file_lock_creation_mask.dpatch   (with props)
Modified:
    cyrus-sasl-2.1/trunk/debian/patches/00list

Added: cyrus-sasl-2.1/trunk/debian/patches/0016_pid_file_lock_creation_mask.dpatch
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/0016_pid_file_lock_creation_mask.dpatch?rev=244&op=file
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/0016_pid_file_lock_creation_mask.dpatch (added)
+++ cyrus-sasl-2.1/trunk/debian/patches/0016_pid_file_lock_creation_mask.dpatch Tue Jun 26 09:12:21 2007
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 0016_pid_file_lock_creation_mask.dpatch by Sam Hocevar <sam at zoy.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: pid_file_lock is created with a mask of 644 instead of 0644.
+## DP: This patch fixes this octal/decimal confusion as well as the
+## DP: (harmless) one in the previous umask() call.
+
+ at DPATCH@
+diff -urNad trunk~/saslauthd/saslauthd-main.c trunk/saslauthd/saslauthd-main.c
+--- trunk~/saslauthd/saslauthd-main.c	2006-05-29 22:52:42.000000000 +0300
++++ trunk/saslauthd/saslauthd-main.c	2007-06-26 12:07:10.000000000 +0300
+@@ -276,7 +276,7 @@
+ 		exit(1);
+ 	}
+ 
+-	umask(077);
++	umask(0077);
+ 
+ 	pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
+ 	if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
+@@ -287,7 +287,7 @@
+ 	strlcpy(pid_file_lock, run_path, pid_file_size);
+ 	strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
+ 
+-	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
++	if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
+ 		rc = errno;
+ 		logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
+ 		logger(L_ERR, L_FUNC, "open: %s", strerror(rc));

Propchange: cyrus-sasl-2.1/trunk/debian/patches/0016_pid_file_lock_creation_mask.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: cyrus-sasl-2.1/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cyrus-sasl2/cyrus-sasl-2.1/trunk/debian/patches/00list?rev=244&op=diff
==============================================================================
--- cyrus-sasl-2.1/trunk/debian/patches/00list (original)
+++ cyrus-sasl-2.1/trunk/debian/patches/00list Tue Jun 26 09:12:21 2007
@@ -13,3 +13,4 @@
 0013_fix_hurd_build
 0014_avoid_pic_overwrite
 0015_saslutil_decode64_fix
+0016_pid_file_lock_creation_mask