new dc-question for dial-on-demand-users to minimize DNS lookups

svn path=/trunk/exim/; revision=191

1 files changed, 31 insertions, 3 deletions

diff --git a/debian/exim4-config.config b/debian/exim4-config.config
index 8ab5380..6aa6985 100644
--- a/debian/exim4-config.config
+++ b/debian/exim4-config.config
@@ -15,6 +15,7 @@ storevar2db() {
 	dc_relay_domains=`echo "${dc_relay_domains}" | stripwhitespace`
 	dc_relay_nets=`echo "${dc_relay_nets}" | stripwhitespace`
 	dc_smarthost=`echo "${dc_smarthost}" | stripwhitespace`
+	dc_minimaldns=`echo "${dc_minimaldns}" | stripwhitespace`
 	# store externally changed values to debconf.db
 	db_set exim4/dc_eximconfig_configtype "${dc_eximconfig_configtype}"
 	db_set exim4/dc_local_interfaces "${dc_local_interfaces}"
@@ -23,6 +24,9 @@ storevar2db() {
 	db_set exim4/dc_relay_domains "${dc_relay_domains}"
 	db_set exim4/dc_relay_nets "${dc_relay_nets}"
 	db_set exim4/dc_smarthost "${dc_smarthost}"
+	if [ "x${dc_minimaldns}" != "x" ]; then
+		db_set exim4/dc_minimaldns "${dc_minimaldns}"
+	fi
 }
 
 # ipv6: replace double colons in colon-separated host lists with umlaut-o
@@ -186,6 +190,10 @@ if [ "x${dc_local_interfaces}" = "xnotset" ]; then
 	db_get exim4/dc_local_interfaces
 	dc_local_interfaces="$RET"
 fi
+if [ "x${dc_minimaldns}" = "x" ] ; then
+	db_get exim4/dc_minimaldns
+	dc_minimaldns="$RET"
+fi
 
 
 db_version 2.0
@@ -194,7 +202,7 @@ db_capb backup
 # initial state
 STATE=1
 # last valid state
-STATELIMIT=29
+STATELIMIT=30
 while [ "$STATE" != 0 -a "$STATE" -le "$STATELIMIT" ]; do
 	case "$STATE" in
 		1)
@@ -261,7 +269,12 @@ while [ "$STATE" != 0 -a "$STATE" -le "$STATELIMIT" ]; do
 		10)
 		db_input medium exim4/dc_relay_nets || true
 		PREVSTATE=$(($STATE - 1))
+		NEXTSTATE=$(($STATE + 1))
+		;;
+		11)
+		PREVSTATE=$(($STATE - 1))
 		NEXTSTATE=$(($STATELIMIT + 1))
+		db_input low exim4/dc_minimaldns || true
 		;;
 		
 		14)
@@ -297,7 +310,12 @@ while [ "$STATE" != 0 -a "$STATE" -le "$STATELIMIT" ]; do
 		fi
 		db_input high exim4/dc_smarthost || true
 		PREVSTATE=$(($STATE - 1))
+		NEXTSTATE=$(($STATE + 1))
+		;;
+		19)
+		PREVSTATE=$(($STATE - 1))
 		NEXTSTATE=$(($STATELIMIT + 1))
+		db_input low exim4/dc_minimaldns || true
 		;;
 		
 		21)
@@ -339,7 +357,7 @@ while [ "$STATE" != 0 -a "$STATE" -le "$STATELIMIT" ]; do
 		;;
 		25)
 		PREVSTATE=$(($STATE - 1))
-		NEXTSTATE=$(($STATELIMIT + 1))
+		NEXTSTATE=$(($STATE + 1))
 		# satellite-system! Only ask for relay_nets/relay_domains if they are
 		# nonempty - we cannot distinguish whether they were set outside debconf
 		# or whether the user switched dc_eximconfig_configtype
@@ -352,10 +370,15 @@ while [ "$STATE" != 0 -a "$STATE" -le "$STATELIMIT" ]; do
 			NEXTSTATE=$(($STATE + 1))
 		fi
 		if [ "x${dc_relay_domains}" != "x" ] ; then
-			NEXTSTATE=$(($STATELIMIT + 1))
+			NEXTSTATE=$(($STATE + 1))
 			db_input medium exim4/dc_relay_domains || true
 		fi
 		;;	
+		26)
+		PREVSTATE=$(($STATE - 1))
+		NEXTSTATE=$(($STATELIMIT + 1))
+		db_input low exim4/dc_minimaldns || true
+		;;
 		
 		28)
 		# local mail only
@@ -387,6 +410,11 @@ while [ "$STATE" != 0 -a "$STATE" -le "$STATELIMIT" ]; do
 			db_input medium exim4/dc_relay_domains || true
 		fi
 		;;	
+		30)
+		PREVSTATE=$(($STATE - 1))
+		NEXTSTATE=$(($STATELIMIT + 1))
+		db_input low exim4/dc_minimaldns || true
+		;;
 		
 	esac
 	if db_go; then