Skip to content
Jump to bottom

0.4 #2

Merged
merged 2 commits into from
May 18, 2021
Merged

0.4 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21249d8
get_shadow_line: Correctly detect socket() failure
donald May 18, 2021
56205e5
get_shadow_line: Don't leak socket
donald May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions get_shadow_line.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ static int get_shadow_line(char *user, char **line) {
SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL);
if (SSL_CTX_load_verify_locations(ssl_ctx, "/etc/mxshadow.cert.pem", NULL) == 0) { psslerror("SSL_CTX_load_verify_locations"); return -1; }

int sock = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (sock == 0) { COMMON_LOG(LOG_ERR, "socket: %m"); return -1; }
int sock _cleanup_(free_fd) = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);
if (sock == -1) { COMMON_LOG(LOG_ERR, "socket: %m"); return -1; }

status = connect_with_timeout(sock, (struct sockaddr *)&sockaddr, sizeof(sockaddr), TIMEOUT);
if (status == -1) { COMMON_LOG(LOG_ERR, "connect: %m"); return -1; }
Expand Down