Attachment 295164 Details for Bug 423761 – proposed patch

[patch] proposed patch

system-config-bind-4.0.4-srv.patch (text/plain), 2.75 KB, created by Radek Brich on 2008-02-18 13:10:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radek Brich

Created: 2008-02-18 13:10:33 UTC

Size: 2.75 KB

patch

obsolete

>diff -r 53271751f82a src/DNS.py
>--- a/src/DNS.py	Tue Feb 05 12:04:02 2008 +0100
>+++ b/src/DNS.py	Mon Feb 18 13:56:48 2008 +0100
>@@ -63,12 +63,14 @@ class Name(Data):
> class Name(Data):
>     data=''
>     origin=None
>-    
>-    def __init__(self, name, zone=None):
>+    SRV=False
>+    
>+    def __init__(self, name, zone=None, SRV=False):
>         self.data = name
>         if( zone != None ):
>             self.origin = zone.origin           # origin at time of construction ($ORIGIN!)
>             self.zone_origin = zone.zone_origin # zone's named.conf origin
>+	    self.SRV = SRV
>     
>     def name(self):
>         if (self.data==None) or (len(self.data) == 0) or (self.data == '@') :
>@@ -150,8 +152,12 @@ class Name(Data):
>                 continue
>             if (len(l) > 63):
>                 return [(-1,_("label") + ' '  + str(i) + ' ' + _("too long - it is over the 63 character limit"))]
>-            if l[0] not in allowed_first_chars:
>-                warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("domain name labels should begin with a letter or number (RFC 1123)")])
>+	    if self.SRV and i <= 2:
>+		if l[0] not in '_':
>+			warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("missing underscore - SRV RR should be in format _Service._Proto.Name (RFC 2782)")])
>+	    else:
>+		if l[0] not in allowed_first_chars:
>+			warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("domain name labels should begin with a letter or number (RFC 1123)")])
>             for c in l[1:]:
>                 if c not in allowed_chars:
>                     warnings.append([0,_("label") + ' ' + str(i) + ' : ' + l + "\n" + _("domain name labels should contain only characters in the ranges A-Z,1-9 or '-' (RFC 1123)")])
>diff -r 53271751f82a src/RR.py
>--- a/src/RR.py	Tue Feb 05 12:04:02 2008 +0100
>+++ b/src/RR.py	Mon Feb 18 13:56:48 2008 +0100
>@@ -266,7 +266,7 @@ class RR:
>         if (n == None):
>             zone=self.zone
>             if zone.type == DNS.FORWARD :
>-                n=DNS.Name(zone.zone_origin, zone)
>+                n=DNS.Name(zone.zone_origin, zone, self.__class__ == SRV)
>             elif zone.type == DNS.IPV4.REVERSE :
>                 n=DNS.IPV4.ReverseAddress(zone.zone_origin, zone)
>             elif zone.type == DNS.IPV6.REVERSE_ARPA:
>@@ -363,7 +363,7 @@ class RR:
>                     name=DNS.Name(name,zone)
>             if name==None:
>                 if zone.type == DNS.FORWARD:
>-                    self.name = DNS.Name(zone.zone_origin,zone)
>+                    self.name = DNS.Name(zone.zone_origin,zone, self.__class__ == SRV)
>                 elif zone.type == DNS.IPV4.REVERSE:
>                     self.name = DNS.IPV4.ReverseAddress(zone.zone_origin,zone)
>                 elif zone.type == DNS.IPV6.REVERSE_ARPA:

Actions: View | Diff

Attachments on bug 423761: 295164