[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Apr 27 18:57:48 MDT 2010
The branch, master has been updated
via 3c585e9... s4:provisionbackend Don't loop forever waiting for OpenLDAP
from 4d1f043... Don't return a potentially uninitialized NT_STATUS. We can now see user lists in Windows ACLs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3c585e9a8068d5065b1a5f320ffd130290c1cd07
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Apr 28 10:39:05 2010 +1000
s4:provisionbackend Don't loop forever waiting for OpenLDAP
We need to give a good error when we can't get OpenLDAP to accept our
connections.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/provisionbackend.py | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provisionbackend.py b/source4/scripting/python/samba/provisionbackend.py
index 25e416c..8d035ab 100644
--- a/source4/scripting/python/samba/provisionbackend.py
+++ b/source4/scripting/python/samba/provisionbackend.py
@@ -222,6 +222,7 @@ class LDAPBackend(ProvisionBackend):
self.slapd = subprocess.Popen(self.slapd_provision_command,
close_fds=True, shell=False)
+ count = 0
while self.slapd.poll() is None:
# Wait until the socket appears
try:
@@ -232,6 +233,11 @@ class LDAPBackend(ProvisionBackend):
return
except LdbError:
time.sleep(1)
+ count = count + 1
+
+ if count > 15:
+ self.message("Could not connect to slapd started with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
+ raise ProvisioningError("slapd never accepted a connection within 15 seconds of starting")
self.message("Could not start slapd with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
raise ProvisioningError("slapd died before we could make a connection to it")
--
Samba Shared Repository
More information about the samba-cvs
mailing list