s4: Add TALLOC_CTX * to register_server_service().

Use the passed in context from callers. Remove one
talloc_autofree_context().

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 72d7de5e20f7630ecc241c35e81a9d3c1f0435ac..83641f819f618d5345ec7916194dc18792b82bde 100644 (file)
--- a/file_server/file_server.c
+++ b/file_server/file_server.c
@@ -97,5 +97,5 @@ NTSTATUS server_service_s3fs_init(TALLOC_CTX *);
 
 NTSTATUS server_service_s3fs_init(TALLOC_CTX *ctx)
 {
 
 NTSTATUS server_service_s3fs_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("s3fs", s3fs_task_init);
+       return register_server_service(ctx, "s3fs", s3fs_task_init);

 }
 }

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index de8bc4eeef004be1d5dfafd468503d12c45f83fa..35a2b99e222eaec7ba5a1e0543162a71ea39e66e 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -243,5 +243,5 @@ static void cldapd_task_init(struct task_server *task)
 */
 NTSTATUS server_service_cldapd_init(TALLOC_CTX *ctx)
 {
 */
 NTSTATUS server_service_cldapd_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("cldap", cldapd_task_init);
+       return register_server_service(ctx, "cldap", cldapd_task_init);

 }
 }

diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index d467cca3e43999b2af982d1f2735103f62ac5d12..5e9527d1f72a9488f7cdec1139be5687691031ba 100644 (file)
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -929,5 +929,5 @@ static void dns_task_init(struct task_server *task)
 
 NTSTATUS server_service_dns_init(TALLOC_CTX *ctx)
 {
 
 NTSTATUS server_service_dns_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("dns", dns_task_init);
+       return register_server_service(ctx, "dns", dns_task_init);

 }
 }

diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index d2e34669aea1109eefc97910e17ddd7e52322acf..f74256d95ea839bb59c7f7ea3f4a771ca1a1c01f 100644 (file)
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -667,5 +667,5 @@ static void dnsupdate_task_init(struct task_server *task)
 */
 NTSTATUS server_service_dnsupdate_init(TALLOC_CTX *ctx)
 {
 */
 NTSTATUS server_service_dnsupdate_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("dnsupdate", dnsupdate_task_init);
+       return register_server_service(ctx, "dnsupdate", dnsupdate_task_init);

 }
 }

diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index 000206f98b758dcc5db8de1c383eff796429b069..946a8fef3ecfe80c145d5ce590a5f7a77791323f 100644 (file)
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -347,5 +347,5 @@ static void kccsrv_task_init(struct task_server *task)
 */
 NTSTATUS server_service_kcc_init(TALLOC_CTX *ctx)
 {
 */
 NTSTATUS server_service_kcc_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("kcc", kccsrv_task_init);
+       return register_server_service(ctx, "kcc", kccsrv_task_init);

 }
 }

diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 787f2d79138ccbc580d00e38c3dfa8e3067dd535..39791b44aa8be38979e430f7b1511b5a1de2c727 100644 (file)
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -516,5 +516,5 @@ static void dreplsrv_task_init(struct task_server *task)
 */
 NTSTATUS server_service_drepl_init(TALLOC_CTX *ctx)
 {
 */
 NTSTATUS server_service_drepl_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("drepl", dreplsrv_task_init);
+       return register_server_service(ctx, "drepl", dreplsrv_task_init);

 }
 }

diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c
index a934b5b431c3f2a37fc4d6d6e82263bbe745f876..e6102322cc87275cb43a63075a09cc7f8b900c0a 100644 (file)
--- a/source4/echo_server/echo_server.c
+++ b/source4/echo_server/echo_server.c
@@ -343,5 +343,5 @@ static void echo_task_init(struct task_server *task)
  */
 NTSTATUS server_service_echo_init(TALLOC_CTX *ctx)
 {
  */
 NTSTATUS server_service_echo_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("echo", echo_task_init);
+       return register_server_service(ctx, "echo", echo_task_init);

 }
 }

diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c
index fd48114edf821d09e2c47284d2f19a6a2eb9d907..d5c721b605691fc02512008a1d5bfa73489903fb 100644 (file)
--- a/source4/kdc/kdc-heimdal.c
+++ b/source4/kdc/kdc-heimdal.c
@@ -468,5 +468,5 @@ static void kdc_task_init(struct task_server *task)
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_kdc_init(TALLOC_CTX *ctx)
 {
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_kdc_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("kdc", kdc_task_init);
+       return register_server_service(ctx, "kdc", kdc_task_init);

 }
 }

diff --git a/source4/kdc/kdc-service-mit.c b/source4/kdc/kdc-service-mit.c
index 87c0179f461d4ab418b4ebe815063e28e1a93d58..13d6f1f6e0a34b5159f96094d431a03e12b521e6 100644 (file)
--- a/source4/kdc/kdc-service-mit.c
+++ b/source4/kdc/kdc-service-mit.c
@@ -352,5 +352,5 @@ NTSTATUS server_service_mitkdc_init(TALLOC_CTX *mem_ctx);
 
 NTSTATUS server_service_mitkdc_init(TALLOC_CTX *mem_ctx)
 {
 
 NTSTATUS server_service_mitkdc_init(TALLOC_CTX *mem_ctx)
 {

-       return register_server_service("kdc", mitkdc_task_init);
+       return register_server_service(mem_ctx, "kdc", mitkdc_task_init);

 }
 }

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 747e25dde22876ab9f1d48d28b9fb9f6fcdda5c6..347a17dde5a62b2a8de26b1d6b27521e266b066d 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -1184,5 +1184,5 @@ failed:
 
 NTSTATUS server_service_ldap_init(TALLOC_CTX *ctx)
 {
 
 NTSTATUS server_service_ldap_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("ldap", ldapsrv_task_init);
+       return register_server_service(ctx, "ldap", ldapsrv_task_init);

 }
 }

diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 2c20c10c18e1969363eddb142e1c47b34200a23a..2196bb045e9a8046a204dcc4b9761ea0e59c808d 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -100,5 +100,5 @@ static void nbtd_task_init(struct task_server *task)
 */
 NTSTATUS server_service_nbtd_init(TALLOC_CTX *ctx)
 {
 */
 NTSTATUS server_service_nbtd_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("nbt", nbtd_task_init);
+       return register_server_service(ctx, "nbt", nbtd_task_init);

 }
 }

diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index ddd38c1e30359a1de27aeab6a497e755a40aeae3..7949dc2f3b0b0d40743dac3abee396c114b98b56 100644 (file)
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -554,5 +554,5 @@ static void ntp_signd_task_init(struct task_server *task)
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_ntp_signd_init(TALLOC_CTX *ctx)
 {
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_ntp_signd_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("ntp_signd", ntp_signd_task_init);
+       return register_server_service(ctx, "ntp_signd", ntp_signd_task_init);

 }
 }

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index f6b1ac9f82134890e4fc7de8a8804ea119b859b9..44c0d53aee6eea2e2d07bf68be71729c9605e172 100644 (file)
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -126,5 +126,5 @@ failed:
 
 NTSTATUS server_service_rpc_init(TALLOC_CTX *ctx)
 {
 
 NTSTATUS server_service_rpc_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("rpc", dcesrv_task_init);
+       return register_server_service(ctx, "rpc", dcesrv_task_init);

 }
 }

diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c
index 1a830d0e32287dfe64bd877dab1b4f8f94692251..a607861d6e3fb751d5ecfc09d27ed337d68def21 100644 (file)
--- a/source4/smb_server/service_smb.c
+++ b/source4/smb_server/service_smb.c
@@ -89,5 +89,5 @@ NTSTATUS server_service_smb_init(TALLOC_CTX *ctx)
 {
        ntvfs_init(cmdline_lp_ctx);
        share_init();
 {
        ntvfs_init(cmdline_lp_ctx);
        share_init();

-       return register_server_service("smb", smbsrv_task_init);
+       return register_server_service(ctx, "smb", smbsrv_task_init);

 }
 }

diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index 81ad3c5aabca45d196f7fccdfff7f7715c572dc1..403ae74964b5d6693fa060755d08e3bbf6c82efc 100644 (file)
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -36,11 +36,12 @@ static struct registered_server {
 /*
   register a server service. 
 */
 /*
   register a server service. 
 */

-NTSTATUS register_server_service(const char *name,
-                                void (*task_init)(struct task_server *))
+NTSTATUS register_server_service(TALLOC_CTX *ctx,
+                               const char *name,
+                               void (*task_init)(struct task_server *))

 {
        struct registered_server *srv;
 {
        struct registered_server *srv;

-       srv = talloc(talloc_autofree_context(), struct registered_server);
+       srv = talloc(ctx, struct registered_server);

        NT_STATUS_HAVE_NO_MEMORY(srv);
        srv->service_name = name;
        srv->task_init = task_init;
        NT_STATUS_HAVE_NO_MEMORY(srv);
        srv->service_name = name;
        srv->task_init = task_init;

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 02f24609cc50ed7c71e4c4132b2e2a22af40913a..d854a298a9cbfb46a4f10a9a13af8c2f07dced14 100644 (file)
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -372,5 +372,5 @@ failed:
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_web_init(TALLOC_CTX *ctx)
 {
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_web_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("web", websrv_task_init);
+       return register_server_service(ctx, "web", websrv_task_init);

 }
 }

diff --git a/source4/winbind/winbindd.c b/source4/winbind/winbindd.c
index 6e6f262cf7a509eef3e62803baf8dbca07e2f8fb..c8c0733b6156beb46632e7a2b7f5c7c04ad116db 100644 (file)
--- a/source4/winbind/winbindd.c
+++ b/source4/winbind/winbindd.c
@@ -90,9 +90,9 @@ NTSTATUS server_service_winbindd_init(TALLOC_CTX *);
 
 NTSTATUS server_service_winbindd_init(TALLOC_CTX *ctx)
 {
 
 NTSTATUS server_service_winbindd_init(TALLOC_CTX *ctx)
 {

-       NTSTATUS status = register_server_service("winbindd", winbindd_task_init);
+       NTSTATUS status = register_server_service(ctx, "winbindd", winbindd_task_init);

        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }
        if (!NT_STATUS_IS_OK(status)) {
                return status;
        }

-       return register_server_service("winbind", winbindd_task_init);
+       return register_server_service(ctx, "winbind", winbindd_task_init);

 }
 }

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index d054a222cad630ba8d2d4306f1374776cf100f6d..dc28e23371e574bb9cdf1d92eeb7a74cd97a3c4e 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -508,5 +508,5 @@ static void wreplsrv_task_init(struct task_server *task)
 */
 NTSTATUS server_service_wrepl_init(TALLOC_CTX *ctx)
 {
 */
 NTSTATUS server_service_wrepl_init(TALLOC_CTX *ctx)
 {

-       return register_server_service("wrepl", wreplsrv_task_init);
+       return register_server_service(ctx, "wrepl", wreplsrv_task_init);

 }
 }