From 5fddea0bf73d7abc1b480fb563fbd629ec2f8162 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 30 Aug 2009 11:06:14 +0200 Subject: [PATCH] s3:winbind: Fix bug 5626 Apparently the AIX compiler can't deal with sizeless array declarations --- source3/winbindd/winbindd_domain.c | 20 +++++++++----------- source3/winbindd/winbindd_idmap.c | 16 +++++++--------- source3/winbindd/winbindd_locator.c | 16 +++++++--------- 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/source3/winbindd/winbindd_domain.c b/source3/winbindd/winbindd_domain.c index 1fc3ce7..265a3e3 100644 --- a/source3/winbindd/winbindd_domain.c +++ b/source3/winbindd/winbindd_domain.c @@ -25,17 +25,6 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -static const struct winbindd_child_dispatch_table domain_dispatch_table[]; - -void setup_domain_child(struct winbindd_domain *domain, - struct winbindd_child *child) -{ - setup_child(child, domain_dispatch_table, - "log.wb", domain->name); - - child->domain = domain; -} - static const struct winbindd_child_dispatch_table domain_dispatch_table[] = { { .name = "LOOKUPSID", @@ -121,3 +110,12 @@ static const struct winbindd_child_dispatch_table domain_dispatch_table[] = { .name = NULL, } }; + +void setup_domain_child(struct winbindd_domain *domain, + struct winbindd_child *child) +{ + setup_child(child, domain_dispatch_table, + "log.wb", domain->name); + + child->domain = domain; +} diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c index 9f5d17e..4e7bd51 100644 --- a/source3/winbindd/winbindd_idmap.c +++ b/source3/winbindd/winbindd_idmap.c @@ -38,17 +38,8 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -static const struct winbindd_child_dispatch_table idmap_dispatch_table[]; - static struct winbindd_child static_idmap_child; -void init_idmap_child(void) -{ - setup_child(&static_idmap_child, - idmap_dispatch_table, - "log.winbindd", "idmap"); -} - struct winbindd_child *idmap_child(void) { return &static_idmap_child; @@ -564,3 +555,10 @@ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = { .name = NULL, } }; + +void init_idmap_child(void) +{ + setup_child(&static_idmap_child, + idmap_dispatch_table, + "log.winbindd", "idmap"); +} diff --git a/source3/winbindd/winbindd_locator.c b/source3/winbindd/winbindd_locator.c index b60d235..0737834 100644 --- a/source3/winbindd/winbindd_locator.c +++ b/source3/winbindd/winbindd_locator.c @@ -27,17 +27,8 @@ #define DBGC_CLASS DBGC_WINBIND -static const struct winbindd_child_dispatch_table locator_dispatch_table[]; - static struct winbindd_child static_locator_child; -void init_locator_child(void) -{ - setup_child(&static_locator_child, - locator_dispatch_table, - "log.winbindd", "locator"); -} - struct winbindd_child *locator_child(void) { return &static_locator_child; @@ -164,3 +155,10 @@ static const struct winbindd_child_dispatch_table locator_dispatch_table[] = { .name = NULL, } }; + +void init_locator_child(void) +{ + setup_child(&static_locator_child, + locator_dispatch_table, + "log.winbindd", "locator"); +} -- 1.6.2.1