| 1 |
filippocarletti |
1.1 |
diff -uNr e-smith-ldap-5.2.0/root/etc/e-smith/db/configuration/defaults/ldap/TCPPort e-smith-ldap-5.2.0-nh-tls/root/etc/e-smith/db/configuration/defaults/ldap/TCPPort |
| 2 |
|
|
--- e-smith-ldap-5.2.0/root/etc/e-smith/db/configuration/defaults/ldap/TCPPort 2005-07-27 23:26:55.000000000 +0200 |
| 3 |
|
|
+++ e-smith-ldap-5.2.0-nh-tls/root/etc/e-smith/db/configuration/defaults/ldap/TCPPort 1970-01-01 01:00:00.000000000 +0100 |
| 4 |
|
|
@@ -1 +0,0 @@ |
| 5 |
|
|
-389 |
| 6 |
|
|
diff -uNr e-smith-ldap-5.2.0/root/etc/e-smith/db/configuration/defaults/ldap/TCPPorts e-smith-ldap-5.2.0-nh-tls/root/etc/e-smith/db/configuration/defaults/ldap/TCPPorts |
| 7 |
|
|
--- e-smith-ldap-5.2.0/root/etc/e-smith/db/configuration/defaults/ldap/TCPPorts 1970-01-01 01:00:00.000000000 +0100 |
| 8 |
|
|
+++ e-smith-ldap-5.2.0-nh-tls/root/etc/e-smith/db/configuration/defaults/ldap/TCPPorts 2010-01-21 17:30:08.451662573 +0100 |
| 9 |
|
|
@@ -0,0 +1 @@ |
| 10 |
|
|
+389,636 |
| 11 |
|
|
diff -uNr e-smith-ldap-5.2.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/12tls e-smith-ldap-5.2.0-nh-tls/root/etc/e-smith/templates/etc/openldap/slapd.conf/12tls |
| 12 |
|
|
--- e-smith-ldap-5.2.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/12tls 1970-01-01 01:00:00.000000000 +0100 |
| 13 |
|
|
+++ e-smith-ldap-5.2.0-nh-tls/root/etc/e-smith/templates/etc/openldap/slapd.conf/12tls 2010-01-21 17:26:22.955826264 +0100 |
| 14 |
|
|
@@ -0,0 +1,7 @@ |
| 15 |
|
|
+ |
| 16 |
|
|
+TLSCipherSuite HIGH:MEDIUM:+SSLv2 |
| 17 |
|
|
+TLSCACertificateFile /var/service/ldap/ssl/slapd.pem |
| 18 |
|
|
+TLSCertificateFile /var/service/ldap/ssl/slapd.pem |
| 19 |
|
|
+TLSCertificateKeyFile /var/service/ldap/ssl/slapd.pem |
| 20 |
|
|
+TLSVerifyClient never |
| 21 |
|
|
+ |
| 22 |
|
|
diff -uNr e-smith-ldap-5.2.0/root/var/service/ldap/control/1 e-smith-ldap-5.2.0-nh-tls/root/var/service/ldap/control/1 |
| 23 |
|
|
--- e-smith-ldap-5.2.0/root/var/service/ldap/control/1 1970-01-01 01:00:00.000000000 +0100 |
| 24 |
|
|
+++ e-smith-ldap-5.2.0-nh-tls/root/var/service/ldap/control/1 2010-01-21 17:26:22.955826264 +0100 |
| 25 |
|
|
@@ -0,0 +1,39 @@ |
| 26 |
|
|
+#!/usr/bin/perl -w |
| 27 |
|
|
+ |
| 28 |
|
|
+#---------------------------------------------------------------------- |
| 29 |
|
|
+# copyright (C) 2005 Mitel Networks Corporation |
| 30 |
|
|
+# |
| 31 |
|
|
+# This program is free software; you can redistribute it and/or modify |
| 32 |
|
|
+# it under the terms of the GNU General Public License as published by |
| 33 |
|
|
+# the Free Software Foundation; either version 2 of the License, or |
| 34 |
|
|
+# (at your option) any later version. |
| 35 |
|
|
+# |
| 36 |
|
|
+# This program is distributed in the hope that it will be useful, |
| 37 |
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 38 |
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 39 |
|
|
+# GNU General Public License for more details. |
| 40 |
|
|
+# |
| 41 |
|
|
+# You should have received a copy of the GNU General Public License |
| 42 |
|
|
+# along with this program; if not, write to the Free Software |
| 43 |
|
|
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 44 |
|
|
+# |
| 45 |
|
|
+# Technical support for this program is available from Mitel Networks |
| 46 |
|
|
+# Please visit our web site www.mitel.com/sme/ for details. |
| 47 |
|
|
+#---------------------------------------------------------------------- |
| 48 |
|
|
+ |
| 49 |
|
|
+use esmith::util; |
| 50 |
|
|
+use esmith::ConfigDB; |
| 51 |
|
|
+use File::Copy; |
| 52 |
|
|
+ |
| 53 |
|
|
+my $c = esmith::ConfigDB->open_ro; |
| 54 |
|
|
+my $s = $c->get('SystemName')->value; |
| 55 |
|
|
+my $d = $c->get('DomainName')->value; |
| 56 |
|
|
+ |
| 57 |
|
|
+my $pem = "./ssl/slapd.pem"; |
| 58 |
|
|
+# Now copy system pem file into jail used by ldap |
| 59 |
|
|
+copy("/home/e-smith/ssl.pem/$s.$d.pem", "$pem.$$") |
| 60 |
|
|
+ or die "failed to copy SSL PEM: $!"; |
| 61 |
|
|
+chmod 0640, "$pem.$$"; |
| 62 |
|
|
+esmith::util::chownFile("root", "ldap", "$pem.$$"); |
| 63 |
|
|
+rename("$pem.$$", "$pem") |
| 64 |
|
|
+ or die "failed to rename $pem.$$ to $pem: $!"; |
| 65 |
|
|
diff -uNr e-smith-ldap-5.2.0/root/var/service/ldap/run e-smith-ldap-5.2.0-nh-tls/root/var/service/ldap/run |
| 66 |
|
|
--- e-smith-ldap-5.2.0/root/var/service/ldap/run 2010-01-21 17:27:22.843343080 +0100 |
| 67 |
|
|
+++ e-smith-ldap-5.2.0-nh-tls/root/var/service/ldap/run 2010-01-21 17:27:54.172898066 +0100 |
| 68 |
|
|
@@ -3,6 +3,8 @@ |
| 69 |
|
|
domain=$(/sbin/e-smith/config get DomainName) |
| 70 |
|
|
old_domain=$(readlink ldif) |
| 71 |
|
|
|
| 72 |
|
|
+./control/1 |
| 73 |
|
|
+ |
| 74 |
|
|
if [ -n "$old_domain" ] |
| 75 |
|
|
then |
| 76 |
|
|
old_domain=$(basename $old_domain | sed s/.ldif//) |
| 77 |
|
|
@@ -50,4 +52,4 @@ |
| 78 |
|
|
fi |
| 79 |
|
|
|
| 80 |
|
|
# Now run daemon |
| 81 |
|
|
-exec /usr/sbin/slapd -4 -u ldap -d 0 |
| 82 |
|
|
+exec /usr/sbin/slapd -4 -u ldap -d 0 -h "ldap:/// ldaps:/// ldapi:///" |
Parent Directory
| 
Revision Log
| 
Revision Graph
