diff options
author | jpadkins <jpadkins@gmail.com> | 2017-03-23 22:58:23 +0300 |
---|---|---|
committer | jpadkins <jpadkins@gmail.com> | 2017-03-23 22:58:23 +0300 |
commit | 61c73a660e4eae8020af002f3a19f3a6d36b023d (patch) | |
tree | 1c448af47382154b1d9c8f0e72c01f06507bd85a /check/magma/servers | |
parent | cfe544e8e1961e898906a1a910742042f71d52dc (diff) |
Another dirty commit. Really moving to other workstation this time.
Diffstat (limited to 'check/magma/servers')
-rw-r--r-- | check/magma/servers/imap/imap_check.c | 4 | ||||
-rw-r--r-- | check/magma/servers/imap/imap_check.h | 4 | ||||
-rw-r--r-- | check/magma/servers/imap/imap_check_network.c | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/check/magma/servers/imap/imap_check.c b/check/magma/servers/imap/imap_check.c index 23e272d0..59477577 100644 --- a/check/magma/servers/imap/imap_check.c +++ b/check/magma/servers/imap/imap_check.c @@ -63,7 +63,7 @@ START_TEST (check_imap_network_search_s) { st_sprint(errmsg, "No IMAP servers were configured to support TCP connections."); outcome = false; } - else if (status() && !check_imap_network_search_sthread(errmsg, server->network.port)) { + else if (status() && !check_imap_network_search_sthread(errmsg, server->network.port, false)) { outcome = false; } else { @@ -86,7 +86,7 @@ START_TEST (check_imap_network_fetch_s) { st_sprint(errmsg, "No IMAP servers were configured to support TCP connections."); outcome = false; } - else if (status() && !check_imap_network_fetch_sthread(errmsg, server->network.port)) { + else if (status() && !check_imap_network_fetch_sthread(errmsg, server->network.port, false)) { outcome = false; } else { diff --git a/check/magma/servers/imap/imap_check.h b/check/magma/servers/imap/imap_check.h index 6e8dcf09..3a6c5e77 100644 --- a/check/magma/servers/imap/imap_check.h +++ b/check/magma/servers/imap/imap_check.h @@ -10,8 +10,8 @@ /// imap_check_network.c bool_t check_imap_client_read_end(client_t *client, chr_t *tag); bool_t check_imap_network_basic_sthread(stringer_t *errmsg, uint32_t port, bool_t secure); -bool_t check_imap_network_search_sthread(stringer_t *errmsg, uint32_t port); -bool_t check_imap_network_fetch_sthread(stringer_t *errmsg, uint32_t port); +bool_t check_imap_network_search_sthread(stringer_t *errmsg, uint32_t port, bool_t secure); +bool_t check_imap_network_fetch_sthread(stringer_t *errmsg, uint32_t port, bool_t secure); Suite * suite_check_imap(void); diff --git a/check/magma/servers/imap/imap_check_network.c b/check/magma/servers/imap/imap_check_network.c index db72e6cb..eef6b70a 100644 --- a/check/magma/servers/imap/imap_check_network.c +++ b/check/magma/servers/imap/imap_check_network.c @@ -42,11 +42,11 @@ bool_t check_imap_client_read_end(client_t *client, chr_t *tag) { */ bool_t check_imap_client_login(client_t *client, chr_t *user, chr_t *pass, chr_t *tag, stringer_t *errmsg) { - stringer_t *login_line; + stringer_t *login_line = NULL; uint32_t login_line_len = ns_length_get(tag) + ns_length_get(user) + ns_length_get(pass) + 10; // Construct the login command - if (!(login_line = st_merge("nsnsns", tag, NULLER(" LOGIN "), user, NULLER(' '), pass, NULLER("\r\n")))) { + if (!(login_line = st_merge("nsnsns", tag, NULLER(" LOGIN "), user, NULLER(" "), pass, NULLER("\r\n")))) { st_sprint(errmsg, "Failed to construct the login command."); return false; @@ -171,7 +171,7 @@ bool_t check_imap_network_basic_sthread(stringer_t *errmsg, uint32_t port, bool_ } -bool_t check_imap_network_search_sthread(stringer_t *errmsg, uint32_t port) { +bool_t check_imap_network_search_sthread(stringer_t *errmsg, uint32_t port, bool_t secure) { client_t *client = NULL; @@ -185,14 +185,14 @@ bool_t check_imap_network_search_sthread(stringer_t *errmsg, uint32_t port) { return false; } // Test the LOGIN command. - else if (!check_imap_client_login(client, "princess", "password", errmsg)) { + else if (!check_imap_client_login(client, "princess", "password", "A0", errmsg)) { return false; } return true; } -bool_t check_imap_network_fetch_sthread(stringer_t *errmsg, uint32_t port) { +bool_t check_imap_network_fetch_sthread(stringer_t *errmsg, uint32_t port, bool_t secure) { client_t *client = NULL; @@ -206,7 +206,7 @@ bool_t check_imap_network_fetch_sthread(stringer_t *errmsg, uint32_t port) { return false; } // Test the LOGIN command. - else if (!check_imap_client_login(client, "princess", "password", errmsg)) { + else if (!check_imap_client_login(client, "princess", "password", "A0", errmsg)) { return false; } |