Mutch better patch
This commit is contained in:
@@ -25,7 +25,7 @@ index 404b346a885..8e5a8ba5f25 100644
|
||||
import uuid
|
||||
import shutil
|
||||
import time
|
||||
@@ -1008,52 +1009,36 @@
|
||||
@@ -1008,53 +1009,37 @@
|
||||
stderr=subprocess.STDOUT,
|
||||
cwd='.').communicate()[0]
|
||||
bind_info = get_string(bind_info)
|
||||
@@ -62,7 +62,6 @@ index 404b346a885..8e5a8ba5f25 100644
|
||||
- raise ProvisioningError("Only stable/esv releases of BIND are supported.")
|
||||
- elif bind_info.upper().find('BIND_9.17') != -1:
|
||||
- raise ProvisioningError("Only stable/esv releases of BIND are supported.")
|
||||
- else:
|
||||
+ bind9_release = re.search('BIND (9)\.(\d+)\.', bind_info, re.I)
|
||||
+ if bind9_release:
|
||||
+ bind9_disabled = ''
|
||||
@@ -77,7 +76,7 @@ index 404b346a885..8e5a8ba5f25 100644
|
||||
+ raise ProvisioningError("Only stable/esv releases of BIND are supported.")
|
||||
+ else:
|
||||
+ bind9_dlz_version = "%d_%d" % (bind9_version_major, bind9_version_minor)
|
||||
+ else:
|
||||
else:
|
||||
+ bind9_disabled = '# '
|
||||
+ bind9_version = "BIND z.y.x"
|
||||
+ bind9_dlz_version = "z_y"
|
||||
@@ -100,10 +99,13 @@ index 404b346a885..8e5a8ba5f25 100644
|
||||
- "BIND9_14": bind9_14,
|
||||
- "BIND9_16": bind9_16,
|
||||
- "BIND9_18": bind9_18
|
||||
- })
|
||||
+ "BIND9_DLZ": bind9_dlz
|
||||
})
|
||||
+ })
|
||||
|
||||
|
||||
def create_named_txt(path, realm, dnsdomain, dnsname, binddns_dir,
|
||||
|
||||
index b7e36e7f8e6..bbdb616deb2 100644
|
||||
--- a/source4/dns_server/dlz_minimal.h
|
||||
+++ b/source4/dns_server/dlz_minimal.h
|
||||
|
||||
Reference in New Issue
Block a user