svn commit: samba r25890 - in branches/4.0-python: . source source/nbt_server source/selftest/env source/setup

[jelmer at samba.org]

Author: jelmer
Date: 2007-11-07 02:45:17 +0000 (Wed, 07 Nov 2007)
New Revision: 25890

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25890

Log:
Fix unresolved symbol errors for python ldb module.
Modified:
   branches/4.0-python/
   branches/4.0-python/source/main.mk
   branches/4.0-python/source/nbt_server/config.mk
   branches/4.0-python/source/selftest/env/Samba4.pm
   branches/4.0-python/source/setup/provision


Changeset:

Property changes on: branches/4.0-python
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/4.0-python/source/main.mk
===================================================================
--- branches/4.0-python/source/main.mk	2007-11-07 02:45:08 UTC (rev 25889)
+++ branches/4.0-python/source/main.mk	2007-11-07 02:45:17 UTC (rev 25890)
@@ -41,7 +41,7 @@
 headers: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
 manpages: $(MANPAGES)
 all: showflags $(ALL_PREDEP) bin/asn1_compile bin/compile_et binaries modules
-everything: all libraries headers
+everything: all libraries headers pythonmods
 
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm

Modified: branches/4.0-python/source/nbt_server/config.mk
===================================================================
--- branches/4.0-python/source/nbt_server/config.mk	2007-11-07 02:45:08 UTC (rev 25889)
+++ branches/4.0-python/source/nbt_server/config.mk	2007-11-07 02:45:17 UTC (rev 25890)
@@ -16,6 +16,7 @@
 # Start MODULE ldb_wins_ldb
 [MODULE::ldb_wins_ldb]
 SUBSYSTEM = LIBLDB
+OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = wins_ldb_module_init
 OBJ_FILES = \
 		wins/wins_ldb.o

Modified: branches/4.0-python/source/selftest/env/Samba4.pm
===================================================================
--- branches/4.0-python/source/selftest/env/Samba4.pm	2007-11-07 02:45:08 UTC (rev 25889)
+++ branches/4.0-python/source/selftest/env/Samba4.pm	2007-11-07 02:45:17 UTC (rev 25890)
@@ -498,9 +498,7 @@
 	pid directory = $piddir
 	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 = /
 	name resolve order = bcast
@@ -614,12 +612,13 @@
 	(system("($self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$netbiosname\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration!");
 
 	my @provision_options = ();
+	push (@provision_options, "LDB_MODULES_PATH=\"$self->{bindir}/modules/ldb\"");
 	push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
 	push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\"");
-	push (@provision_options, $ENV{PYTHON} or "python");
-	push (@provision_options, "$self->{bindir}/smbscript");
+	push (@provision_options, ($ENV{PYTHON} or "python"));
 	push (@provision_options, "$self->{setupdir}/provision");
 	push (@provision_options, split(' ', $configuration));
+	push (@provision_options, "--setupdir=$self->{setupdir}");
 	push (@provision_options, "--host-name=$netbiosname");
 	push (@provision_options, "--host-ip=$ifaceipv4");
 	push (@provision_options, "--quiet=True");

Modified: branches/4.0-python/source/setup/provision
===================================================================
--- branches/4.0-python/source/setup/provision	2007-11-07 02:45:08 UTC (rev 25889)
+++ branches/4.0-python/source/setup/provision	2007-11-07 02:45:17 UTC (rev 25890)
@@ -26,6 +26,8 @@
 parser.add_option_group(options.VersionOptions(parser))
 credopts = options.CredentialsOptions(parser)
 parser.add_option_group(credopts)
+parser.add_option("--setupdir", type="string", metavar="DIR", 
+		help="directory with setup files")
 parser.add_option("--realm", type="string", metavar="REALM", help="set realm")
 parser.add_option("--domain", type="string", metavar="DOMAIN",
 				  help="set domain")
@@ -142,9 +144,9 @@
 message("Provisioning for %s in realm %s" % (subobj.domain, subobj.realm))
 message("Using administrator password: %s" % subobj.adminpass)
 
-# FIXME: Use $(datadir)/setup when already installed
-
-setup_dir = "setup"
+setup_dir = opts.setupdir
+if setup_dir is None:
+	setup_dir = "setup"
 if opts.ldap_base:
 	provision_ldapbase(setup_dir, subobj, message, paths)
 	message("Please install the LDIF located in %s, %s and  into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server" % (paths.ldap_basedn_ldif, paths.ldap_config_basedn_ldif, paths.ldap_schema_basedn_ldif))