s3-vfs: Use ENOATTR in errno comparison for getxattr

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

diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 6dbdaf9f54c5b1aad77f320b896912c3c7b277c1..00c255cf0d374f3f87ff6e7613ca53187114f40e 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -30,22 +30,27 @@
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
 
-NTSTATUS server_service_nbtd_init(void);
+NTSTATUS server_service_nbtd_init(TALLOC_CTX *);
 
 /*
   startup the nbtd task
 */
-static void nbtd_task_init(struct task_server *task)
+static NTSTATUS nbtd_task_init(struct task_server *task)
 {
        struct nbtd_server *nbtsrv;
        NTSTATUS status;
        struct interface *ifaces;
 
-       load_interfaces(task, lpcfg_interfaces(task->lp_ctx), &ifaces);
+       load_interface_list(task, task->lp_ctx, &ifaces);
 
-       if (iface_count(ifaces) == 0) {
+       if (iface_list_count(ifaces) == 0) {
                task_server_terminate(task, "nbtd: no network interfaces configured", false);
-               return;
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (lpcfg_disable_netbios(task->lp_ctx)) {
+               task_server_terminate(task, "nbtd: 'disable netbios = yes' set in smb.conf, shutting down nbt server", false);
+               return NT_STATUS_UNSUCCESSFUL;
        }
 
        task_server_set_title(task, "task[nbtd]");
@@ -53,7 +58,7 @@ static void nbtd_task_init(struct task_server *task)
        nbtsrv = talloc(task, struct nbtd_server);
        if (nbtsrv == NULL) {
                task_server_terminate(task, "nbtd: out of memory", true);
-               return;
+               return NT_STATUS_NO_MEMORY;
        }
 
        nbtsrv->task            = task;
@@ -65,20 +70,25 @@ static void nbtd_task_init(struct task_server *task)
        status = nbtd_startup_interfaces(nbtsrv, task->lp_ctx, ifaces);
        if (!NT_STATUS_IS_OK(status)) {
                task_server_terminate(task, "nbtd failed to setup interfaces", true);
-               return;
+               return status;
        }
 
-       nbtsrv->sam_ctx = samdb_connect(nbtsrv, task->event_ctx, task->lp_ctx, system_session(task->lp_ctx), 0);
+       nbtsrv->sam_ctx = samdb_connect(nbtsrv,
+                                       task->event_ctx,
+                                       task->lp_ctx,
+                                       system_session(task->lp_ctx),
+                                       NULL,
+                                       0);
        if (nbtsrv->sam_ctx == NULL) {
                task_server_terminate(task, "nbtd failed to open samdb", true);
-               return;
+               return NT_STATUS_UNSUCCESSFUL;
        }
 
        /* start the WINS server, if appropriate */
        status = nbtd_winsserver_init(nbtsrv);
        if (!NT_STATUS_IS_OK(status)) {
                task_server_terminate(task, "nbtd failed to start WINS server", true);
-               return;
+               return status;
        }
 
        nbtd_register_irpc(nbtsrv);
@@ -87,13 +97,21 @@ static void nbtd_task_init(struct task_server *task)
        nbtd_register_names(nbtsrv);
 
        irpc_add_name(task->msg_ctx, "nbt_server");
+
+       return NT_STATUS_OK;
 }
 
 
 /*
   register ourselves as a available server
 */
-NTSTATUS server_service_nbtd_init(void)
+NTSTATUS server_service_nbtd_init(TALLOC_CTX *ctx)
 {
-       return register_server_service("nbt", nbtd_task_init);
+       static const struct service_details details = {
+               .inhibit_fork_on_accept = true,
+               .inhibit_pre_fork = true,
+               .task_init = nbtd_task_init,
+               .post_fork = NULL
+       };
+       return register_server_service(ctx, "nbt", &details);
 }