[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  13a4b72 s4-upgradedns: Fix the fqdn for forest dns zone
      from  2c322ca Fix some of the issues that Jelmer identified in my first patch. This might be changed again, especially when I figure out how to return the file as an object.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 13a4b7284753e7e52bad7dd19aa50327b886d845
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Mon Apr 2 17:15:09 2012 +1000

    s4-upgradedns: Fix the fqdn for forest dns zone
    
    Autobuild-User: Amitay Isaacs <amitay at samba.org>
    Autobuild-Date: Mon Apr  2 10:56:10 CEST 2012 on sn-devel-104

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

Summary of changes:
 source4/scripting/bin/samba_upgradedns |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index 86172a7..5a335a9 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -345,7 +345,7 @@ if __name__ == '__main__':
     # Create DNS partitions if missing and fill DNS information
     try:
         expression = '(|(dnsRoot=DomainDnsZones.%s)(dnsRoot=ForestDnsZones.%s))' % \
-                     (dnsdomain, dnsdomain)
+                     (dnsdomain, dnsforest)
         msg = ldbs.sam.search(base=names.configdn, scope=ldb.SCOPE_DEFAULT,
                               expression=expression, attrs=['nCName'])
         ncname = msg[0]['nCName'][0]


-- 
Samba Shared Repository