--- relaytest.c 2004-01-06 19:25:21.000000000 +0000 +++ relaytest.c 2004-04-29 14:13:50.000000000 +0100 @@ -29,8 +29,8 @@ #include "testlib.h" #define DOMAIN_DEPTH 3 -#define DOMAIN_TESTSTART 16 -#define MAXTEST 34 +#define DOMAIN_TESTSTART 28 +#define MAXTEST 49 #define AUTH_LOGIN 0 #define AUTH_NTLM 1 @@ -167,38 +167,53 @@ 1 <"listme@dsbl.org"> 2 listme@dsbl.org 3 -4 -5 <"listme@dsbl.org"> -6 listme@dsbl.org -7 -8 -9 <"listme@dsbl.org"> -10 listme@dsbl.org -11 -12 <> -13 <> <"listme@dsbl.org"> -14 <> listme@dsbl.org -15 <> - -16 -17 <"listme@dsbl.org"> -18 listme@dsbl.org -19 -20 -21 <"listme%dsbl.org"> -22 -23 <"listme@dsbl.org"@DOMAIN> -24 <@DOMAIN:listme@dsbl.org> -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 +4 +5 <"listme\@dsbl.org"> +6 listme\@dsbl.org +7 +8 <"listme@dsbl.org"> +9 listme@dsbl.org +10 +11 +12 <"listme\@dsbl.org"> +13 listme\@dsbl.org +14 +15 <"listme@dsbl.org"> +16 listme@dsbl.org +17 +18 +19 <"listme\@dsbl.org"> +20 listme\@dsbl.org +21 <> +22 <> <"listme@dsbl.org"> +23 <> listme@dsbl.org +24 <> +25 <> +26 <> <"listme\@dsbl.org"> +27 <> listme\@dsbl.org + +28 +29 <"listme@dsbl.org"> +30 listme@dsbl.org +31 +32 <"listme\@dsbl.org"> +33 listme\@dsbl.org +34 +35 +36 <"listme%dsbl.org"> +37 +38 <"listme@dsbl.org"@DOMAIN> +39 <@DOMAIN:listme@dsbl.org> +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 */ char *mailfrom(int num, const char *sender, const char *source, const char *domain) { @@ -209,59 +224,74 @@ case 1: case 2: case 3: - firestring_snprintf(buffer,512,"<%s@%s>",sender,source); - break; case 4: case 5: case 6: - case 7: - firestring_strncpy(buffer,"",512); + firestring_snprintf(buffer,512,"<%s@%s>",sender,source); break; + case 7: case 8: case 9: case 10: case 11: - firestring_snprintf(buffer,512,"<%s!%s>",source,sender); - break; case 12: case 13: + firestring_strncpy(buffer,"",512); + break; case 14: case 15: - firestring_strncpy(buffer,"<>",512); - break; case 16: case 17: case 18: case 19: case 20: + firestring_snprintf(buffer,512,"<%s!%s>",source,sender); + break; case 21: case 22: case 23: case 24: case 25: case 26: - firestring_snprintf(buffer,512,"",domain); - break; case 27: + firestring_strncpy(buffer,"<>",512); + break; case 28: + case 29: + case 30: + case 31: + case 32: + case 33: + case 34: + case 35: + case 36: + case 37: + case 38: + case 39: + case 40: + case 41: + firestring_snprintf(buffer,512,"",domain); + break; + case 42: + case 43: firestring_snprintf(buffer,512,"<%s!nobody>",domain); break; - case 29: + case 44: firestring_snprintf(buffer,512,"",domain); break; - case 30: + case 45: firestring_snprintf(buffer,512,"",domain); break; - case 31: + case 46: firestring_snprintf(buffer,512,"",domain); break; - case 32: + case 47: firestring_snprintf(buffer,512,"",domain); break; - case 33: + case 48: firestring_snprintf(buffer,512,"",domain); break; - case 34: + case 49: firestring_snprintf(buffer,512,"",domain); break; default: @@ -276,60 +306,81 @@ switch (num) { case 0: - case 4: - case 8: - case 12: - case 16: - case 29: - case 30: - case 31: - case 32: - case 33: - case 34: + case 7: + case 14: + case 21: + case 28: + case 44: + case 45: + case 46: + case 47: + case 48: + case 49: firestring_snprintf(buffer,512,"<%s@%s>",target_user,target_domain); break; case 1: - case 5: - case 9: - case 13: - case 17: + case 8: + case 15: + case 22: + case 29: firestring_snprintf(buffer,512,"<\"%s@%s\">",target_user,target_domain); break; case 2: - case 6: - case 10: - case 14: - case 18: + case 9: + case 16: + case 23: + case 30: firestring_snprintf(buffer,512,"%s@%s",target_user,target_domain); break; case 3: - case 7: + case 10: + case 17: + case 24: + case 40: + case 42: + firestring_snprintf(buffer,512,"<%s!%s>",target_domain,target_user); + break; + case 4: case 11: - case 15: + case 18: case 25: - case 27: - firestring_snprintf(buffer,512,"<%s!%s>",target_domain,target_user); + case 31: + firestring_snprintf(buffer,512,"<%s\\@%s>",target_user,target_domain); break; + case 5: + case 12: case 19: - firestring_snprintf(buffer,512,"<%s%%%s>",target_user,target_domain); + case 26: + case 32: + firestring_snprintf(buffer,512,"<\"%s\\@%s\">",target_user,target_domain); break; + case 6: + case 13: case 20: + case 27: + case 33: + firestring_snprintf(buffer,512,"%s\\@%s",target_user,target_domain); + break; + case 34: firestring_snprintf(buffer,512,"<%s%%%s@%s>",target_user,target_domain,domain); break; - case 21: + case 35: + firestring_snprintf(buffer,512,"<%s%%%s>",target_user,target_domain); + break; + case 36: firestring_snprintf(buffer,512,"<\"%s%%%s\">",target_user,target_domain); break; - case 22: + case 37: firestring_snprintf(buffer,512,"<%s@%s@%s>",target_user,target_domain,domain); break; - case 23: + case 38: firestring_snprintf(buffer,512,"<\"%s@%s\"@%s>",target_user,target_domain,domain); break; - case 24: + case 39: firestring_snprintf(buffer,512,"<@%s:%s@%s>",domain,target_user,target_domain); break; - case 26: - case 28: + case 41: + case 43: firestring_snprintf(buffer,512,"<%s!%s@%s>",target_domain,target_user,domain); break; default: