Request 558 (accepted)

Overview

Request 558 (accepted)

kolab-saslauthd: use conf.socketfile

Created by ajaissle about 10 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit pykolab

Submit package home:ajaissle:b...lab:Development / pykolab to package Kolab:Development / pykolab

pykolab.spec Changed

@@ -29,7 +29,7 @@
 Summary:            Kolab Groupware Solution
 Name:               pykolab
 Version:            0.7.1
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
@@ -41,6 +41,7 @@
 Patch0002:          0002-Add-kolab_tags-plugin-to-the-default-configuration.patch
 Patch0003:          0003-Set-the-URL-to-files-to-chwala-2436.patch
 Patch0004:          0004-Use-more-secure-urls-by-default.patch
+Patch0005:          0005-use-socketconf.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -209,6 +210,7 @@
 %patch0002 -p1
 %patch0003 -p1
 %patch0004 -p1
+%patch0005 -p1
 
 %build
 autoreconf -v
@@ -532,6 +534,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Tue Aug 26 2014 Aeneas Jaissle <aj@ajaissle.de> - 0.7.1-2
+- Added patch to use conf.socketfile in kolab-saslauthd
+
 * Tue Aug 19 2014 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.7.1-1
 - New upstream release 0.7.1

0005-use-socketconf.patch Added

@@ -0,0 +1,38 @@
+From afdbc23d4b157a8e5449531896e0e0f01ce6fc4b Mon Sep 17 00:00:00 2001
+From: Aeneas Jaißle <aj@ajaissle.de>
+Date: Tue, 26 Aug 2014 23:21:57 +0200
+Subject: Actually use the socket configured
+
+---
+diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py
+index b7f81d5..6590747 100644
+--- a/saslauthd/__init__.py
++++ b/saslauthd/__init__.py
+@@ -170,13 +170,13 @@ class SASLAuthDaemon(object):
+ 
+         # TODO: The saslauthd socket path could be a setting.
+         try:
+-            os.remove('/var/run/saslauthd/mux')
++            os.remove(conf.socketfile)
+         except:
+             # TODO: Do the "could not remove, could not start" dance
+             pass
+ 
+-        s.bind('/var/run/saslauthd/mux')
+-        os.chmod('/var/run/saslauthd/mux', 0777)
++        s.bind(conf.socketfile)
++        os.chmod(conf.socketfile, 0777)
+ 
+         s.listen(5)
+ 
+@@ -271,7 +271,7 @@ class SASLAuthDaemon(object):
+ 
+     def _ensure_socket_dir(self):
+         utils.ensure_directory(
+-                '/var/run/saslauthd/',
++                os.path.dirname(conf.socketfile),
+                 conf.process_username,
+                 conf.process_groupname
+             )
+--
+cgit v0.9.0.2

debian.changelog Changed

debian.series Changed

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 558 0

Request History

ajaissle created request about 10 years ago

kolab-saslauthd: use conf.socketfile

vanmeeuwen accepted request about 10 years ago

Please add a comment