+@@ -780,7 +782,7 @@
+ # /var/pwcheck) and chown it to exim's user and group. Once you have installed
+ # pwcheck, you should arrange for it to be started by root at boot time.
+
+-# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck
++CYRUS_PWCHECK_SOCKET=/var/lib/sasl/mux
+
+
+ #------------------------------------------------------------------------------
+@@ -797,7 +799,7 @@
+ # group. Once you have installed saslauthd, you should arrange for it to be
+ # started by root at boot time.
+
+-# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux
++CYRUS_SASLAUTHD_SOCKET=/var/lib/sasl2/mux
+
+
+ #------------------------------------------------------------------------------
+@@ -857,7 +859,7 @@
+ # is "yes", as well as supporting line editing, a history of input lines in the
+ # current run is maintained.
+
+-# USE_READLINE=yes
++USE_READLINE=yes
+
+ # You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes.
+ # Note that this option adds to the size of the Exim binary, because the
+@@ -932,7 +934,7 @@