samba-tool domain provision: Make ldap_backend_startup.sh +x and take optional arguments

[nivanova/samba-autobuild/.git] / python / samba / provision / backend.py

diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index f88b0db89c52f3128204a259415a7b9f2e307316..3fe947fdbe9076ce41c5bf7f126fb3df933a62a6 100644 (file)
--- a/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
@@ -271,12 +271,15 @@ class LDAPBackend(ProvisionBackend):
     def start(self):
         from samba.provision import ProvisioningError
         self.slapd_command_escaped = "\'" + "\' \'".join(self.slapd_command) + "\'"
-        f = open(os.path.join(self.ldapdir, "ldap_backend_startup.sh"), 'w')
+        ldap_backend_script = os.path.join(self.ldapdir, "ldap_backend_startup.sh")
+        f = open(ldap_backend_script, 'w')
         try:
-            f.write("#!/bin/sh\n" + self.slapd_command_escaped + "\n")
+            f.write("#!/bin/sh\n" + self.slapd_command_escaped + " $@\n")
         finally:
             f.close()
 
+        os.chmod(ldap_backend_script, 0755)
+
         # Now start the slapd, so we can provision onto it.  We keep the
         # subprocess context around, to kill this off at the successful
         # end of the script