diff -u ebox-samba-0.12.6.101/debian/control ebox-samba-0.12.6.101/debian/control
--- ebox-samba-0.12.6.101/debian/control
+++ ebox-samba-0.12.6.101/debian/control
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Javier Uruen Val <javi@warp.es>
-Build-Depends: debhelper (>= 4.0.0), cdbs
+Build-Depends: debhelper (>= 4.0.0), cdbs, dpatch
 Standards-Version: 3.8.0
 
 Package: ebox-samba
diff -u ebox-samba-0.12.6.101/debian/changelog ebox-samba-0.12.6.101/debian/changelog
--- ebox-samba-0.12.6.101/debian/changelog
+++ ebox-samba-0.12.6.101/debian/changelog
@@ -1,3 +1,11 @@
+ebox-samba (0.12.6.101-0ubuntu2) jaunty; urgency=low
+
+  * debian/patches/01_disable_tls_unix_socket. Closes (LP: #354150)
+      - Disable TLS on unix socket connecting to openLDAP
+  * Enable dpatch system
+
+ -- Javier Uruen Val <javi@warp.es>  Thu, 02 Apr 2009 23:51:56 +0200
+
 ebox-samba (0.12.6.101-0ubuntu1) jaunty; urgency=low
 
   [ Javier Uruen Val ]
diff -u ebox-samba-0.12.6.101/debian/rules ebox-samba-0.12.6.101/debian/rules
--- ebox-samba-0.12.6.101/debian/rules
+++ ebox-samba-0.12.6.101/debian/rules
@@ -5,2 +5,4 @@
 include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/dpatch/dpatch.make
 include debian/cdbs/ebox.mk
only in patch2:
unchanged:
--- ebox-samba-0.12.6.101.orig/debian/patches/01_disable_tls_unix_socket.dpatch
+++ ebox-samba-0.12.6.101/debian/patches/01_disable_tls_unix_socket.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_disable_tls_unix_socket.dpatch by Javier Uruen Val <javi@warp.es>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+##
+## DP: eBox configures samba to connect to openLDAP through a unix socket.
+##
+## DP: In previous versions samba seemed to detect that it was connecting through a
+## DP: a unix socket and it didn't try to start TLS on it.
+##
+## DP: Without this patch samba will try to connect using TLS on the unix socket and
+## DP: it will fail.
+##
+## DP: This patch just disables TLS.
+##
+## 
+
+@DPATCH@
+diff -urNad ebox-samba-0.12.6.101~/stubs/smb.conf.mas ebox-samba-0.12.6.101/stubs/smb.conf.mas
+--- ebox-samba-0.12.6.101~/stubs/smb.conf.mas	2008-09-02 18:03:56.000000000 +0200
++++ ebox-samba-0.12.6.101/stubs/smb.conf.mas	2009-04-02 23:17:13.000000000 +0200
+@@ -24,6 +24,7 @@
+  enable privileges = yes
+  interfaces = <% $ifaces %>
+  bind interfaces only = Yes
++ ldap ssl = Off
+  passdb backend = ldapsam:<% $ldap->{'ldapi'} %>
+  log level = 1
+  syslog = 0
only in patch2:
unchanged:
--- ebox-samba-0.12.6.101.orig/debian/patches/00list
+++ ebox-samba-0.12.6.101/debian/patches/00list
@@ -0,0 +1 @@
+01_disable_tls_unix_socket