*** samba-3.2.11/source/winbindd/winbindd_domain.c.mxo	Fri Apr 17 11:58:26 2009
--- samba-3.2.11/source/winbindd/winbindd_domain.c	Fri May 15 16:53:21 2009
***************
*** 25,41 ****
  #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",
--- 25,33 ----
  #undef DBGC_CLASS
  #define DBGC_CLASS DBGC_WINBIND
  
! /*static const struct winbindd_child_dispatch_table domain_dispatch_table[];*/
  
  
  static const struct winbindd_child_dispatch_table domain_dispatch_table[] = {
  	{
  		.name		= "LOOKUPSID",
***************
*** 117,119 ****
--- 109,120 ----
  		.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;
+ }
*** samba-3.2.11/source/winbindd/winbindd_idmap.c.mxo	Fri Apr 17 11:58:26 2009
--- samba-3.2.11/source/winbindd/winbindd_idmap.c	Fri May 15 16:53:30 2009
***************
*** 38,45 ****
  #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)
--- 38,89 ----
  #undef DBGC_CLASS
  #define DBGC_CLASS DBGC_WINBIND
  
! /*static const struct winbindd_child_dispatch_table idmap_dispatch_table[];*/
  
+ static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
+ 	{
+ 		.name		= "DUAL_SID2UID",
+ 		.struct_cmd	= WINBINDD_DUAL_SID2UID,
+ 		.struct_fn	= winbindd_dual_sid2uid,
+ 	},{
+ 		.name		= "DUAL_SID2GID",
+ 		.struct_cmd	= WINBINDD_DUAL_SID2GID,
+ 		.struct_fn	= winbindd_dual_sid2gid,
+ #if 0   /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */
+ 	},{
+ 		.name		= "DUAL_SIDS2XIDS",
+ 		.struct_cmd	= WINBINDD_DUAL_SIDS2XIDS,
+ 		.struct_fn	= winbindd_dual_sids2xids,
+ #endif  /* end DISABLED */
+ 	},{
+ 		.name		= "DUAL_UID2SID",
+ 		.struct_cmd	= WINBINDD_DUAL_UID2SID,
+ 		.struct_fn	= winbindd_dual_uid2sid,
+ 	},{
+ 		.name		= "DUAL_GID2SID",
+ 		.struct_cmd	= WINBINDD_DUAL_GID2SID,
+ 		.struct_fn	= winbindd_dual_gid2sid,
+ 	},{
+ 		.name		= "DUAL_SET_MAPPING",
+ 		.struct_cmd	= WINBINDD_DUAL_SET_MAPPING,
+ 		.struct_fn	= winbindd_dual_set_mapping,
+ 	},{
+ 		.name		= "DUAL_SET_HWMS",
+ 		.struct_cmd	= WINBINDD_DUAL_SET_HWM,
+ 		.struct_fn	= winbindd_dual_set_hwm,
+ 	},{
+ 		.name		= "ALLOCATE_UID",
+ 		.struct_cmd	= WINBINDD_ALLOCATE_UID,
+ 		.struct_fn	= winbindd_dual_allocate_uid,
+ 	},{
+ 		.name		= "ALLOCATE_GID",
+ 		.struct_cmd	= WINBINDD_ALLOCATE_GID,
+ 		.struct_fn	= winbindd_dual_allocate_gid,
+ 	},{
+ 		.name		= NULL,
+ 	}
+ };
+ 
  static struct winbindd_child static_idmap_child;
  
  void init_idmap_child(void)
***************
*** 512,557 ****
  	return WINBINDD_ERROR;
  }
  
- static const struct winbindd_child_dispatch_table idmap_dispatch_table[] = {
- 	{
- 		.name		= "DUAL_SID2UID",
- 		.struct_cmd	= WINBINDD_DUAL_SID2UID,
- 		.struct_fn	= winbindd_dual_sid2uid,
- 	},{
- 		.name		= "DUAL_SID2GID",
- 		.struct_cmd	= WINBINDD_DUAL_SID2GID,
- 		.struct_fn	= winbindd_dual_sid2gid,
- #if 0   /* DISABLED until we fix the interface in Samba 3.0.26 --jerry */
- 	},{
- 		.name		= "DUAL_SIDS2XIDS",
- 		.struct_cmd	= WINBINDD_DUAL_SIDS2XIDS,
- 		.struct_fn	= winbindd_dual_sids2xids,
- #endif  /* end DISABLED */
- 	},{
- 		.name		= "DUAL_UID2SID",
- 		.struct_cmd	= WINBINDD_DUAL_UID2SID,
- 		.struct_fn	= winbindd_dual_uid2sid,
- 	},{
- 		.name		= "DUAL_GID2SID",
- 		.struct_cmd	= WINBINDD_DUAL_GID2SID,
- 		.struct_fn	= winbindd_dual_gid2sid,
- 	},{
- 		.name		= "DUAL_SET_MAPPING",
- 		.struct_cmd	= WINBINDD_DUAL_SET_MAPPING,
- 		.struct_fn	= winbindd_dual_set_mapping,
- 	},{
- 		.name		= "DUAL_SET_HWMS",
- 		.struct_cmd	= WINBINDD_DUAL_SET_HWM,
- 		.struct_fn	= winbindd_dual_set_hwm,
- 	},{
- 		.name		= "ALLOCATE_UID",
- 		.struct_cmd	= WINBINDD_ALLOCATE_UID,
- 		.struct_fn	= winbindd_dual_allocate_uid,
- 	},{
- 		.name		= "ALLOCATE_GID",
- 		.struct_cmd	= WINBINDD_ALLOCATE_GID,
- 		.struct_fn	= winbindd_dual_allocate_gid,
- 	},{
- 		.name		= NULL,
- 	}
- };
--- 556,558 ----
*** samba-3.2.11/source/winbindd/winbindd_locator.c.mxo	Fri Apr 17 11:58:26 2009
--- samba-3.2.11/source/winbindd/winbindd_locator.c	Fri May 15 16:53:08 2009
***************
*** 26,59 ****
  #undef DBGC_CLASS
  #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;
- }
- 
- void winbindd_dsgetdcname(struct winbindd_cli_state *state)
- {
- 	state->request.domain_name
- 		[sizeof(state->request.domain_name)-1] = '\0';
- 
- 	DEBUG(3, ("[%5lu]: dsgetdcname for %s\n", (unsigned long)state->pid,
- 		  state->request.domain_name));
- 
- 	sendto_child(state, locator_child());
- }
- 
  static enum winbindd_result dual_dsgetdcname(struct winbindd_domain *domain,
  					     struct winbindd_cli_state *state)
  {
--- 26,31 ----
***************
*** 92,97 ****
--- 64,70 ----
  	return WINBINDD_OK;
  }
  
+ /*static const struct winbindd_child_dispatch_table locator_dispatch_table[];*/
  static const struct winbindd_child_dispatch_table locator_dispatch_table[] = {
  	{
  		.name		= "DSGETDCNAME",
***************
*** 101,103 ****
--- 74,103 ----
  		.name		= NULL,
  	}
  };
+ 
+ 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;
+ }
+ 
+ void winbindd_dsgetdcname(struct winbindd_cli_state *state)
+ {
+ 	state->request.domain_name
+ 		[sizeof(state->request.domain_name)-1] = '\0';
+ 
+ 	DEBUG(3, ("[%5lu]: dsgetdcname for %s\n", (unsigned long)state->pid,
+ 		  state->request.domain_name));
+ 
+ 	sendto_child(state, locator_child());
+ }
+ 
+