Common subdirectories: ../vpopmail-5.4.10_unpatched/cdb and ./cdb
Common subdirectories: ../vpopmail-5.4.10_unpatched/contrib and ./contrib
Common subdirectories: ../vpopmail-5.4.10_unpatched/doc and ./doc
Common subdirectories: ../vpopmail-5.4.10_unpatched/ldap and ./ldap
Common subdirectories: ../vpopmail-5.4.10_unpatched/oracle and ./oracle
diff -u ../vpopmail-5.4.10_unpatched/vchkpw.c ./vchkpw.c
--- ../vpopmail-5.4.10_unpatched/vchkpw.c	2004-12-16 16:57:34.000000000 +0100
+++ ./vchkpw.c	2005-05-18 14:45:46.664127354 +0200
@@ -440,10 +440,15 @@
     if(cramaccepted == 0) strcpy(AuthType, "CRAM-MD5");
   }
 
-  /* Check APOP auth */
+  /* Check APOP auth or CRAM-MD5 */
   if(ConnType == POP_CONN) {
     apopaccepted = authapop(ThePass,TheChallenge,vpw->pw_clear_passwd);
-    if(apopaccepted == 0) strcpy(AuthType, "APOP");
+    if(apopaccepted == 0) {
+      strcpy(AuthType, "APOP");
+    } else {
+      cramaccepted = authcram(ThePass,TheChallenge,vpw->pw_clear_passwd);
+      if(cramaccepted == 0) strcpy(AuthType, "CRAM-MD5");
+    }
   }
 #endif
 
diff -u ../vpopmail-5.4.10_unpatched/vpopmail.c ./vpopmail.c
--- ../vpopmail-5.4.10_unpatched/vpopmail.c	2005-03-01 02:17:37.000000000 +0100
+++ ./vpopmail.c	2005-05-18 14:47:07.757411239 +0200
@@ -2533,7 +2533,7 @@
   /* append the current ip address to the tmp file
    * using the format x.x.x.x:ALLOW,RELAYCLIENT="",RBLSMTPD=""<TAB>timestamp
    */
-  fprintf( fs_tmp_file, "%s:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\"\t%d\n", 
+  fprintf( fs_tmp_file, "%s:allow,RELAYCLIENT=\"\",RBLSMTPD=\"\",QMAILQUEUE=\"/var/qmail/bin/simscan\"\t%d\n", 
     ipaddr, (int)mytime);
   fclose(fs_cur_file);
   fclose(fs_tmp_file);