Attachment 147890 Details for Bug 219795 – proposed patch

[patch] proposed patch

system-config-bind-4.0.2-key-name.patch (text/plain), 4.52 KB, created by Martin Stransky on 2007-02-12 13:11:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2007-02-12 13:11:04 UTC

Size: 4.52 KB

patch

obsolete

>--- system-config-bind-4.0.2/RRGUI.py.old	2006-03-14 21:30:48.000000000 +0100
>+++ system-config-bind-4.0.2/RRGUI.py	2007-02-12 14:02:17.000000000 +0100
>@@ -18,6 +18,8 @@
> import RR
> import DNS
> 
>+RDNC_KEY_NAME=_('Remote Nameserver Control Security Key')
>+
> class Widget:
>     def __init__(s, d, r, a, k):
>         s.dialog = d
>@@ -2225,17 +2227,17 @@
>             if (s.attr.name == None) or (len(s.attr.name)==0):
>                 name = s.entry.get_text()
>                 if len(name) <= 0:
>-                    s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
>-                                          _('A non-empty DNS Security Key Name is required.')
>+                    s.bind.gui.modalError(s.bind.gui.gui,_('Remote Nameserver Control Security Key Name Error'),
>+                                          _('A non-empty Security Key Name is required.')
>                                          )
>                     return False
>                 if s.bind.nmdc.__contains__(s.attr.key + [ name ]):
>-                    s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
>+                    s.bind.gui.modalError(s.bind.gui.gui,_('Remote Nameserver Control Security Key Name Error'),
>                                           _('Key "%s" already exists.') % name
>                                          )
>                     return False
>                 if s.bind.acls.has_key(name) or (name.lower() in ['none','any','localhost','localnets']) :
>-                    s.bind.gui.modalError(s.bind.gui.gui,_('DNS Security Key Name Error'),
>+                    s.bind.gui.modalError(s.bind.gui.gui,_('Remote Nameserver Control Security Key Name Error'),
>                                           _('Name "%s" is an Access Control List name.') % name
>                                          )
>                     return False
>@@ -2258,9 +2260,9 @@
>     def keyDialog(s):
>         t=''
>         if (s.attr.name == None) or (len(s.attr.name)==0):
>-            t = _('New DNS Security Key')
>+            t = _('New Remote Nameserver Control Security Key')
>         else:
>-            t = _('DNS Security Key')+' '+s.attr.name
>+            t = RDNC_KEY_NAME+' '+s.attr.name
>         s.editDialog = gtk.Dialog(parent=s.gui.gui, title=t,
>                                   buttons=
>                                   (gtk.STOCK_OK,     gtk.RESPONSE_OK,
>--- system-config-bind-4.0.2/ZoneTree.py.old	2005-09-23 19:39:51.000000000 +0200
>+++ system-config-bind-4.0.2/ZoneTree.py	2007-02-12 14:02:39.000000000 +0100
>@@ -28,6 +28,8 @@
> INFO_COLUMN=2
> RECORD_COLUMN=3
> 
>+RDNC_KEY_NAME=_('Remote Nameserver Control Security Key')
>+
> class ZoneNode:
>     def __init__(s, z):
>         s.z=z
>@@ -263,7 +265,7 @@
>             show_names = True
>         elif((selection.__class__ == DNS.ACL) or (selection.__class__==DNS.Key)):
>             choices=[['acl',_('Access Control List Filter'),DNS.ACL],
>-                     ['key',_('DNS Security Key'),DNS.Key]
>+                     ['key', RDNC_KEY_NAME, DNS.Key]
>                     ]
>         for choice in choices:
>             if show_names :
>@@ -1077,7 +1079,7 @@
>         for acl in s.bind.acls.keys():
>             s.store.append(None,[s.acl_pic, acl, _('Access Control List Filter'), s.bind.acls[acl] ])
>         for key in s.bind.keys.keys():
>-            s.store.append(None,[s.key_pic, key, _('DNS Security Key'), s.bind.keys[key] ])
>+            s.store.append(None,[s.key_pic, key, RDNC_KEY_NAME, s.bind.keys[key] ])
>         for svr in s.bind.servers.keys():
>             s.store.append(None,[s.server_pic, svr, _('DNS Server') + ' ' + svr, s.bind.servers[svr]])
>         if not s.bind.isViewed :                            
>@@ -1092,7 +1094,7 @@
>                 s.store.append( s.bind.views[key]['node'], [s.acl_pic, _('From: Filter'), _('Access Control List Filter'), view.inputFilter ] )
>                 s.store.append( s.bind.views[key]['node'], [s.acl_pic, _('To: Filter'), _('Access Control List Filter'), view.outputFilter ] )                
>                 for k in s.bind.views[key]['keys'].keys():
>-                    s.store.append(s.bind.views[key]['node'],[s.key_pic, k, _('DNS Security Key'), s.bind.views[key]['keys'][k] ])
>+                    s.store.append(s.bind.views[key]['node'],[s.key_pic, k, RDNC_KEY_NAME, s.bind.views[key]['keys'][k] ])
>                 for svr in s.bind.views[key]['servers'].keys():
>                     s.store.append(s.bind.views[key]['node'],[s.server_pic, svr, _('DNS Server') + ' ' + svr, s.bind.views[key]['servers'][svr]])
>             for key in s.bind.views.keys():
>

Actions: View | Diff

Attachments on bug 219795: 147890