[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-656-g5c2be1e8

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  5c2be1e8a985332e1e81eeab1dc9b50d7f867f98 (commit)
       via  e367df5d994181f08ad1a20a0ce01991ca30bcc8 (commit)
       via  73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae (commit)
      from  c8b0a8a196d8d187a86aef497953d0105436aff8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 5c2be1e8a985332e1e81eeab1dc9b50d7f867f98
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 8 14:12:46 2008 +0100

    build: Remove unused functions Import() and GetInfo().

commit e367df5d994181f08ad1a20a0ce01991ca30bcc8
Merge: 73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae c8b0a8a196d8d187a86aef497953d0105436aff8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 8 14:02:22 2008 +0100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
    
    Conflicts:
    
    	source/scripting/python/samba/provision.py

commit 73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 8 03:03:44 2008 +0100

    Fix formatting.

-----------------------------------------------------------------------

Summary of changes:
 source/build/smb_build/env.pm              |   24 ------------------------
 source/scripting/python/samba/provision.py |   18 ++++++++++--------
 2 files changed, 10 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/smb_build/env.pm b/source/build/smb_build/env.pm
index bbb72b5..76cd8d1 100644
--- a/source/build/smb_build/env.pm
+++ b/source/build/smb_build/env.pm
@@ -54,28 +54,4 @@ sub _set_config($$)
 	$self->{automatic_deps} = ($self->{config}->{automatic_dependencies} eq "yes");
 }
 
-sub Import($$)
-{
-	my ($self,$items) = @_;
-
-	foreach (keys %$items) {
-		if (defined($self->{items})) {
-			print "Warning: Importing $_ twice!\n";
-		}
-		$self->{items}->{$_} = $items->{$_};
-	}
-}
-
-sub GetInfo($$)
-{
-	my ($self,$name) = @_;
-
-	unless (defined($self->{info}->{$name})) 
-	{
-		$self->{info}->{$name} = $self->{items}->Build($self);
-	}
-
-	return $self->{info}->{$name};
-}
-
 1;
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 9a44983..0c16ab3 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -319,12 +319,14 @@ def setup_samdb_partitions(samdb_path, setup_path, message, lp, session_info,
  
     domaindn_ldb = "users.ldb"
     if ldap_backend is not None:
-    	domaindn_ldb = ldap_backend
+        domaindn_ldb = ldap_backend
     configdn_ldb = "configuration.ldb"
     if ldap_backend is not None:
-    	configdn_ldb = ldap_backend
+        configdn_ldb = ldap_backend
     schemadn_ldb = "schema.ldb"
     if ldap_backend is not None:
+        schema_ldb = ldap_backend
+    
     	schemadn_ldb = ldap_backend
     	
     if ldap_backend_type == "fedora-ds":
@@ -745,8 +747,8 @@ def provision(lp, setup_dir, message, paths, session_info,
     ldapi_url = "ldapi://%s" % urllib.quote(paths.s4_ldapi_path, safe="")
     
     if ldap_backend == "ldapi":
-    	# provision-backend will set this path suggested slapd command line / fedorads.inf
-    	ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="")
+        # provision-backend will set this path suggested slapd command line / fedorads.inf
+        ldap_backend = "ldapi://" % urllib.quote(os.path.join(lp.get("private dir"), "ldap", "ldapi"), safe="")
 
     assert realm is not None
     realm = realm.upper()
@@ -763,7 +765,7 @@ def provision(lp, setup_dir, message, paths, session_info,
 
     dnsdomain    = realm.lower()
     if serverrole == "domain controller":
-	domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
+        domaindn     = "DC=" + dnsdomain.replace(".", ",DC=")
         if domain is None:
             domain = lp.get("workgroup")
     
@@ -777,9 +779,9 @@ def provision(lp, setup_dir, message, paths, session_info,
             raise InvalidNetbiosName(domain)
 
     else:
-    	domaindn = "CN=" + netbiosname
-    	domain = netbiosname
-    	
+        domaindn = "CN=" + netbiosname
+        domain = netbiosname
+    
     if rootdn is None:
        rootdn       = domaindn
        


-- 
Samba Shared Repository