diff options
| -rw-r--r-- | source4/VERSION | 2 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/source4/VERSION b/source4/VERSION index 58f8cc169d..92a4f00ce3 100644 --- a/source4/VERSION +++ b/source4/VERSION @@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE= # e.g. SAMBA_VERSION_ALPHA_RELEASE=1 # # -> "4.0.0alpha1" # ######################################################## -SAMBA_VERSION_ALPHA_RELEASE=8 +SAMBA_VERSION_ALPHA_RELEASE=9 ######################################################## # For 'pre' releases the version will be # diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 36e8de6883..05a095d6f4 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -455,6 +455,14 @@ static const struct stream_server_ops ldap_stream_nonpriv_ops = { .send_handler = ldapsrv_send, }; +/* The feature removed behind an #ifdef until we can do it properly + * with an EXTERNAL bind. */ + +#ifdef DEVELOPER +#define WITH_LDAPI_PRIV_SOCKET +#endif + +#ifdef WITH_LDAPI_PRIV_SOCKET static void ldapsrv_accept_priv(struct stream_connection *c) { struct ldapsrv_service *ldapsrv_service = talloc_get_type_abort( @@ -479,6 +487,7 @@ static const struct stream_server_ops ldap_stream_priv_ops = { .send_handler = ldapsrv_send, }; +#endif /* add a socket address to the list of events, one event per port */ @@ -549,7 +558,10 @@ static NTSTATUS add_socket(struct tevent_context *event_context, */ static void ldapsrv_task_init(struct task_server *task) { - char *ldapi_path, *priv_dir; + char *ldapi_path; +#ifdef WITH_LDAPI_PRIV_SOCKET + char *priv_dir; +#endif struct ldapsrv_service *ldap_service; NTSTATUS status; const struct model_ops *model_ops; @@ -619,6 +631,7 @@ static void ldapsrv_task_init(struct task_server *task) ldapi_path, nt_errstr(status))); } +#ifdef WITH_LDAPI_PRIV_SOCKET priv_dir = private_path(ldap_service, task->lp_ctx, "ldap_priv"); if (priv_dir == NULL) { goto failed; @@ -649,6 +662,7 @@ static void ldapsrv_task_init(struct task_server *task) ldapi_path, nt_errstr(status))); } +#endif return; failed: |