r12658: Couple of fixes related to shared module builds.

diff --git a/source/build/smb_build/smb_build_h.pm b/source/build/smb_build/smb_build_h.pm
index 52fe0da6da4abf94bbb7ca9a88c78218984ee760..998e1a59906feae66009a15f64975f06c27cecae 100644 (file)
--- a/source/build/smb_build/smb_build_h.pm
+++ b/source/build/smb_build/smb_build_h.pm
@@ -54,13 +54,11 @@ sub _prepare_smb_build_h($)
 
                my $name = $key->{NAME};
                next if not defined($key->{INIT_FUNCTION});
-               my $func = join(' ', @{$key->{INIT_FUNCTION}});
-               next if $func eq "";
 
                my $DEFINE = ();
                
                $DEFINE->{COMMENT} = "$name is built shared";
-               $DEFINE->{KEY} = $func;
+               $DEFINE->{KEY} = $key->{INIT_FUNCTION};
                $DEFINE->{VAL} = "init_module";
 
                push(@defines,$DEFINE);

diff --git a/source/dsdb/samdb/ldb_modules/objectguid.c b/source/dsdb/samdb/ldb_modules/objectguid.c
index 0d5ae69219c6472614e32849cb5badf8f502d46f..c9063af6ef950f5b2ed193be65d2990276d5a1b8 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/objectguid.c
+++ b/source/dsdb/samdb/ldb_modules/objectguid.c
@@ -128,11 +128,7 @@ static const struct ldb_module_ops objectguid_ops = {
 
 
 /* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *objectguid_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/dsdb/samdb/ldb_modules/password_hash.c b/source/dsdb/samdb/ldb_modules/password_hash.c
index bb42a0e634cc86f4bd1e4c665c7c0187f95e18e0..212c9c91d1c927d1134c911e41bf443bf23c93a4 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source/dsdb/samdb/ldb_modules/password_hash.c
@@ -690,11 +690,7 @@ static const struct ldb_module_ops password_hash_ops = {
 
 
 /* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *password_hash_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/dsdb/samdb/ldb_modules/proxy.c b/source/dsdb/samdb/ldb_modules/proxy.c
index fc1b896be47d1eaa1d8838a0f0211d26870b2d1e..cbe404fc4bc5acc9f124306d4393f6a5e9af9a6f 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/proxy.c
+++ b/source/dsdb/samdb/ldb_modules/proxy.c
@@ -332,11 +332,7 @@ static const struct ldb_module_ops proxy_ops = {
        .request        = proxy_request
 };
 
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *proxy_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/dsdb/samdb/ldb_modules/rootdse.c b/source/dsdb/samdb/ldb_modules/rootdse.c
index 4032aee8b298a988cc9d12abdc0c6b5a87c831c1..a42119903834ea10ee41eeee9eeae2be3a17a9c0 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source/dsdb/samdb/ldb_modules/rootdse.c
@@ -126,11 +126,7 @@ static const struct ldb_module_ops rootdse_ops = {
        .request        = rootdse_request
 };
 
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *rootdse_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/dsdb/samdb/ldb_modules/samba3sam.c b/source/dsdb/samdb/ldb_modules/samba3sam.c
index f2c4441f9762bfc88c3c388b43333f68c368736d..7686d9b3eca57941a8f04ef18e526268cd3ee7f9 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/samba3sam.c
+++ b/source/dsdb/samdb/ldb_modules/samba3sam.c
@@ -891,11 +891,7 @@ const struct ldb_map_attribute samba3_attributes[] =
 };
 
        /* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *ldb_samba3sam_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        return ldb_map_init(ldb, samba3_attributes, samba3_objectclasses, "samba3sam");
 }

diff --git a/source/dsdb/samdb/ldb_modules/samldb.c b/source/dsdb/samdb/ldb_modules/samldb.c
index 50ad2db38a507f41e3cd30e350cb65e015678fad..7bf25994e28309174760af55cd7939ba42ebf743 100644 (file)
--- a/source/dsdb/samdb/ldb_modules/samldb.c
+++ b/source/dsdb/samdb/ldb_modules/samldb.c
@@ -583,11 +583,7 @@ static const struct ldb_module_ops samldb_ops = {
 
 
 /* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *samldb_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/lib/ldb/modules/objectclass.c b/source/lib/ldb/modules/objectclass.c
index b89b70ebf2d8eafd02b076787f66a5f14ec246bc..0ded686d56b461dbb09f3478a6211500ab5c14bf 100644 (file)
--- a/source/lib/ldb/modules/objectclass.c
+++ b/source/lib/ldb/modules/objectclass.c
@@ -291,11 +291,7 @@ static const struct ldb_module_ops objectclass_ops = {
        .request           = objectclass_request,
 };
 
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *objectclass_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/lib/ldb/modules/operational.c b/source/lib/ldb/modules/operational.c
index d98dfe1266f135a865e946ae55933895e758c7cb..65d9f12e34a50ec4576e404739122507e6e1651f 100644 (file)
--- a/source/lib/ldb/modules/operational.c
+++ b/source/lib/ldb/modules/operational.c
@@ -368,11 +368,7 @@ static const struct ldb_module_ops operational_ops = {
 
 
 /* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *operational_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/lib/ldb/modules/rdn_name.c b/source/lib/ldb/modules/rdn_name.c
index 42faf6629cf2ec4052605972ed7b15d61ec8ace0..f35cff916c25aeb0fa995d64ec84fa094f2d8516 100644 (file)
--- a/source/lib/ldb/modules/rdn_name.c
+++ b/source/lib/ldb/modules/rdn_name.c
@@ -214,11 +214,7 @@ static const struct ldb_module_ops rdn_name_ops = {
 
 
 /* the init function */
-#ifdef HAVE_DLOPEN_DISABLED
- struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *rdn_name_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/lib/ldb/modules/schema.c b/source/lib/ldb/modules/schema.c
index fd96a6cfbab37f8e8bb33c053cd83296b98f7104..9fb2efee30c7d96f093f26beac56ebf1c598aa6e 100644 (file)
--- a/source/lib/ldb/modules/schema.c
+++ b/source/lib/ldb/modules/schema.c
@@ -484,11 +484,7 @@ static const struct ldb_module_ops schema_ops = {
        .request           = schema_request
 };
 
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *schema_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
 

diff --git a/source/lib/ldb/modules/skel.c b/source/lib/ldb/modules/skel.c
index a3dcfc21bbf7bdd06a65fa97d0793786c541235c..fcec0f3fd81c2e667a0cc5b014aeff0a85884db1 100644 (file)
--- a/source/lib/ldb/modules/skel.c
+++ b/source/lib/ldb/modules/skel.c
@@ -140,11 +140,7 @@ static const struct ldb_module_ops skel_ops = {
        .del_transaction   = skel_del_trans,
 };
 
-#ifdef HAVE_DLOPEN_DISABLED
-struct ldb_module *init_module(struct ldb_context *ldb, const char *options[])
-#else
 struct ldb_module *skel_module_init(struct ldb_context *ldb, const char *options[])
-#endif
 {
        struct ldb_module *ctx;
        struct private_data *data;