s4:libcli/ldap Rename ldap.h to libcli_ldap.h

[garming/samba-autobuild/.git] / source4 / cldap_server / cldap_server.c

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 1a08cd21f90d2b871d02a329710b419e0228075a..8bed38b557c8a2694fe666b86a4d05962dadfc4c 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include <talloc.h>
-#include "libcli/ldap/ldap.h"
 #include "lib/messaging/irpc.h"
 #include "smbd/service_task.h"
 #include "smbd/service.h"
@@ -151,7 +150,7 @@ static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct l
        int num_interfaces;
        TALLOC_CTX *tmp_ctx = talloc_new(cldapd);
        NTSTATUS status;
-       int i;
+       unsigned int i;
 
        num_interfaces = iface_count(ifaces);
 
@@ -187,16 +186,18 @@ static void cldapd_task_init(struct task_server *task)
        load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces);
 
        if (iface_count(ifaces) == 0) {
-               task_server_terminate(task, "cldapd: no network interfaces configured");
+               task_server_terminate(task, "cldapd: no network interfaces configured", false);
                return;
        }
 
        switch (lp_server_role(task->lp_ctx)) {
        case ROLE_STANDALONE:
-               task_server_terminate(task, "cldap_server: no CLDAP server required in standalone configuration");
+               task_server_terminate(task, "cldap_server: no CLDAP server required in standalone configuration", 
+                                     false);
                return;
        case ROLE_DOMAIN_MEMBER:
-               task_server_terminate(task, "cldap_server: no CLDAP server required in member server configuration");
+               task_server_terminate(task, "cldap_server: no CLDAP server required in member server configuration",
+                                     false);
                return;
        case ROLE_DOMAIN_CONTROLLER:
                /* Yes, we want an CLDAP server */
@@ -207,21 +208,21 @@ static void cldapd_task_init(struct task_server *task)
 
        cldapd = talloc(task, struct cldapd_server);
        if (cldapd == NULL) {
-               task_server_terminate(task, "cldapd: out of memory");
+               task_server_terminate(task, "cldapd: out of memory", true);
                return;
        }
 
        cldapd->task = task;
-       cldapd->samctx = samdb_connect(cldapd, task->event_ctx, task->lp_ctx, system_session(cldapd, task->lp_ctx));
+       cldapd->samctx = samdb_connect(cldapd, task->event_ctx, task->lp_ctx, system_session(task->lp_ctx));
        if (cldapd->samctx == NULL) {
-               task_server_terminate(task, "cldapd failed to open samdb");
+               task_server_terminate(task, "cldapd failed to open samdb", true);
                return;
        }
 
        /* start listening on the configured network interfaces */
        status = cldapd_startup_interfaces(cldapd, task->lp_ctx, ifaces);
        if (!NT_STATUS_IS_OK(status)) {
-               task_server_terminate(task, "cldapd failed to setup interfaces");
+               task_server_terminate(task, "cldapd failed to setup interfaces", true);
                return;
        }