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>

18 files changed, 22 insertions, 21 deletions

diff --git a/file_server/file_server.c b/file_server/file_server.c
index 72d7de5e20f..83641f819f6 100644
--- 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)
 {
-	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 de8bc4eeef0..35a2b99e222 100644
--- 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)
 {
-	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 d467cca3e43..5e9527d1f72 100644
--- 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)
 {
-	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 d2e34669aea..f74256d95ea 100644
--- 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)
 {
-	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 000206f98b7..946a8fef3ec 100644
--- 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)
 {
-	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 787f2d79138..39791b44aa8 100644
--- 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)
 {
-	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 a934b5b431c..e6102322cc8 100644
--- 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)
 {
-	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 fd48114edf8..d5c721b6056 100644
--- 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)
 {
-	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 87c0179f461..13d6f1f6e0a 100644
--- 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)
 {
-	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 747e25dde22..347a17dde5a 100644
--- 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)
 {
-	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 2c20c10c18e..2196bb045e9 100644
--- 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)
 {
-	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 ddd38c1e303..7949dc2f3b0 100644
--- 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)
 {
-	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 f6b1ac9f821..44c0d53aee6 100644
--- 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)
 {
-	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 1a830d0e322..a607861d6e3 100644
--- 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();
-	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 81ad3c5aabc..403ae74964b 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -36,11 +36,12 @@ static struct registered_server {
 /*
   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;
-	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;
diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 02f24609cc5..d854a298a9c 100644
--- 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)
 {
-	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 6e6f262cf7a..c8c0733b615 100644
--- 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 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;
 	}
-	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 d054a222cad..dc28e23371e 100644
--- 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)
 {
-	return register_server_service("wrepl", wreplsrv_task_init);
+	return register_server_service(ctx, "wrepl", wreplsrv_task_init);
 }