--- ../vpopmail-5.3.26-orig/vpopmail.c	Wed Aug 27 09:45:38 2003
+++ vpopmail.c	Wed Aug 27 12:15:35 2003
@@ -1965,7 +1965,7 @@
     /* Michael Bowe 14th August 2003
      * What happens if domain isnt null terminated?
      */
-    if ( strcmp( domain, tmpbuf)) == 0 ) {
+    if (( strcmp( domain, tmpbuf)) == 0 ) {
       /* we found a match */
       fclose(fs);
       return(1);
@@ -2415,8 +2415,8 @@
  int rebuild_cdb = 1;
  char open_smtp_tmp_filename[MAX_BUFF];
  char *cp;
- char tmpbuf1[BUFF_SIZE];
- char tmpbuf2[BUFF_SIZE];
+ char tmpbuf1[MAX_BUFF];
+ char tmpbuf2[MAX_BUFF];
 
   mytime = time(NULL);
 
@@ -2518,13 +2518,13 @@
    */
   if ( rebuild_cdb ) {
     if (update_rules() != 0) {
-      printf("Error. update_rules() failed\n";
+      printf("Error. update_rules() failed\n");
       return (-1);
     }
   }
 
 #ifdef FILE_LOCKING
-  unlock_lock(fileno(fs_lok_file, 0, SEEK_SET, 0);
+  unlock_lock(fileno(fs_lok_file), 0, SEEK_SET, 0);
   fclose(fs_lok_file);
 #endif /* FILE_LOCKING */
 #endif /* USE_SQL */
@@ -2640,7 +2640,7 @@
  char tmpbuf1[MAX_BUFF];
 
 #ifndef USE_SQL
- tmpbuf2[MAX_BUFF];
+ char tmpbuf2[MAX_BUFF];
  char *tmpstr;
 #endif
 
@@ -2688,7 +2688,7 @@
       snprintf(tmpbuf2, sizeof(tmpbuf2), "%s", tmpbuf1);
       /* dump the TAB and everything after it */
       tmpstr = strtok( tmpbuf2, "\t");
-      strncat(tmpstr, "\n", sizeof(tmpstr)-strlen(tempstr)-1);
+      strncat(tmpstr, "\n", sizeof(tmpstr)-strlen(tmpstr)-1);
       /* write the line out to the tcprules pipe */
       write(fdm,tmpstr, strlen(tmpstr));
     }
--- ../vpopmail-5.3.26-orig/clearopensmtp.c	Fri Aug 22 12:32:34 2003
+++ clearopensmtp.c	Wed Aug 27 12:08:25 2003
@@ -60,7 +60,7 @@
  		/* create this file */
 		fs_smtp_tmp = fopen(OPEN_SMTP_TMP_FILE, "w+");
 		if ( fs_smtp_tmp == NULL ) {
-			printf ("Error, could not create open-smtp.tmp\n";
+			printf ("Error, could not create open-smtp.tmp\n");
 			vexit(-1);
 		}