svn commit: samba r12658 - in branches/SAMBA_4_0/source:
build/smb_build dsdb/samdb/ldb_modules lib/ldb/modules
jelmer at samba.org
jelmer at samba.org
Sun Jan 1 17:32:12 GMT 2006
Author: jelmer
Date: 2006-01-01 17:32:10 +0000 (Sun, 01 Jan 2006)
New Revision: 12658
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12658
Log:
Couple of fixes related to shared module builds.
Modified:
branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c
branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
branches/SAMBA_4_0/source/lib/ldb/modules/objectclass.c
branches/SAMBA_4_0/source/lib/ldb/modules/operational.c
branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c
branches/SAMBA_4_0/source/lib/ldb/modules/schema.c
branches/SAMBA_4_0/source/lib/ldb/modules/skel.c
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm 2006-01-01 17:32:10 UTC (rev 12658)
@@ -54,13 +54,11 @@
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);
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/objectguid.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -128,11 +128,7 @@
/* 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;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -690,11 +690,7 @@
/* 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;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/proxy.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -332,11 +332,7 @@
.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;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/rootdse.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -126,11 +126,7 @@
.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;
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samba3sam.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -891,11 +891,7 @@
};
/* 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");
}
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/samldb.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -583,11 +583,7 @@
/* 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;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/objectclass.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/objectclass.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/objectclass.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -291,11 +291,7 @@
.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;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/operational.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/operational.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/operational.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -368,11 +368,7 @@
/* 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;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/rdn_name.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -214,11 +214,7 @@
/* 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;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/schema.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/schema.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/schema.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -484,11 +484,7 @@
.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;
Modified: branches/SAMBA_4_0/source/lib/ldb/modules/skel.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/modules/skel.c 2006-01-01 17:31:01 UTC (rev 12657)
+++ branches/SAMBA_4_0/source/lib/ldb/modules/skel.c 2006-01-01 17:32:10 UTC (rev 12658)
@@ -140,11 +140,7 @@
.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;
More information about the samba-cvs
mailing list