summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-10-15 11:04:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:46 -0500
commit305b2b0c492626a0f03a1a53ffba60a94061d94d (patch)
tree525a2f2c68029cbab18ea6153a39293e13ae991c
parentdb5a0adb14301642ed8aa415472b6bcb97b2cf1b (diff)
downloadsamba-305b2b0c492626a0f03a1a53ffba60a94061d94d.tar.gz
samba-305b2b0c492626a0f03a1a53ffba60a94061d94d.tar.bz2
samba-305b2b0c492626a0f03a1a53ffba60a94061d94d.zip
r11089: start the winsreplication task when we run with wins support = yes
metze (This used to be commit d49a1d2b15c7d17a5d6928a971fbe87d13686c2d)
-rw-r--r--source4/param/loadparm.c2
-rw-r--r--source4/wrepl_server/wrepl_server.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 18c8d47746..5957dfc025 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -603,7 +603,7 @@ static void init_globals(void)
do_parameter("max connections", "-1", NULL);
do_parameter("dcerpc endpoint servers", "epmapper srvsvc wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi winreg dssetup", NULL);
- do_parameter("server services", "smb rpc nbt ldap cldap web kdc", NULL);
+ do_parameter("server services", "smb rpc nbt wrepl ldap cldap web kdc", NULL);
do_parameter("ntptr providor", "simple_ldb", NULL);
do_parameter("auth methods", "anonymous sam_ignoredomain", NULL);
do_parameter("private dir", dyn_PRIVATE_DIR, NULL);
diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index b044ef8296..06a323d103 100644
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -381,6 +381,10 @@ static void wreplsrv_task_init(struct task_server *task)
*/
static NTSTATUS wreplsrv_init(struct event_context *event_ctx, const struct model_ops *model_ops)
{
+ if (!lp_wins_support()) {
+ return NT_STATUS_OK;
+ }
+
return task_server_startup(event_ctx, model_ops, wreplsrv_task_init);
}