--- a/src/imapd/imapd.c	Mon Sep 14 20:06:41 2009 +0900
+++ b/src/imapd/imapd.c	Thu Oct 30 00:00:57 2014 +0900
@@ -21,7 +21,7 @@
  *		Internet: MRC@Washington.EDU
  *
  * Date:	5 November 1990
- * Last Edited:	3 March 2008
+ * Last Edited:	22 July 2011
  */
 
 /* Parameter files */
@@ -553,9 +553,6 @@
 
 				/* plaintext login with password */
 	else if (!strcmp (cmd,"LOGIN")) {
-          #ifdef QMAIL
-          extern char* conv_virtualdomain(char*);
-          #endif
 	  if (user) fs_give ((void **) &user);
 	  if (pass) fs_give ((void **) &pass);
 				/* two arguments */
@@ -576,11 +573,7 @@
 	  else {		/* delimit user from possible admin */
 	    if (s = strchr (user,'*')) *s++ ='\0';
 				/* see if username and password are OK */
-#ifdef QMAIL
-	    if (server_login (conv_virtualdomain(user),pass,s,argc,argv)) {
-#else
 	    if (server_login (user,pass,s,argc,argv)) {
-#endif
 	      state = SELECT;	/* make select */
 	      alerttime = 0;	/* force alert */
 	      response = logwin;/* return logged-in capabilities */
@@ -2148,7 +2141,7 @@
 				/* must be at least one BASE64 char */
   else if (!base64mask[*ret]) return NIL;
   else {			/* quick and dirty */
-    while (base64mask[*s++]);	/* scan until end of BASE64 */
+    while (base64mask[*s]) s++;	/* scan until end of BASE64 */
     if (*s == '=') ++s;		/* allow up to two padding chars */
     if (*s == '=') ++s;
   }