[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  bdfba23... s4:ldap_server: don't start if we can't bind to port 389
      from  5a18fc2... Implementation of self membership validated right.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit bdfba236e9aebd6c277851efdb7ee57620810282
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Jun 28 09:57:33 2010 +0200

    s4:ldap_server: don't start if we can't bind to port 389
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source4/ldap_server/ldap_server.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 00698ee..49d3d58 100644
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -506,6 +506,7 @@ static NTSTATUS add_socket(struct tevent_context *event_context,
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
 			 address, port, nt_errstr(status)));
+		return status;
 	}
 
 	if (tls_support(ldap_service->tls_params)) {
@@ -520,6 +521,7 @@ static NTSTATUS add_socket(struct tevent_context *event_context,
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
 				 address, port, nt_errstr(status)));
+			return status;
 		}
 	}
 
@@ -541,6 +543,7 @@ static NTSTATUS add_socket(struct tevent_context *event_context,
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
 				 address, port, nt_errstr(status)));
+			return status;
 		}
 	}
 
@@ -548,7 +551,7 @@ static NTSTATUS add_socket(struct tevent_context *event_context,
 	 * connect again on each incoming LDAP connection */
 	talloc_unlink(ldap_service, ldb);
 
-	return status;
+	return NT_STATUS_OK;
 }
 
 /*


-- 
Samba Shared Repository