From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 16 Sep 2013 16:35:39 +0000 (-0700)
Subject: samba-tool domain provision: Make ldap_backend_startup.sh +x and take optional arguments
X-Git-Tag: tevent-0.9.20~1051
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=68f7cd1724480a9bae36692d19b94e10fb1b9e73

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

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova@symas.com>
---

diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index f88b0db89c5..3fe947fdbe9 100644
--- 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