diff -Nur -x '*.orig' -x '*.rej' e-smith-samba+ldap-1.15.1/createlinks mezzanine_patched_e-smith-samba+ldap-1.15.1/createlinks
--- e-smith-samba+ldap-1.15.1/createlinks	2007-12-15 16:53:09.000000000 +0100
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/createlinks	2008-03-17 19:57:50.000000000 +0100
@@ -31,9 +31,6 @@
 
 my $event = "console-save";
 
-$event = "bootstrap-console-save";
-event_link("update-domain-group-maps", $event, "56");
-
 $event = "group-create";
 event_link("update-domain-group-maps", $event, "56");
 safe_symlink("sighup", "root/etc/e-smith/events/$event/services2adjust/smbd");
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
--- 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
+++ 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
@@ -6,8 +6,7 @@
 use Errno;
 use esmith::AccountsDB;
 
-# events: console-save, bootstrap-console-save, group-modify-samba, group-create
-#         post-install, post-upgrade, workgroup-update
+# events: console-save, group-modify-samba, group-create, workgroup-update
 my $debug = "--debuglevel=1";
 
 my $a = esmith::AccountsDB->open_ro or die "Couldn't open accounts db\n";
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
--- e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11ldapScript	1970-01-01 01:00:00.000000000 +0100
+++ 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
@@ -0,0 +1,6 @@
+ldap admin dn = cn=root,{ esmith::util::ldapBase ($DomainName); }
+ldap suffix = { esmith::util::ldapBase ($DomainName); }
+ldap group suffix = ou=Groups
+ldap user suffix = ou=Users
+ldap machine suffix = ou=Computers
+ldap delete dn = yes
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
--- e-smith-samba+ldap-1.15.1/root/etc/e-smith/templates/etc/smb.conf/11passdbBackend	2005-02-18 00:04:02.000000000 +0100
+++ 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
@@ -1,4 +1,4 @@
 {
 #Set the Samba user account dbase backend
 }
-passdb backend = smbpasswd:/etc/samba/smbpasswd
+passdb backend = ldapsam:ldap://localhost/
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
--- e-smith-samba+ldap-1.15.1/root/var/service/smbd/control/1	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/var/service/smbd/control/1	2008-03-17 20:00:50.000000000 +0100
@@ -0,0 +1,29 @@
+#!/usr/bin/perl -w
+
+#----------------------------------------------------------------------
+# copyright (C) 2006 Mitel Networks Corporation
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 		
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 		
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
+# 
+#----------------------------------------------------------------------
+
+use esmith::util;
+
+my $pass = esmith::util::LdapPassword();
+
+unless (system("/usr/bin/smbpasswd -w $pass >/dev/null") == 0)
+{
+    die "Unable to set samba admin password.\n";
+}
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
--- e-smith-samba+ldap-1.15.1/root/var/service/smbd/run	2007-12-15 16:53:09.000000000 +0100
+++ mezzanine_patched_e-smith-samba+ldap-1.15.1/root/var/service/smbd/run	2008-03-17 20:01:24.000000000 +0100
@@ -3,6 +3,9 @@
 # Source networking configuration.
 . /etc/sysconfig/network
  
+# Set samba admin password.
+./control/1
+
 #if [ -f /etc/sysconfig/samba ]; then
 #   . /etc/sysconfig/samba
 #fi