s4-upgradedns: Fix the fqdn for forest dns zone
authorAmitay Isaacs <amitay@gmail.com>
Mon, 2 Apr 2012 07:15:09 +0000 (17:15 +1000)
committerAmitay Isaacs <amitay@samba.org>
Mon, 2 Apr 2012 08:56:10 +0000 (10:56 +0200)
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Mon Apr  2 10:56:10 CEST 2012 on sn-devel-104

source4/scripting/bin/samba_upgradedns

index 86172a762d8844e563c79f3ca813577a756f845b..5a335a91f4316074159898d067011dbd3bc4369d 100755 (executable)
@@ -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]