diff options
-rw-r--r-- | source4/build/smb_build/smb_build_h.pm | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/objectguid.c | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/password_hash.c | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/proxy.c | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/rootdse.c | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/samba3sam.c | 4 | ||||
-rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb/modules/objectclass.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb/modules/operational.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb/modules/rdn_name.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb/modules/schema.c | 4 | ||||
-rw-r--r-- | source4/lib/ldb/modules/skel.c | 4 |
12 files changed, 1 insertions, 47 deletions
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm index 52fe0da6da4..998e1a59906 100644 --- a/source4/build/smb_build/smb_build_h.pm +++ b/source4/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/source4/dsdb/samdb/ldb_modules/objectguid.c b/source4/dsdb/samdb/ldb_modules/objectguid.c index 0d5ae69219c..c9063af6ef9 100644 --- a/source4/dsdb/samdb/ldb_modules/objectguid.c +++ b/source4/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/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c index bb42a0e634c..212c9c91d1c 100644 --- a/source4/dsdb/samdb/ldb_modules/password_hash.c +++ b/source4/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/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c index fc1b896be47..cbe404fc4bc 100644 --- a/source4/dsdb/samdb/ldb_modules/proxy.c +++ b/source4/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/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c index 4032aee8b29..a4211990383 100644 --- a/source4/dsdb/samdb/ldb_modules/rootdse.c +++ b/source4/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/source4/dsdb/samdb/ldb_modules/samba3sam.c b/source4/dsdb/samdb/ldb_modules/samba3sam.c index f2c4441f976..7686d9b3eca 100644 --- a/source4/dsdb/samdb/ldb_modules/samba3sam.c +++ b/source4/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/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 50ad2db38a5..7bf25994e28 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/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/source4/lib/ldb/modules/objectclass.c b/source4/lib/ldb/modules/objectclass.c index b89b70ebf2d..0ded686d56b 100644 --- a/source4/lib/ldb/modules/objectclass.c +++ b/source4/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/source4/lib/ldb/modules/operational.c b/source4/lib/ldb/modules/operational.c index d98dfe1266f..65d9f12e34a 100644 --- a/source4/lib/ldb/modules/operational.c +++ b/source4/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/source4/lib/ldb/modules/rdn_name.c b/source4/lib/ldb/modules/rdn_name.c index 42faf6629cf..f35cff916c2 100644 --- a/source4/lib/ldb/modules/rdn_name.c +++ b/source4/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/source4/lib/ldb/modules/schema.c b/source4/lib/ldb/modules/schema.c index fd96a6cfbab..9fb2efee30c 100644 --- a/source4/lib/ldb/modules/schema.c +++ b/source4/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/source4/lib/ldb/modules/skel.c b/source4/lib/ldb/modules/skel.c index a3dcfc21bbf..fcec0f3fd81 100644 --- a/source4/lib/ldb/modules/skel.c +++ b/source4/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; |