summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-09-26 23:24:47 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:07:18 -0500
commit966f35a6c878e35f13e7d1920c65ca88bac5ea96 (patch)
tree07ce5455ea8179937299f6abbb46b9776402fed8
parent7ac97bbbdb85b08976de2b850021fbd7a0c7d112 (diff)
downloadsamba-966f35a6c878e35f13e7d1920c65ca88bac5ea96.tar.gz
samba-966f35a6c878e35f13e7d1920c65ca88bac5ea96.tar.bz2
samba-966f35a6c878e35f13e7d1920c65ca88bac5ea96.zip
r25363: Move service code to separate module.
(This used to be commit 77570e2fb5313ed0f890f1c4f9fa227b5695c534)
-rw-r--r--source4/nbt_server/config.mk14
-rw-r--r--source4/nbt_server/register.c7
2 files changed, 12 insertions, 9 deletions
diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index 5e8cfa61da..c498101c22 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -54,11 +54,8 @@ PRIVATE_DEPENDENCIES = \
#######################
# Start SUBSYSTEM NBTD
-[MODULE::NBTD]
-INIT_FUNCTION = server_service_nbtd_init
-SUBSYSTEM = service
+[SUBSYSTEM::NBT_SERVER]
OBJ_FILES = \
- nbt_server.o \
interfaces.o \
register.o \
query.o \
@@ -68,6 +65,13 @@ OBJ_FILES = \
irpc.o
PRIVATE_PROTO_HEADER = nbt_server_proto.h
PRIVATE_DEPENDENCIES = \
- LIBCLI_NBT NBTD_WINS NBTD_DGRAM process_model
+ LIBCLI_NBT NBTD_WINS NBTD_DGRAM
# End SUBSYSTEM NBTD
#######################
+
+[MODULE::service_nbtd]
+INIT_FUNCTION = server_service_nbtd_init
+SUBSYSTEM = service
+OBJ_FILES = \
+ nbt_server.o
+PRIVATE_DEPENDENCIES = NBT_SERVER process_model
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c
index d22903d519..af067d071c 100644
--- a/source4/nbt_server/register.c
+++ b/source4/nbt_server/register.c
@@ -31,7 +31,6 @@
#include "dsdb/samdb/samdb.h"
#include "param/param.h"
-
static void nbtd_start_refresh_timer(struct nbtd_iface_name *iname);
/*
@@ -227,9 +226,9 @@ static void nbtd_register_name_iface(struct nbtd_interface *iface,
/*
register one name on all our interfaces
*/
-static void nbtd_register_name(struct nbtd_server *nbtsrv,
- const char *name, enum nbt_name_type type,
- uint16_t nb_flags)
+void nbtd_register_name(struct nbtd_server *nbtsrv,
+ const char *name, enum nbt_name_type type,
+ uint16_t nb_flags)
{
struct nbtd_interface *iface;