Merge branch 'master' into whitespace-named-conf

yast · May 27, 2016 · 3571711 · 3571711
2 parents a2c6249 + 19f7593
commit 3571711
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 14 deletions.
diff --git a/agents/.gitignore b/agents/.gitignore
diff --git a/agents/Makefile.am b/agents/Makefile.am
diff --git a/src/include/dns-server/dialog-installwizard.rb b/src/include/dns-server/dialog-installwizard.rb
@@ -237,7 +237,6 @@ def runInstallWizardFinishDialog
         UI.ChangeWidget(Id("use_ldap"), :Value, use_ldap)
       end
 
-      ldap_changed = false
       event = {}
       ret = nil
       CWMFirewallInterfaces.OpenFirewallInit(firewall_widget, "")

diff --git a/src/include/dns-server/dialog-masterzone.rb b/src/include/dns-server/dialog-masterzone.rb
@@ -354,7 +354,6 @@ def ZoneConnectedWithStore
 
     def ZoneAclHandle(event)
       event = deep_copy(event)
-      ret = Ops.get(event, "ID")
       UI.ChangeWidget(
         Id("acls_list"),
         :Enabled,
@@ -2449,7 +2448,6 @@ def runMasterZoneTabDialog
 
 
       contents =
-        #`Top (
         VBox(
           Opt(:hvstretch),
           HBox(
@@ -2488,13 +2486,6 @@ def runMasterZoneTabDialog
               )
             )
         )
-      #);
-      # Menu Item - Zone Editor - Tab
-      qwerty = _("Ad&vanced")
-      # error report
-      #qwerty = _("The input value is invalid.");
-      # error report
-      #qwerty = _("At least one name server must be defined.");
 
       # FIXME: Only one help is used for all tabs. Maybe would be better to change the help for every single tab.
       Wizard.SetContentsButtons(

diff --git a/src/include/dns-server/misc.rb b/src/include/dns-server/misc.rb
@@ -38,7 +38,6 @@ def RestartDnsDaemon
     # @param [String] zone string zone identification
     # @return [Symbol] zone type
     def getZoneType(zone)
-      relevant_zone_part = ""
       if Ops.greater_than(Builtins.size(zone), 12) &&
           Builtins.substring(zone, Ops.subtract(Builtins.size(zone), 12)) == "in-addr.arpa"
         return :reverse