Merging debian version 3.9.1-4.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 20 deletions

diff --git a/debian/postfix.config b/debian/postfix.config
index 24cc4a1..a2dcab9 100644
--- a/debian/postfix.config
+++ b/debian/postfix.config
@@ -253,7 +253,7 @@ while ($topstate ne "done") {
       }
       $noninteractive = (((input($priority, "postfix/destinations"))[0]) == 30);
       if ($noninteractive) {
-	$topstate = "chattr";
+	$topstate = "mynetworks";
       } else {
 	$back = (((go())[0]) == 30);
 	if ($back) {
@@ -262,23 +262,6 @@ while ($topstate ne "done") {
 	  $topstate = "relayhost";
 	} else {
 	  fset("postfix/destinations", "changed", "true");
-	  $topstate = "chattr";
-	}
-      }
-    }
-
-    if ($topstate eq "chattr") {
-      $noninteractive = (((input("medium", "postfix/chattr"))[0]) == 30);
-      if ($noninteractive) {
-	$topstate = "mynetworks";
-      } else {
-	$back = (((go())[0]) == 30);
-	if ($back) {
-	  fset("postfix/destinations", "isdefault", "true");
-	  fset("postfix/chattr", "isdefault", "true");
-	  $topstate = "destinations";
-	} else {
-	  fset("postfix/chattr", "changed", "true");
 	  $topstate = "mynetworks";
 	}
       }
@@ -300,9 +283,9 @@ while ($topstate ne "done") {
       } else {
 	$back = (((go())[0]) == 30);
 	if ($back) {
-	  fset("postfix/chattr", "isdefault", "true");
+	  fset("postfix/destinations", "isdefault", "true");
 	  fset("postfix/mynetworks", "isdefault", "true");
-	  $topstate = "chattr";
+	  $topstate = "destinations";
 	} else {
 	  fset("postfix/mynetworks", "changed", "true");
 	  $topstate = "procmail";