1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/createlinks mezzanine_patched_e-smith-samba+ldap-1.15.1/createlinks |
2 |
|
|
--- e-smith-samba+ldap-1.15.1/createlinks 2007-12-15 16:53:09.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/createlinks 2008-03-17 19:57:50.000000000 +0100 |
4 |
|
|
@@ -31,9 +31,6 @@ |
5 |
|
|
|
6 |
|
|
my $event = "console-save"; |
7 |
|
|
|
8 |
|
|
-$event = "bootstrap-console-save"; |
9 |
|
|
-event_link("update-domain-group-maps", $event, "56"); |
10 |
|
|
- |
11 |
|
|
$event = "group-create"; |
12 |
|
|
event_link("update-domain-group-maps", $event, "56"); |
13 |
|
|
safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/smbd"); |
14 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/root/etc/e-smith/events/actions/update-domain-group-maps mezzanine_patched_e-smith-samba+ldap-1.15.1/root/etc/e-smith/events/actions/update-domain-group-maps |
15 |
|
|
--- e-smith-samba+ldap-1.15.1/root/etc/e-smith/events/actions/update-domain-group-maps 2008-03-17 19:43:38.000000000 +0100 |
16 |
|
|
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/etc/e-smith/events/actions/update-domain-group-maps 2008-03-17 19:58:35.000000000 +0100 |
17 |
|
|
@@ -6,8 +6,7 @@ |
18 |
|
|
use Errno; |
19 |
|
|
use esmith::AccountsDB; |
20 |
|
|
|
21 |
|
|
-# events: console-save, bootstrap-console-save, group-modify-samba, group-create |
22 |
|
|
-# post-install, post-upgrade, workgroup-update |
23 |
|
|
+# events: console-save, group-modify-samba, group-create, workgroup-update |
24 |
|
|
my $debug = "--debuglevel=1"; |
25 |
|
|
|
26 |
|
|
my $a = esmith::AccountsDB->open_ro or die "Couldn't open accounts db\n"; |
27 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11ldapScript mezzanine_patched_e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11ldapScript |
28 |
|
|
--- e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11ldapScript 1970-01-01 01:00:00.000000000 +0100 |
29 |
|
|
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11ldapScript 2008-03-17 19:59:01.000000000 +0100 |
30 |
|
|
@@ -0,0 +1,6 @@ |
31 |
|
|
+ldap admin dn = cn=root,{ esmith::util::ldapBase ($DomainName); } |
32 |
|
|
+ldap suffix = { esmith::util::ldapBase ($DomainName); } |
33 |
|
|
+ldap group suffix = ou=Groups |
34 |
|
|
+ldap user suffix = ou=Users |
35 |
|
|
+ldap machine suffix = ou=Computers |
36 |
|
|
+ldap delete dn = yes |
37 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11passdbBackend mezzanine_patched_e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11passdbBackend |
38 |
|
|
--- e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11passdbBackend 2005-02-18 00:04:02.000000000 +0100 |
39 |
|
|
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11passdbBackend 2008-03-17 19:59:37.000000000 +0100 |
40 |
|
|
@@ -1,4 +1,4 @@ |
41 |
|
|
{ |
42 |
|
|
#Set the Samba user account dbase backend |
43 |
|
|
} |
44 |
|
|
-passdb backend = smbpasswd:/etc/samba/smbpasswd |
45 |
|
|
+passdb backend = ldapsam:ldap://localhost/ |
46 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/root/var/service/smbd/control/1 mezzanine_patched_e-smith-samba+ldap-1.15.1/root/var/service/smbd/control/1 |
47 |
|
|
--- e-smith-samba+ldap-1.15.1/root/var/service/smbd/control/1 1970-01-01 01:00:00.000000000 +0100 |
48 |
|
|
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/var/service/smbd/control/1 2008-03-17 20:00:50.000000000 +0100 |
49 |
|
|
@@ -0,0 +1,29 @@ |
50 |
|
|
+#!/usr/bin/perl -w |
51 |
|
|
+ |
52 |
|
|
+#---------------------------------------------------------------------- |
53 |
|
|
+# copyright (C) 2006 Mitel Networks Corporation |
54 |
|
|
+# |
55 |
|
|
+# This program is free software; you can redistribute it and/or modify |
56 |
|
|
+# it under the terms of the GNU General Public License as published by |
57 |
|
|
+# the Free Software Foundation; either version 2 of the License, or |
58 |
|
|
+# (at your option) any later version. |
59 |
|
|
+# |
60 |
|
|
+# This program is distributed in the hope that it will be useful, |
61 |
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of |
62 |
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
63 |
|
|
+# GNU General Public License for more details. |
64 |
|
|
+# |
65 |
|
|
+# You should have received a copy of the GNU General Public License |
66 |
|
|
+# along with this program; if not, write to the Free Software |
67 |
|
|
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
68 |
|
|
+# |
69 |
|
|
+#---------------------------------------------------------------------- |
70 |
|
|
+ |
71 |
|
|
+use esmith::util; |
72 |
|
|
+ |
73 |
|
|
+my $pass = esmith::util::LdapPassword(); |
74 |
|
|
+ |
75 |
|
|
+unless (system("/usr/bin/smbpasswd -w $pass >/dev/null") == 0) |
76 |
|
|
+{ |
77 |
|
|
+ die "Unable to set samba admin password.\n"; |
78 |
|
|
+} |
79 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/root/var/service/smbd/run mezzanine_patched_e-smith-samba+ldap-1.15.1/root/var/service/smbd/run |
80 |
|
|
--- e-smith-samba+ldap-1.15.1/root/var/service/smbd/run 2007-12-15 16:53:09.000000000 +0100 |
81 |
|
|
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/var/service/smbd/run 2008-03-17 20:01:24.000000000 +0100 |
82 |
|
|
@@ -3,6 +3,9 @@ |
83 |
|
|
# Source networking configuration. |
84 |
|
|
. /etc/sysconfig/network |
85 |
|
|
|
86 |
|
|
+# Set samba admin password. |
87 |
|
|
+./control/1 |
88 |
|
|
+ |
89 |
|
|
#if [ -f /etc/sysconfig/samba ]; then |
90 |
|
|
# . /etc/sysconfig/samba |
91 |
|
|
#fi |