Skip to content

Commit 6689100

Browse files
ssahanissahani
authored
Merge pull request #122 from cgzones/misc
Misc tweaks
2 parents 6f0863f + e1bc521 commit 6689100

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

‎src/netlog/netlog-conf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ int config_parse_netlog_remote_address(const char *unit,
4949
return -EINVAL;
5050

5151
m->port = u;
52-
m->server_name = strndupa(rvalue, e-rvalue);
52+
m->server_name = strndup(rvalue, e-rvalue);
5353
if (!m->server_name)
5454
return log_oom();
5555

‎src/netlog/netlog-manager.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ typedef struct ParseFieldVec {
5454
} ParseFieldVec;
5555

5656
#define PARSE_FIELD_VEC_ENTRY(_field, _target, _target_len) { \
57-
.field = _field, \
57+
.field = (_field), \
5858
.field_len = strlen(_field), \
59-
.target = _target, \
60-
.target_len = _target_len \
59+
.target = (_target), \
60+
.target_len = (_target_len) \
6161
}
6262

6363
static int parse_field(
@@ -118,7 +118,7 @@ static int parse_fieldv(
118118

119119
static int manager_read_journal_input(Manager *m) {
120120
_cleanup_free_ char *facility = NULL, *identifier = NULL, *priority = NULL, *message = NULL, *pid = NULL,
121-
*hostname = NULL, *structured_data = NULL, *msgid = NULL;
121+
*hostname = NULL, *structured_data = NULL, *msgid = NULL, *cursor = NULL;
122122
size_t hostname_len = 0, identifier_len = 0, message_len = 0, priority_len = 0, facility_len = 0,
123123
structured_data_len = 0, msgid_len = 0, pid_len = 0;
124124
unsigned sev = JOURNAL_DEFAULT_SEVERITY;
@@ -127,7 +127,6 @@ static int manager_read_journal_input(Manager *m) {
127127
const void *data;
128128
usec_t realtime;
129129
size_t length;
130-
char *cursor;
131130
int r;
132131
const ParseFieldVec fields[] = {
133132
PARSE_FIELD_VEC_ENTRY("_PID=", &pid, &pid_len ),
@@ -607,6 +606,8 @@ void manager_free(Manager *m) {
607606
free(m->dtls);
608607
free(m->tls);
609608

609+
free(m->server_name);
610+
610611
free(m->last_cursor);
611612
free(m->current_cursor);
612613

‎src/netlog/netlog-tls.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ int ssl_verify_certificate_validity(int s, X509_STORE_CTX *store) {
3535
_cleanup_free_ char *pretty = NULL;
3636
union sockaddr_union sa;
3737
int r;
38+
long rc;
3839

3940
assert(store);
4041

@@ -57,26 +58,26 @@ int ssl_verify_certificate_validity(int s, X509_STORE_CTX *store) {
5758
return 1;
5859
}
5960

60-
r = SSL_get_verify_result(ssl);
61-
if (r != X509_V_OK) {
62-
switch(r) {
61+
rc = SSL_get_verify_result(ssl);
62+
if (rc != X509_V_OK) {
63+
switch(rc) {
6364
case X509_V_ERR_CERT_HAS_EXPIRED: {
6465
switch (m->auth_mode) {
6566
case OPEN_SSL_CERTIFICATE_AUTH_MODE_DENY: {
6667
log_error_errno(SYNTHETIC_ERRNO(EINVAL),
67-
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(r));
68+
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(rc));
6869
return 0;
6970
}
7071
break;
7172
case OPEN_SSL_CERTIFICATE_AUTH_MODE_WARN: {
7273
log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
73-
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(r));
74+
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(rc));
7475

7576
return 1;
7677
}
7778
break;
7879
case OPEN_SSL_CERTIFICATE_AUTH_MODE_ALLOW: {
79-
log_debug("TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(r));
80+
log_debug("TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(rc));
8081
return 1;
8182
}
8283

@@ -89,20 +90,20 @@ int ssl_verify_certificate_validity(int s, X509_STORE_CTX *store) {
8990
switch (m->auth_mode) {
9091
case OPEN_SSL_CERTIFICATE_AUTH_MODE_DENY: {
9192
log_error_errno(SYNTHETIC_ERRNO(EINVAL),
92-
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(r));
93+
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(rc));
9394
return 0;
9495
}
9596
break;
9697
case OPEN_SSL_CERTIFICATE_AUTH_MODE_WARN: {
9798
log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
98-
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(r));
99+
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(rc));
99100

100101
return 1;
101102
}
102103
break;
103104
case OPEN_SSL_CERTIFICATE_AUTH_MODE_ALLOW: {
104105
log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
105-
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(r));
106+
"TLS: Failed to verify certificate server=%s: %s", pretty, X509_verify_cert_error_string(rc));
106107
return 1;
107108
}
108109
break;
@@ -111,12 +112,12 @@ int ssl_verify_certificate_validity(int s, X509_STORE_CTX *store) {
111112
}}
112113
break;
113114
default:
114-
log_error("TLS: Failed to validate remote certificate server=%s: %s. Aborting connection ...", pretty, X509_verify_cert_error_string(r));
115+
log_error("TLS: Failed to validate remote certificate server=%s: %s. Aborting connection ...", pretty, X509_verify_cert_error_string(rc));
115116
return 0;
116117
}
117118
}
118119

119-
log_debug("TLS: SSL ceritificates verified server=%s: %s", pretty, X509_verify_cert_error_string(r));
120+
log_debug("TLS: SSL ceritificates verified server=%s: %s", pretty, X509_verify_cert_error_string(rc));
120121

121122
return 1;
122123
}

0 commit comments

Comments
 (0)