s4-dns: improved logging, and run name check at startup

[samba.git] / source4 / dsdb / dns / dns_update.c

diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index 9252ffbe4b45d385b34d8f817aeaef801f51cf67..0f5de36ed15b1e87a17525ea1e78f3ef2f9b5d4e 100644 (file)
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -67,13 +67,14 @@ static void dnsupdate_rndc_done(struct composite_context *c)
        struct dnsupdate_service *service = talloc_get_type_abort(c->async.private_data,
                                                                  struct dnsupdate_service);
        service->confupdate.status = composite_wait(c);
+       talloc_free(c);
+       service->confupdate.c = NULL;
        if (!NT_STATUS_IS_OK(service->confupdate.status)) {
                DEBUG(0,(__location__ ": Failed rndc update - %s\n",
                         nt_errstr(service->confupdate.status)));
-               return;
+       } else {
+               DEBUG(3,("Completed rndc reload OK\n"));
        }
-       talloc_free(c);
-       service->confupdate.c = NULL;
 }
 
 /*
@@ -198,13 +199,14 @@ static void dnsupdate_nameupdate_done(struct composite_context *c)
        struct dnsupdate_service *service = talloc_get_type_abort(c->async.private_data,
                                                                  struct dnsupdate_service);
        service->nameupdate.status = composite_wait(c);
+       talloc_free(c);
+       service->nameupdate.c = NULL;
        if (!NT_STATUS_IS_OK(service->nameupdate.status)) {
                DEBUG(0,(__location__ ": Failed DNS update - %s\n",
                         nt_errstr(service->nameupdate.status)));
-               return;
+       } else {
+               DEBUG(3,("Completed DNS update check OK\n"));
        }
-       talloc_free(c);
-       service->nameupdate.c = NULL;
 }
 
 /*
@@ -297,6 +299,7 @@ static void dnsupdate_task_init(struct task_server *task)
        service->nameupdate.interval    = lp_parm_int(task->lp_ctx, NULL,
                                                      "dnsupdate", "name interval", 600); /* in seconds */
 
+       dnsupdate_rebuild(service);
        status = dnsupdate_confupdate_schedule(service);
        if (!NT_STATUS_IS_OK(status)) {
                task_server_terminate(task, talloc_asprintf(task,
@@ -305,6 +308,7 @@ static void dnsupdate_task_init(struct task_server *task)
                return;
        }
 
+       dnsupdate_check_names(service);
        status = dnsupdate_nameupdate_schedule(service);
        if (!NT_STATUS_IS_OK(status)) {
                task_server_terminate(task, talloc_asprintf(task,