diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/createlinks mezzanine_patched_e-smith-pop3-2.2.0/createlinks
--- e-smith-pop3-2.2.0/createlinks	2008-10-07 19:36:47.000000000 +0200
+++ mezzanine_patched_e-smith-pop3-2.2.0/createlinks	2010-09-22 19:49:19.000000000 +0200
@@ -11,6 +11,9 @@
     }
 }
 
+templates2events("/etc/pam.d/pop3", "console-save");
+templates2events("/etc/pam.d/pop3", "bootstrap-console-save");
+
 foreach my $event (qw(network-delete network-create email-update))
 {
     safe_symlink("sigusr1",
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/10authPOP3users	2010-09-22 19:45:14.000000000 +0200
@@ -0,0 +1 @@
+auth       required     pam_listfile.so item=user sense=allow file=/etc/e-smith/pam/accounts.allow onerr=fail
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/20auth	2010-09-22 19:45:14.000000000 +0200
@@ -0,0 +1,3 @@
+auth       { -f "/lib/security/pam_pwdb.so" ||
+             -f "/lib64/security/pam_pwdb.so" ? "required     pam_stack.so service=system-auth" :
+                                                "include      system-auth" }
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/30account	2010-09-22 19:45:14.000000000 +0200
@@ -0,0 +1,3 @@
+account    { -f "/lib/security/pam_pwdb.so" ||
+             -f "/lib64/security/pam_pwdb.so" ? "required     pam_stack.so service=system-auth" :
+                                                "include      system-auth" }
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session
--- e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session	1970-01-01 01:00:00.000000000 +0100
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/etc/e-smith/templates/etc/pam.d/pop3/40session	2010-09-22 19:45:14.000000000 +0200
@@ -0,0 +1,3 @@
+session    { -f "/lib/security/pam_pwdb.so" ||
+             -f "/lib64/security/pam_pwdb.so" ? "required     pam_stack.so service=system-auth" :
+                                                "include      system-auth" }
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/var/service/pop3/run mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3/run
--- e-smith-pop3-2.2.0/root/var/service/pop3/run	2006-03-15 22:34:47.000000000 +0100
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3/run	2010-09-22 19:45:14.000000000 +0200
@@ -7,7 +7,7 @@
 exec 2>&1
 # Generate ACL files in ./peers
 ./control/1
-exec /usr/local/bin/softlimit -m 5000000 \
+exec /usr/local/bin/softlimit -m 10000000 \
     tcpsvd \
 	-v \
 	-i ./peers \
@@ -17,4 +17,4 @@
 	${LISTENIP:-0} \
 	${PORT:-pop3} \
 	    /var/qmail/bin/qmail-popup $fqdn \
-		checkpassword /var/qmail/bin/qmail-pop3d Maildir
+		checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir
diff -Nur -x '*.orig' -x '*.rej' e-smith-pop3-2.2.0/root/var/service/pop3s/run mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3s/run
--- e-smith-pop3-2.2.0/root/var/service/pop3s/run	2005-08-10 22:49:11.000000000 +0200
+++ mezzanine_patched_e-smith-pop3-2.2.0/root/var/service/pop3s/run	2010-09-22 19:45:14.000000000 +0200
@@ -5,7 +5,7 @@
 fqdn="$hostname.$domain"
 
 exec 2>&1
-exec /usr/local/bin/softlimit -m 5000000 \
+exec /usr/local/bin/softlimit -m 10000000 \
     tcpsvd \
 	-v \
 	-i ./peers \
@@ -16,4 +16,4 @@
 	${PORT:-pop3s} \
 	    sslio -vv -/ /service/imap/ssl -u stunnel -C imapd.pem \
 		    /var/qmail/bin/qmail-popup $fqdn \
-			checkpassword /var/qmail/bin/qmail-pop3d Maildir
+			checkpassword-pam -s pop3 /var/qmail/bin/qmail-pop3d Maildir