s4:s3compat re-add idmap to s3compat winbindd

diff --git a/source4/s3compat/compat/config.h b/source4/s3compat/compat/config.h
index f28f7ecbff92d4c1c97a234fe7facc14a9f75810..0135ffe63c0fb136878229a654c19442bf044777 100644 (file)
--- a/source4/s3compat/compat/config.h
+++ b/source4/s3compat/compat/config.h
@@ -227,7 +227,7 @@ extern const char *dyn_CONFIGFILE;
 #define static_init_auth {  auth_builtin_init();  }
 #define static_init_nss_info {}
 #define static_init_charset {}
-#define static_init_idmap {}
+#define static_init_idmap {idmap_tdb_init();  idmap_passdb_init();  idmap_nss_init();}
 #define auth_script_init init_samba_module
 #define charset_CP437_init init_samba_module
 #define charset_CP850_init init_samba_module
@@ -239,6 +239,7 @@ extern const char *dyn_CONFIGFILE;
 #define static_decl_perfcount
 #define static_decl_rpc extern NTSTATUS rpc_lsarpc_init(void);     extern NTSTATUS rpc_winreg_init(void); extern NTSTATUS     rpc_initshutdown_init(void); extern NTSTATUS rpc_dssetup_init(void); extern     NTSTATUS rpc_wkssvc_init(void); extern NTSTATUS rpc_svcctl_init(void); extern     NTSTATUS rpc_ntsvcs_init(void); extern NTSTATUS rpc_netlogon_init(void);     extern NTSTATUS rpc_netdfs_init(void); extern NTSTATUS rpc_srvsvc_init(void);     extern NTSTATUS rpc_spoolss_init(void); extern NTSTATUS     rpc_eventlog_init(void); extern NTSTATUS rpc_samr_init(void); extern NTSTATUS     rpc_rpcecho_init(void);
 #define static_decl_vfs extern NTSTATUS vfs_default_init(void);
+#define static_decl_idmap extern NTSTATUS idmap_ldap_init(void); extern NTSTATUS idmap_tdb_init(void); extern NTSTATUS idmap_passdb_init(void); extern NTSTATUS idmap_nss_init(void);
 #define static_init_gpext {}
 #define static_init_perfcount {}
 #define STAT_ST_BLOCKSIZE 512

diff --git a/source4/s3compat/compat/includes.h b/source4/s3compat/compat/includes.h
index b668c738e57ed0354fb9c88c79f73e5d5f167a25..753d6aa78a8e466ef1abfc009a1cba7720ded0ab 100644 (file)
--- a/source4/s3compat/compat/includes.h
+++ b/source4/s3compat/compat/includes.h
@@ -4,4 +4,3 @@
 #include "source4/s3compat/s3replace.h"
 
 #define USE_SETRESUID 1
-#define static_decl_idmap

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 0eb3d4efe082a268ecbb638f2928e9df6d40936c..10c5e75680a347b423ae910ba5f5d5912c03f76a 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -524,7 +524,7 @@ AUTH_SRC = '''${AUTH_SRC1} auth/auth.c ${AUTH_STATIC} auth/auth_util.c
 
 
 #FIXME: set IDMAP_STATIC during configuration
-IDMAP_STATIC=''
+IDMAP_STATIC='winbindd/idmap_tdb.c winbindd/idmap_passdb.c winbindd/idmap_nss.c'
 
 IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_STATIC}'