Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 88d46b4a 88d46b4acbc6c8f89cb2c7c89452f81074d25cc5 by Sam Roberts
Options

An unsupported mailer URL now gives a more specific error than EINVAL.

1 parent dc5e2c6a
Inline Side-by-side
Showing 2 changed files with 6 additions and 3 deletions
...@@ -58,10 +58,11 @@ extern "C" { ...@@ -58,10 +58,11 @@ extern "C" {
58 #define MU_ERR_MAILER_BAD_FROM (MU_ERR_BASE | 0x013) 58 #define MU_ERR_MAILER_BAD_FROM (MU_ERR_BASE | 0x013)
59 #define MU_ERR_MAILER_BAD_TO (MU_ERR_BASE | 0x014) 59 #define MU_ERR_MAILER_BAD_TO (MU_ERR_BASE | 0x014)
60 #define MU_ERR_MAILER_NO_RCPT_TO (MU_ERR_BASE | 0x015) 60 #define MU_ERR_MAILER_NO_RCPT_TO (MU_ERR_BASE | 0x015)
61 #define MU_ERR_SMTP_RCPT_FAILED (MU_ERR_BASE | 0x016) 61 #define MU_ERR_MAILER_BAD_URL (MU_ERR_BASE | 0x016)
62 #define MU_ERR_SMTP_RCPT_FAILED (MU_ERR_BASE | 0x017)
62 63
63 #define MU_ERR_TCP_NO_HOST (MU_ERR_BASE | 0x017) 64 #define MU_ERR_TCP_NO_HOST (MU_ERR_BASE | 0x018)
64 #define MU_ERR_TCP_NO_PORT (MU_ERR_BASE | 0x018) 65 #define MU_ERR_TCP_NO_PORT (MU_ERR_BASE | 0x019)
65 66
66 const char* mu_errname __P((int e)); 67 const char* mu_errname __P((int e));
67 const char* mu_errstring __P((int e)); 68 const char* mu_errstring __P((int e));
......
...@@ -70,6 +70,7 @@ mu_errname (int e) ...@@ -70,6 +70,7 @@ mu_errname (int e)
70 EN(MU_ERR_BAD_RESUMPTION) 70 EN(MU_ERR_BAD_RESUMPTION)
71 EN(MU_ERR_MAILER_BAD_FROM) 71 EN(MU_ERR_MAILER_BAD_FROM)
72 EN(MU_ERR_MAILER_BAD_TO) 72 EN(MU_ERR_MAILER_BAD_TO)
73 EN(MU_ERR_MAILER_BAD_URL)
73 EN(MU_ERR_MAILER_NO_RCPT_TO) 74 EN(MU_ERR_MAILER_NO_RCPT_TO)
74 EN(MU_ERR_SMTP_RCPT_FAILED) 75 EN(MU_ERR_SMTP_RCPT_FAILED)
75 EN(MU_ERR_TCP_NO_HOST) 76 EN(MU_ERR_TCP_NO_HOST)
...@@ -113,6 +114,7 @@ const char* mu_errstring (int e) ...@@ -113,6 +114,7 @@ const char* mu_errstring (int e)
113 ES(MU_ERR_MAILER_BAD_FROM, "Not a valid mailer from address") 114 ES(MU_ERR_MAILER_BAD_FROM, "Not a valid mailer from address")
114 ES(MU_ERR_MAILER_BAD_TO, "Not a valid mailer to address") 115 ES(MU_ERR_MAILER_BAD_TO, "Not a valid mailer to address")
115 ES(MU_ERR_MAILER_NO_RCPT_TO,"No receipt addresses found") 116 ES(MU_ERR_MAILER_NO_RCPT_TO,"No receipt addresses found")
117 ES(MU_ERR_MAILER_BAD_URL, "Malformed or unsupported mailer URL")
116 ES(MU_ERR_SMTP_RCPT_FAILED, "SMTP rcpt to command failed") 118 ES(MU_ERR_SMTP_RCPT_FAILED, "SMTP rcpt to command failed")
117 ES(MU_ERR_TCP_NO_HOST, "Tcp connections need a host") 119 ES(MU_ERR_TCP_NO_HOST, "Tcp connections need a host")
118 ES(MU_ERR_TCP_NO_PORT, "Tcp connections need a postive port") 120 ES(MU_ERR_TCP_NO_PORT, "Tcp connections need a postive port")
......