--- ../vpopmail-5.4.0-unpatched/vchkpw.c	2004-01-13 16:59:42.000000000 +0100
+++ vchkpw.c	2004-03-05 12:17:12.000000000 +0100
@@ -422,10 +422,15 @@
     if(cramaccepted == 0) strcpy(AuthType, "CRAM-MD5");
   }
 
-  /* Check APOP auth */
+  /* Check APOP or CRAM-MD5 auth */
   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
 
--- ../vpopmail-5.4.0-unpatched/vpopmail.c	2004-01-13 16:59:42.000000000 +0100
+++ vpopmail.c	2004-02-27 17:21:13.000000000 +0100
@@ -2528,7 +2528,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/qmail-scanner-queue\"\t%d\n", 
     ipaddr, (int)mytime);
   fclose(fs_cur_file);
   fclose(fs_tmp_file);