svn commit: samba r25889 - in branches/4.0-python: .
source/dsdb/samdb/ldb_modules source/lib/ldb/include
source/lib/replace source/lib/tdb source/selftest
source/selftest/env
jelmer at samba.org
jelmer at samba.org
Wed Nov 7 02:45:09 GMT 2007
Author: jelmer
Date: 2007-11-07 02:45:08 +0000 (Wed, 07 Nov 2007)
New Revision: 25889
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25889
Log:
Merge upstream.
Modified:
branches/4.0-python/
branches/4.0-python/.bzrignore
branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk
branches/4.0-python/source/lib/ldb/include/ldb_private.h
branches/4.0-python/source/lib/replace/libreplace_ld.m4
branches/4.0-python/source/lib/tdb/Makefile.in
branches/4.0-python/source/selftest/env/Samba4.pm
branches/4.0-python/source/selftest/samba4_tests.sh
branches/4.0-python/source/selftest/selftest.pl
Changeset:
Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:ancestry:v3-trunk0
...skipped...
Name: bzr:file-ids
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/4.0-python/.bzrignore
===================================================================
--- branches/4.0-python/.bzrignore 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/.bzrignore 2007-11-07 02:45:08 UTC (rev 25889)
@@ -218,3 +218,4 @@
source/lib/ldb/tdbtest.ldb
*.po
libtdb.so.*
+libtalloc.so.*
Modified: branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk
===================================================================
--- branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/dsdb/samdb/ldb_modules/config.mk 2007-11-07 02:45:08 UTC (rev 25889)
@@ -2,6 +2,7 @@
# Start MODULE ldb_objectguid
[MODULE::ldb_objectguid]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
INIT_FUNCTION = objectguid_module_init
OBJ_FILES = \
@@ -13,6 +14,7 @@
# Start MODULE ldb_repl_mata_data
[MODULE::ldb_repl_meta_data]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS
INIT_FUNCTION = repl_meta_data_module_init
OBJ_FILES = \
@@ -24,6 +26,7 @@
# Start MODULE ldb_dsdb_cache
[MODULE::ldb_dsdb_cache]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
INIT_FUNCTION = dsdb_cache_module_init
OBJ_FILES = \
@@ -35,6 +38,7 @@
# Start MODULE ldb_schema_fsmo
[MODULE::ldb_schema_fsmo]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
INIT_FUNCTION = schema_fsmo_module_init
OBJ_FILES = \
@@ -46,6 +50,7 @@
# Start MODULE ldb_naming_fsmo
[MODULE::ldb_naming_fsmo]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
INIT_FUNCTION = naming_fsmo_module_init
OBJ_FILES = \
@@ -57,6 +62,7 @@
# Start MODULE ldb_pdc_fsmo
[MODULE::ldb_pdc_fsmo]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
INIT_FUNCTION = pdc_fsmo_module_init
OBJ_FILES = \
@@ -68,6 +74,7 @@
# Start MODULE ldb_samldb
[MODULE::ldb_samldb]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = samldb_module_init
OBJ_FILES = \
@@ -80,6 +87,7 @@
# Start MODULE ldb_samba3sam
[MODULE::ldb_samba3sam]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
INIT_FUNCTION = ldb_samba3sam_module_init
PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER
OBJ_FILES = \
@@ -92,8 +100,9 @@
# Start MODULE ldb_entryUUID
[MODULE::ldb_entryUUID]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
INIT_FUNCTION = ldb_entryUUID_module_init
-PRIVATE_DEPENDENCIES = LIBTALLOC
+PRIVATE_DEPENDENCIES = LIBTALLOC
ENABLE = YES
OBJ_FILES = \
entryUUID.o
@@ -118,6 +127,7 @@
[MODULE::ldb_rootdse]
SUBSYSTEM = LIBLDB
PRIVATE_DEPENDENCIES = LIBTALLOC
+OUTPUT_TYPE = SHARED_LIBRARY
INIT_FUNCTION = rootdse_module_init
OBJ_FILES = \
rootdse.o
@@ -129,6 +139,7 @@
# Start MODULE ldb_password_hash
[MODULE::ldb_password_hash]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
INIT_FUNCTION = password_hash_module_init
OBJ_FILES = password_hash.o
PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5
@@ -140,6 +151,7 @@
# Start MODULE ldb_local_password
[MODULE::ldb_local_password]
PRIVATE_DEPENDENCIES = LIBTALLOC
+OUTPUT_TYPE = SHARED_LIBRARY
SUBSYSTEM = LIBLDB
INIT_FUNCTION = local_password_module_init
OBJ_FILES = local_password.o
@@ -151,6 +163,7 @@
# Start MODULE ldb_kludge_acl
[MODULE::ldb_kludge_acl]
PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY
+OUTPUT_TYPE = SHARED_LIBRARY
SUBSYSTEM = LIBLDB
INIT_FUNCTION = ldb_kludge_acl_init
OBJ_FILES = \
@@ -163,6 +176,7 @@
# Start MODULE ldb_extended_dn
[MODULE::ldb_extended_dn]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_extended_dn_init
OBJ_FILES = \
@@ -175,6 +189,7 @@
# Start MODULE ldb_show_deleted
[MODULE::ldb_show_deleted]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_show_deleted_init
OBJ_FILES = \
@@ -187,6 +202,7 @@
# Start MODULE ldb_partition
[MODULE::ldb_partition]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_partition_init
OBJ_FILES = \
@@ -199,6 +215,7 @@
# Start MODULE ldb_schema
[MODULE::ldb_schema]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC
INIT_FUNCTION = ldb_schema_init
OBJ_FILES = \
@@ -209,8 +226,9 @@
################################################
# Start MODULE ldb_update_kt
-[MODULE::ldb_update_kt]
+[MODULE::ldb_update_keytab]
SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC CREDENTIALS_KRB5
#Also depends on credentials, but that would loop
INIT_FUNCTION = ldb_update_kt_init
@@ -224,6 +242,7 @@
# Start MODULE ldb_objectclass
[MODULE::ldb_objectclass]
INIT_FUNCTION = ldb_objectclass_init
+OUTPUT_TYPE = SHARED_LIBRARY
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = LIBLDB
@@ -236,6 +255,7 @@
# Start MODULE ldb_subtree_rename
[MODULE::ldb_subtree_rename]
INIT_FUNCTION = ldb_subtree_rename_init
+OUTPUT_TYPE = SHARED_LIBRARY
CFLAGS = -Ilib/ldb/include
PRIVATE_DEPENDENCIES = LIBTALLOC
SUBSYSTEM = LIBLDB
@@ -249,6 +269,7 @@
[MODULE::ldb_linked_attributes]
INIT_FUNCTION = ldb_linked_attributes_init
CFLAGS = -Ilib/ldb/include
+OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
SUBSYSTEM = LIBLDB
OBJ_FILES = \
Modified: branches/4.0-python/source/lib/ldb/include/ldb_private.h
===================================================================
--- branches/4.0-python/source/lib/ldb/include/ldb_private.h 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/lib/ldb/include/ldb_private.h 2007-11-07 02:45:08 UTC (rev 25889)
@@ -73,6 +73,8 @@
typedef int (*ldb_connect_fn) (struct ldb_context *ldb, const char *url, unsigned int flags, const char *options[],
struct ldb_module **module);
+const char *ldb_default_modules_dir(void);
+
/*
schema related information needed for matching rules
*/
Modified: branches/4.0-python/source/lib/replace/libreplace_ld.m4
===================================================================
--- branches/4.0-python/source/lib/replace/libreplace_ld.m4 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/lib/replace/libreplace_ld.m4 2007-11-07 02:45:08 UTC (rev 25889)
@@ -98,7 +98,11 @@
SHLD_FLAGS="-Wl,-G,-bexpall,-bbigtoc"
;;
*hpux*)
- SHLD_FLAGS="-b -Wl,-B,symbolic,-b,-z"
+ if test "${GCC}" = "yes"; then
+ SHLD_FLAGS="-shared"
+ else
+ SHLD_FLAGS="-b"
+ fi
;;
*darwin*)
SHLD_FLAGS="-dynamiclib"
Modified: branches/4.0-python/source/lib/tdb/Makefile.in
===================================================================
--- branches/4.0-python/source/lib/tdb/Makefile.in 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/lib/tdb/Makefile.in 2007-11-07 02:45:08 UTC (rev 25889)
@@ -76,19 +76,21 @@
$(SOLIB): $(TDB_OBJ)
$(CC) $(SHLD_FLAGS) $(SONAMEFLAG)$(SONAME) -o $@ $^
-bin/tdbtest$(EXEEXT): tools/tdbtest.o $(SOLIB)
+TDB_LIB = libtdb.a
+
+bin/tdbtest$(EXEEXT): tools/tdbtest.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtest tools/tdbtest.o -L. -ltdb -lgdbm
-bin/tdbtool$(EXEEXT): tools/tdbtool.o $(SOLIB)
+bin/tdbtool$(EXEEXT): tools/tdbtool.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtool tools/tdbtool.o -L. -ltdb
-bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(SOLIB)
+bin/tdbtorture$(EXEEXT): tools/tdbtorture.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbtorture tools/tdbtorture.o -L. -ltdb
-bin/tdbdump$(EXEEXT): tools/tdbdump.o $(SOLIB)
+bin/tdbdump$(EXEEXT): tools/tdbdump.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbdump tools/tdbdump.o -L. -ltdb
-bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(SOLIB)
+bin/tdbbackup$(EXEEXT): tools/tdbbackup.o $(TDB_LIB)
$(CC) $(CFLAGS) $(LDFLAGS) -o bin/tdbbackup tools/tdbbackup.o -L. -ltdb
test: bin/tdbtorture$(EXEEXT)
@@ -99,7 +101,7 @@
clean:
rm -f $(ALL_PROGS) *.o *.a common/*.o tools/*.o tdb.pc
rm -f test.db test.tdb torture.tdb test.gdbm
- rm -f $(SONAME) $(SOLIB)
+ rm -f $(SONAME) $(SOLIB) libtdb.a
distclean: clean
rm -f *~ */*~
Modified: branches/4.0-python/source/selftest/env/Samba4.pm
===================================================================
--- branches/4.0-python/source/selftest/env/Samba4.pm 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/selftest/env/Samba4.pm 2007-11-07 02:45:08 UTC (rev 25889)
@@ -499,6 +499,7 @@
ncalrpc dir = $ncalrpcdir
lock dir = $lockdir
setup directory = $self->{setupdir}
+ modules dir = $self->{bindir}/modules
js include = $srcdir/scripting/libjs
winbindd socket directory = $winbindd_socket_dir
winbind separator = /
@@ -647,6 +648,7 @@
DOMAIN => $domain,
USERNAME => $username,
REALM => $realm,
+ LDB_MODULES_PATH => "$self->{bindir}/modules/ldb",
PASSWORD => $password,
LDAPDIR => $ldapdir,
WINBINDD_SOCKET_DIR => $winbindd_socket_dir,
Modified: branches/4.0-python/source/selftest/samba4_tests.sh
===================================================================
--- branches/4.0-python/source/selftest/samba4_tests.sh 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/selftest/samba4_tests.sh 2007-11-07 02:45:08 UTC (rev 25889)
@@ -31,7 +31,7 @@
plantest "js.samr" dc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
plantest "js.echo" dc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
#plantest "ejsnet.js" dc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser
-plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
+plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION -d 10
plantest "js.winreg" dc $samba4srcdir/scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
# Simple tests for LDAP and CLDAP
@@ -56,7 +56,7 @@
export LDBDIR
plantest "ldb" none $LDBDIR/tests/test-tdb.sh
-plantest "js.ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD
+plantest "js.ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION -d 10 \$SERVER -U\$USERNAME%\$PASSWORD
# Tests for RPC
Modified: branches/4.0-python/source/selftest/selftest.pl
===================================================================
--- branches/4.0-python/source/selftest/selftest.pl 2007-11-07 01:45:06 UTC (rev 25888)
+++ branches/4.0-python/source/selftest/selftest.pl 2007-11-07 02:45:08 UTC (rev 25889)
@@ -546,6 +546,7 @@
torture:basedir = $prefix_abs/client
#We don't want to pass our self-tests if the PAC code is wrong
gensec:require_pac = true
+ modules dir = $prefix_abs/../bin/modules
";
close(CF);
}
More information about the samba-cvs
mailing list