source4 smbd: Make the service_details structure constant.

Make the service_details structure a static const.

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index d93ac0b35b3afeaad645f1fbc7fa874caf2d2860..65d983f729565cf0af2bd5429f936b02136fb78e 100644 (file)
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -248,7 +248,7 @@ static void cldapd_task_init(struct task_server *task)
 */
 NTSTATUS server_service_cldapd_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/dns_server/dns_server.c b/source4/dns_server/dns_server.c
index 9db11330e5009f9b08a03113a9c664499ce3ea65..c7c1cdde03883faad88ee3f26f9d0fd013ef0a7a 100644 (file)
--- a/source4/dns_server/dns_server.c
+++ b/source4/dns_server/dns_server.c
@@ -923,7 +923,7 @@ static void dns_task_init(struct task_server *task)
 
 NTSTATUS server_service_dns_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true,
        };

diff --git a/source4/dsdb/dns/dns_update.c b/source4/dsdb/dns/dns_update.c
index de8733762014a4a04e4b61f212a2c2358d1df472..08e7eb2224a60ca68bb02abddbc2af610e24cb18 100644 (file)
--- a/source4/dsdb/dns/dns_update.c
+++ b/source4/dsdb/dns/dns_update.c
@@ -712,7 +712,7 @@ static void dnsupdate_task_init(struct task_server *task)
 */
 NTSTATUS server_service_dnsupdate_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true,
        };

diff --git a/source4/dsdb/kcc/kcc_service.c b/source4/dsdb/kcc/kcc_service.c
index 76423780dc86b06d6051e59a8759b766697cf088..e1bbae2abc1997aef50368723f303ac329700e7d 100644 (file)
--- a/source4/dsdb/kcc/kcc_service.c
+++ b/source4/dsdb/kcc/kcc_service.c
@@ -352,7 +352,7 @@ static void kccsrv_task_init(struct task_server *task)
 */
 NTSTATUS server_service_kcc_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 10772d47439ca2909e4716fddf1c1798efcc735a..9789e784a13dc99f556f1725b1d7964da583805f 100644 (file)
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -533,7 +533,7 @@ static void dreplsrv_task_init(struct task_server *task)
 */
 NTSTATUS server_service_drepl_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true,
        };

diff --git a/source4/echo_server/echo_server.c b/source4/echo_server/echo_server.c
index 90f8616ca1147ffd0149c8cda65f0ed2f4f49cf1..657180f760c8ffdc5371ceda568552bca84b948b 100644 (file)
--- a/source4/echo_server/echo_server.c
+++ b/source4/echo_server/echo_server.c
@@ -324,7 +324,7 @@ static void echo_task_init(struct task_server *task)
  */
 NTSTATUS server_service_echo_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/kdc/kdc-heimdal.c b/source4/kdc/kdc-heimdal.c
index 83ace269d5dd597a615faf0a7ecb67121efc5232..8f09c41d74d2a8537ad23f4f11acdcde5b435714 100644 (file)
--- a/source4/kdc/kdc-heimdal.c
+++ b/source4/kdc/kdc-heimdal.c
@@ -465,7 +465,7 @@ 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)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                /* 
                 * Need to prevent pre-forking on kdc.

diff --git a/source4/kdc/kdc-service-mit.c b/source4/kdc/kdc-service-mit.c
index 1d28fc4e6eb88eb62e737e2fdd9397cd462b87e5..5d111ee82d23674889b607afdf5d1b78e50491ba 100644 (file)
--- a/source4/kdc/kdc-service-mit.c
+++ b/source4/kdc/kdc-service-mit.c
@@ -352,7 +352,7 @@ NTSTATUS server_service_mitkdc_init(TALLOC_CTX *mem_ctx);
 
 NTSTATUS server_service_mitkdc_init(TALLOC_CTX *mem_ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                /* 
                 * Need to prevent pre-forking on kdc.

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index b5251e3623e8536493c95698ff477fed88e32c36..5b1db0c109a1e3e34b3c5b03ffedeab8317cd271 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -1278,7 +1278,7 @@ failed:
 
 NTSTATUS server_service_ldap_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = false,
                .inhibit_pre_fork = false
        };

diff --git a/source4/nbt_server/nbt_server.c b/source4/nbt_server/nbt_server.c
index 6bdf9b453741be5c2044614a334a4149bc9afcaf..84cd507fe13af77ccd1599680a9ce1f5b501e124 100644 (file)
--- a/source4/nbt_server/nbt_server.c
+++ b/source4/nbt_server/nbt_server.c
@@ -105,7 +105,7 @@ static void nbtd_task_init(struct task_server *task)
 */
 NTSTATUS server_service_nbtd_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/ntp_signd/ntp_signd.c b/source4/ntp_signd/ntp_signd.c
