source4/: Fix prototypes for all functions in various subsystems.

[sfrench/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..43eadf5affcb33f45f3677f0f78dd5c16312b665 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -21,21 +21,22 @@
 
 #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"
 #include "cldap_server/cldap_server.h"
 #include "system/network.h"
 #include "lib/socket/netif.h"
-#include "lib/ldb/include/ldb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb.h>
+#include <ldb_errors.h>
 #include "dsdb/samdb/samdb.h"
 #include "ldb_wrap.h"
 #include "auth/auth.h"
 #include "param/param.h"
 #include "../lib/tsocket/tsocket.h"
 
+NTSTATUS server_service_cldapd_init(void);
+
 /*
   handle incoming cldap requests
 */
@@ -112,12 +113,12 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_
        ret = tsocket_address_inet_from_strings(cldapd,
                                                "ip",
                                                address,
-                                               lp_cldap_port(lp_ctx),
+                                               lpcfg_cldap_port(lp_ctx),
                                                &socket_address);
        if (ret != 0) {
                status = map_nt_error_from_unix(errno);
                DEBUG(0,("invalid address %s:%d - %s:%s\n",
-                        address, lp_cldap_port(lp_ctx),
+                        address, lpcfg_cldap_port(lp_ctx),
                         gai_strerror(ret), nt_errstr(status)));
                return status;
        }
@@ -148,16 +149,15 @@ static NTSTATUS cldapd_add_socket(struct cldapd_server *cldapd, struct loadparm_
 static NTSTATUS cldapd_startup_interfaces(struct cldapd_server *cldapd, struct loadparm_context *lp_ctx,
                                          struct interface *ifaces)
 {
-       int num_interfaces;
+       int i, num_interfaces;
        TALLOC_CTX *tmp_ctx = talloc_new(cldapd);
        NTSTATUS status;
-       int i;
 
        num_interfaces = iface_count(ifaces);
 
        /* if we are allowing incoming packets from any address, then
           we need to bind to the wildcard address */
-       if (!lp_bind_interfaces_only(lp_ctx)) {
+       if (!lpcfg_bind_interfaces_only(lp_ctx)) {
                status = cldapd_add_socket(cldapd, lp_ctx, "0.0.0.0");
                NT_STATUS_NOT_OK_RETURN(status);
        }
@@ -184,19 +184,21 @@ static void cldapd_task_init(struct task_server *task)
        NTSTATUS status;
        struct interface *ifaces;
        
-       load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces);
+       load_interfaces(task, lpcfg_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)) {
+       switch (lpcfg_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 +209,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), 0);
        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;
        }