bnc#981101 - yast2 mail adds POSTFIX_NODAEMON to /etc/sysconfig/postfix

yast · May 24, 2016 · 717ad19 · 717ad19
1 parent 34a57fe
commit 717ad19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/package/yast2-mail.changes b/package/yast2-mail.changes
@@ -2,6 +2,7 @@
 Tue May 24 04:12:36 UTC 2016 - varkoly@suse.com
 
 - bnc#981103 - yast2 mail uses always brackets for relayhost
+- bnc#981101 - yast2 mail adds POSTFIX_NODAEMON to /etc/sysconfig/postfix
 - 3.1.8 
 
 -------------------------------------------------------------------

diff --git a/src/modules/Mail.rb b/src/modules/Mail.rb
@@ -357,7 +357,7 @@ def Read(abort)
       elsif @mta == :postfix
         nc = SCR.Read(path(".sysconfig.postfix.POSTFIX_NODNS")) == "yes"
         ex = SCR.Read(path(".sysconfig.postfix.POSTFIX_DIALUP")) == "yes"
-        nd = SCR.Read(path(".sysconfig.postfix.POSTFIX_NODAEMON")) == "yes"
+        nd = Service.Enabled("postfix")
       else
         return false
       end
@@ -647,19 +647,15 @@ def WriteGeneral
       end
 
       if @connection_type == :nodaemon
-        SCR.Write(path(".sysconfig.postfix.POSTFIX_NODAEMON"), "yes")
         SCR.Write(nc_nd, "yes")
         SCR.Write(ex_di, "no")
       elsif @connection_type == :permanent
-        SCR.Write(path(".sysconfig.postfix.POSTFIX_NODAEMON"), "no")
         SCR.Write(nc_nd, "no")
         SCR.Write(ex_di, "no")
       elsif @connection_type == :dialup
-        SCR.Write(path(".sysconfig.postfix.POSTFIX_NODAEMON"), "no")
         SCR.Write(nc_nd, "yes")
         SCR.Write(ex_di, "yes")
       elsif @connection_type == :none
-        SCR.Write(path(".sysconfig.postfix.POSTFIX_NODAEMON"), "no")
         SCR.Write(nc_nd, "yes")
         SCR.Write(ex_di, "no")
       else