winbind: change nested structure initialization syntax

Static initialization using ".outer_struct.inner_member =" syntax is not
supported by gcc 4.3.4.

diff --git a/source3/winbindd/winbindd_domain.c b/source3/winbindd/winbindd_domain.c
index 249def4b11d56317fbe0a24a1a62b9220949a99e..6a77889df94f2ed258b3144a5a9e36c610237bd1 100644 (file)
--- a/source3/winbindd/winbindd_domain.c
+++ b/source3/winbindd/winbindd_domain.c
@@ -30,48 +30,92 @@ static const struct winbindd_child_dispatch_table domain_dispatch_table[] = {
                .name           = "PING",
                .struct_cmd     = WINBINDD_PING,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_ping,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_ping,
+                       },
+               },
+
        },{
                .name           = "LIST_TRUSTDOM",
                .struct_cmd     = WINBINDD_LIST_TRUSTDOM,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_list_trusted_domains,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_list_trusted_domains,
+                       },
+               },
+
        },{
                .name           = "INIT_CONNECTION",
                .struct_cmd     = WINBINDD_INIT_CONNECTION,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_init_connection,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_init_connection,
+                       },
+               },
+
        },{
                .name           = "PAM_AUTH",
                .struct_cmd     = WINBINDD_PAM_AUTH,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_pam_auth,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_pam_auth,
+                       },
+               },
+
        },{
                .name           = "AUTH_CRAP",
                .struct_cmd     = WINBINDD_PAM_AUTH_CRAP,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_pam_auth_crap,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_pam_auth_crap,
+                       },
+               },
+
        },{
                .name           = "PAM_LOGOFF",
                .struct_cmd     = WINBINDD_PAM_LOGOFF,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_pam_logoff,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_pam_logoff,
+                       },
+               },
+
        },{
                .name           = "CHNG_PSWD_AUTH_CRAP",
                .struct_cmd     = WINBINDD_PAM_CHNG_PSWD_AUTH_CRAP,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_pam_chng_pswd_auth_crap,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_pam_chng_pswd_auth_crap,
+                       },
+               },
+
        },{
                .name           = "PAM_CHAUTHTOK",
                .struct_cmd     = WINBINDD_PAM_CHAUTHTOK,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_pam_chauthtok,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_pam_chauthtok,
+                       },
+               },
+
        },{
                .name           = "NDRCMD",
                .struct_cmd     = WINBINDD_DUAL_NDRCMD,
                .type           = WINBINDD_CHILD_DISPATCH_ASYNC,
-               .async.struct_fn_send = winbindd_dual_ndrcmd_send,
-               .async.struct_fn_recv = winbindd_dual_ndrcmd_recv,
+               {
+                       .async = {
+                               .struct_fn_send = winbindd_dual_ndrcmd_send,
+                               .struct_fn_recv = winbindd_dual_ndrcmd_recv,
+                       },
+               },
        },{
                .name           = NULL,
        }

diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c
index dc1b2d18dc276a4f012a721d6a4736fc116f9017..2c2f5f6d0d2b3602742373ea2dfe9a11a517ce88 100644 (file)
--- a/source3/winbindd/winbindd_idmap.c
+++ b/source3/winbindd/winbindd_idmap.c
@@ -39,13 +39,22 @@ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
                .name           = "PING",
                .struct_cmd     = WINBINDD_PING,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_ping,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_ping,
+                       },
+               },
+
        },{
                .name           = "NDRCMD",
                .struct_cmd     = WINBINDD_DUAL_NDRCMD,
                .type           = WINBINDD_CHILD_DISPATCH_ASYNC,
-               .async.struct_fn_send = winbindd_dual_ndrcmd_send,
-               .async.struct_fn_recv = winbindd_dual_ndrcmd_recv,
+               {
+                       .async = {
+                               .struct_fn_send = winbindd_dual_ndrcmd_send,
+                               .struct_fn_recv = winbindd_dual_ndrcmd_recv,
+                       },
+               },
        },{
                .name           = NULL,
        }

diff --git a/source3/winbindd/winbindd_locator.c b/source3/winbindd/winbindd_locator.c
index eb6bb35d132d1ab3af1faf889a602d277c9e9cdf..9e4f122eac00921020170b5901fdeb94418113f4 100644 (file)
--- a/source3/winbindd/winbindd_locator.c
+++ b/source3/winbindd/winbindd_locator.c
@@ -39,13 +39,22 @@ static const struct winbindd_child_dispatch_table locator_dispatch_table[] = {
                .name           = "PING",
                .struct_cmd     = WINBINDD_PING,
                .type           = WINBINDD_CHILD_DISPATCH_SYNC,
-               .sync.struct_fn = winbindd_dual_ping,
+               {
+                       .sync = {
+                               .struct_fn = winbindd_dual_ping,
+                       },
+               },
+
        },{
                .name           = "NDRCMD",
                .struct_cmd     = WINBINDD_DUAL_NDRCMD,
                .type           = WINBINDD_CHILD_DISPATCH_ASYNC,
-               .async.struct_fn_send = winbindd_dual_ndrcmd_send,
-               .async.struct_fn_recv = winbindd_dual_ndrcmd_recv,
+               {
+                       .async = {
+                               .struct_fn_send = winbindd_dual_ndrcmd_send,
+                               .struct_fn_recv = winbindd_dual_ndrcmd_recv,
+                       },
+               },
        },{
                .name           = NULL,
        }