index 508adcf7b3620f012b7bfb075f04cab20d59817e..a392929c78bcce6f8e8fd3b67320ffc877fd74f6 100644 (file)
--- a/source4/ntp_signd/ntp_signd.c
+++ b/source4/ntp_signd/ntp_signd.c
@@ -549,7 +549,7 @@ 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)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c
index eb75184a05f677f2861f734764aa9b8633e37335..f7d1a9f3c7df105fb34122ce4d3e0e444e1fd136 100644 (file)
--- a/source4/rpc_server/service_rpc.c
+++ b/source4/rpc_server/service_rpc.c
@@ -142,7 +142,7 @@ failed:
 
 NTSTATUS server_service_rpc_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                /* 
                 * This is a SNOWFLAKE, but sadly one that we
                 * will have to keep for now.  The RPC server

diff --git a/source4/smb_server/service_smb.c b/source4/smb_server/service_smb.c
index 3f0f009ce3b9b634e492c756d4910fbfd04b816d..bea7eb9285bc2a0c87a4ef054a8153d1b08ae018 100644 (file)
--- a/source4/smb_server/service_smb.c
+++ b/source4/smb_server/service_smb.c
@@ -94,7 +94,7 @@ failed:
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_smb_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index e7808727a23230c333a947bdbb8836a4097d1b88..0874fce20fca099f9bc55bfe72b32674bbd8c39c 100644 (file)
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -40,7 +40,7 @@ static struct registered_server {
 NTSTATUS register_server_service(TALLOC_CTX *ctx,
                                const char *name,
                                void (*task_init) (struct task_server *),
-                               struct service_details *details)
+                               const struct service_details *details)
 {
        struct registered_server *srv;
        srv = talloc(ctx, struct registered_server);

diff --git a/source4/web_server/web_server.c b/source4/web_server/web_server.c
index 9c4da2c23c9f8e008750e0dbf36b54ed82e7ef3d..d72524c8873c86075a72fd676768cf136f300d5e 100644 (file)
--- a/source4/web_server/web_server.c
+++ b/source4/web_server/web_server.c
@@ -371,7 +371,7 @@ failed:
 /* called at smbd startup - register ourselves as a server service */
 NTSTATUS server_service_web_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };

diff --git a/source4/winbind/winbindd.c b/source4/winbind/winbindd.c
index 7fb0836b6a5938d54841bafdebb2cb33babccd4d..e422e623b846f6b90b04d02b51a62d8438151146 100644 (file)
--- a/source4/winbind/winbindd.c
+++ b/source4/winbind/winbindd.c
@@ -89,7 +89,7 @@ NTSTATUS server_service_winbindd_init(TALLOC_CTX *);
 
 NTSTATUS server_service_winbindd_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true,
        };

diff --git a/source4/wrepl_server/wrepl_server.c b/source4/wrepl_server/wrepl_server.c
index bd2ae2660a0a473c44fcc95e214ee3ad780b7505..269fac0670d14f5fd76e7542e69cc8cb6a7a59a5 100644 (file)
--- a/source4/wrepl_server/wrepl_server.c
+++ b/source4/wrepl_server/wrepl_server.c
@@ -508,7 +508,7 @@ static void wreplsrv_task_init(struct task_server *task)
 */
 NTSTATUS server_service_wrepl_init(TALLOC_CTX *ctx)
 {
-       struct service_details details = {
+       static const struct service_details details = {
                .inhibit_fork_on_accept = true,
                .inhibit_pre_fork = true
        };